From a2714fbb515c872c9c5109bb9e486eb6efe2ebdf Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 14 Sep 2023 16:28:21 -0700 Subject: [PATCH 1/5] Update release version to 11.5.0. --- cpp_sdk_version.json | 6 +++--- release_build_files/readme.md | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json index 0eb24cc9c4..68cb6cd9e8 100644 --- a/cpp_sdk_version.json +++ b/cpp_sdk_version.json @@ -1,5 +1,5 @@ { - "released": "11.4.0", - "stable": "11.4.0", - "head": "11.4.0" + "released": "11.5.0", + "stable": "11.5.0", + "head": "11.5.0" } diff --git a/release_build_files/readme.md b/release_build_files/readme.md index cbb32a536e..79007fca94 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -627,8 +627,10 @@ workflow use only during the development of your app, not for publicly shipping code. ## Release Notes -### Next Release +### 11.5.0 - Changes + - General (iOS): Update to Firebase Cocoapods version 10.15.0. + - General (Android): Update to Firebase Android BoM version 32.3.0. - General (Android): Made dynamic code files read only to comply with new Android 14 security requirements. This fixes a crash at API level 34+. - Analytics (iOS): Added InitiateOnDeviceConversionMeasurementWithPhoneNumber @@ -637,6 +639,7 @@ code. - Auth: Add Firebase Auth Emulator support. Set the environment variable USE_AUTH_EMULATOR=yes (and optionally AUTH_EMULATOR_PORT, default 9099) to connect to the local Firebase Auth Emulator. + - GMA (iOS): Updated dependency to Google-Mobile-Ads-SDK version 10.10.0. ### 11.4.0 - Changes From 32e92d449dbad20cefe191cedbcf125780a15b1b Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 18 Sep 2023 10:39:20 -0700 Subject: [PATCH 2/5] Update readme. --- release_build_files/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 79007fca94..9c7d949cbd 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -630,7 +630,7 @@ code. ### 11.5.0 - Changes - General (iOS): Update to Firebase Cocoapods version 10.15.0. - - General (Android): Update to Firebase Android BoM version 32.3.0. + - General (Android): Update to Firebase Android BoM version 32.3.1. - General (Android): Made dynamic code files read only to comply with new Android 14 security requirements. This fixes a crash at API level 34+. - Analytics (iOS): Added InitiateOnDeviceConversionMeasurementWithPhoneNumber From 6239a8ba72c9e46346aa7db3086447edd11312f2 Mon Sep 17 00:00:00 2001 From: firebase-workflow-trigger-bot Date: Mon, 18 Sep 2023 17:41:22 +0000 Subject: [PATCH 3/5] Update Android dependencies - Mon Sep 18 2023 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Android - com.google.android.gms.play_services_ads → 22.4.0 - com.google.firebase.firebase_bom → 32.3.1 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6226059256). --- Android/firebase_dependencies.gradle | 4 ++-- app/app_resources/build.gradle | 2 +- app/google_api_resources/build.gradle | 2 +- app/invites_resources/build.gradle | 2 +- app_check/app_check_resources/build.gradle | 2 +- auth/auth_resources/build.gradle | 2 +- database/database_resources/build.gradle | 2 +- firestore/firestore_resources/build.gradle | 2 +- gma/gma_resources/build.gradle | 4 ++-- messaging/messaging_java/build.gradle | 2 +- release_build_files/Android/firebase_dependencies.gradle | 4 ++-- release_build_files/readme.md | 6 +++--- remote_config/remote_config_resources/build.gradle | 2 +- storage/storage_resources/build.gradle | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 232026a2b1..6adda38790 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -27,7 +27,7 @@ def firebaseDependenciesMap = [ 'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'], 'firestore' : ['com.google.firebase:firebase-firestore'], 'functions' : ['com.google.firebase:firebase-functions'], - 'gma' : ['com.google.android.gms:play-services-ads:22.3.0'], + 'gma' : ['com.google.android.gms:play-services-ads:22.4.0'], 'installations' : ['com.google.firebase:firebase-installations'], 'invites' : ['com.google.firebase:firebase-invites'], // Messaging has an additional local dependency to include. @@ -158,7 +158,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') } for (String lib : firebaseCpp.dependencies.libSet) { // Generate and include the proguard file diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index 0e2e67eb90..ae1c95e847 100644 --- a/app/app_resources/build.gradle +++ b/app/app_resources/build.gradle @@ -50,7 +50,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' } diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index 7179f73249..629f8ecf69 100644 --- a/app/google_api_resources/build.gradle +++ b/app/google_api_resources/build.gradle @@ -53,7 +53,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.android.gms:play-services-base:18.2.0' implementation project(':app:app_resources') diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index bb867b88c0..27031a758b 100644 --- a/app/invites_resources/build.gradle +++ b/app/invites_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-dynamic-links' implementation project(':app:app_resources') diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle index 5826312c0a..6eba43dc42 100644 --- a/app_check/app_check_resources/build.gradle +++ b/app_check/app_check_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-appcheck' } diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index 6fce36e3c4..392128769e 100644 --- a/auth/auth_resources/build.gradle +++ b/auth/auth_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-auth' implementation project(':app:app_resources') diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle index 6e4e81f191..54c3a74ebb 100644 --- a/database/database_resources/build.gradle +++ b/database/database_resources/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-database' //implementation project(':app:app_resources') diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle index cbd73238e0..33e5738460 100644 --- a/firestore/firestore_resources/build.gradle +++ b/firestore/firestore_resources/build.gradle @@ -53,7 +53,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-firestore' } diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index 735d2291cc..6a41c61fbb 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -45,9 +45,9 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' - implementation 'com.google.android.gms:play-services-ads:22.3.0' + implementation 'com.google.android.gms:play-services-ads:22.4.0' } afterEvaluate { diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index 6b2fccefc9..4ec8598643 100644 --- a/messaging/messaging_java/build.gradle +++ b/messaging/messaging_java/build.gradle @@ -55,7 +55,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-messaging' implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0' diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index 8d6fa09c28..35dea9c73e 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -27,7 +27,7 @@ def firebaseDependenciesMap = [ 'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'], 'firestore' : ['com.google.firebase:firebase-firestore'], 'functions' : ['com.google.firebase:firebase-functions'], - 'gma' : ['com.google.android.gms:play-services-ads:22.3.0'], + 'gma' : ['com.google.android.gms:play-services-ads:22.4.0'], 'installations' : ['com.google.firebase:firebase-installations'], 'invites' : ['com.google.firebase:firebase-invites'], // Messaging has an additional local dependency to include. @@ -131,7 +131,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') } for (String lib : firebaseCpp.dependencies.libSet) { // Messaging includes an aar, which to be depended on properly requires diff --git a/release_build_files/readme.md b/release_build_files/readme.md index cbb32a536e..37890f6bae 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -86,7 +86,7 @@ distributed as part of the core Firebase Feature | Required Libraries and Gradle Packages -------------------------- | -------------------------------------- -All Firebase SDKs | platform(com.google.firebase:firebase-bom:32.2.3) +All Firebase SDKs | platform(com.google.firebase:firebase-bom:32.3.1) | | (Android Bill of Materials) Firebase Analytics | libfirebase_analytics.a | | libfirebase_app.a @@ -134,7 +134,7 @@ Google Mobile Ads | libfirebase_gma.a | | libfirebase_app.a | | com.google.firebase:firebase-analytics | | (Maven package) -| | com.google.android.gms:play-services-ads:22.3.0 +| | com.google.android.gms:play-services-ads:22.4.0 | | (Maven package) Firebase Installations | libfirebase_installations.a | | libfirebase_app.a @@ -147,7 +147,7 @@ Firebase Messaging | libfirebase_messaging.a | | com.google.firebase:firebase-messaging | | (Maven package) | | libmessaging_java.jar (Android service) -| | androidx.core:core:1.10.1 (Maven package) +| | androidx.core:core:1.12.0 (Maven package) Firebase Realtime Database | libfirebase_database.a | | libfirebase_auth.a | | libfirebase_app.a diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle index 5a091ace7c..598fffaa07 100644 --- a/remote_config/remote_config_resources/build.gradle +++ b/remote_config/remote_config_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-config' } diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index 17ec453219..dccf04d517 100644 --- a/storage/storage_resources/build.gradle +++ b/storage/storage_resources/build.gradle @@ -49,7 +49,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:32.2.3') + implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-storage' } From ee7e959421d134cea586dc82933ec3813d47784d Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 18 Sep 2023 10:48:50 -0700 Subject: [PATCH 4/5] Add note about GMA Android. --- release_build_files/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index ec4345cd8a..fce0c81be1 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -640,6 +640,7 @@ code. USE_AUTH_EMULATOR=yes (and optionally AUTH_EMULATOR_PORT, default 9099) to connect to the local Firebase Auth Emulator. - GMA (iOS): Updated dependency to Google-Mobile-Ads-SDK version 10.10.0. + - GMA (Android): Updated dependency to play-services-ads version 22.4.0. ### 11.4.0 - Changes From 140f4d5d592028e8e43e4b28da746ffd1d994876 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Mon, 18 Sep 2023 12:58:51 -0700 Subject: [PATCH 5/5] Revert play-services-ads to 22.3.0. --- Android/firebase_dependencies.gradle | 2 +- gma/gma_resources/build.gradle | 2 +- release_build_files/Android/firebase_dependencies.gradle | 2 +- release_build_files/readme.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index 6adda38790..c4aa6e7d41 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -27,7 +27,7 @@ def firebaseDependenciesMap = [ 'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'], 'firestore' : ['com.google.firebase:firebase-firestore'], 'functions' : ['com.google.firebase:firebase-functions'], - 'gma' : ['com.google.android.gms:play-services-ads:22.4.0'], + 'gma' : ['com.google.android.gms:play-services-ads:22.3.0'], 'installations' : ['com.google.firebase:firebase-installations'], 'invites' : ['com.google.firebase:firebase-invites'], // Messaging has an additional local dependency to include. diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle index 6a41c61fbb..5f98734bfb 100644 --- a/gma/gma_resources/build.gradle +++ b/gma/gma_resources/build.gradle @@ -47,7 +47,7 @@ android { dependencies { implementation platform('com.google.firebase:firebase-bom:32.3.1') implementation 'com.google.firebase:firebase-analytics' - implementation 'com.google.android.gms:play-services-ads:22.4.0' + implementation 'com.google.android.gms:play-services-ads:22.3.0' } afterEvaluate { diff --git a/release_build_files/Android/firebase_dependencies.gradle b/release_build_files/Android/firebase_dependencies.gradle index 35dea9c73e..1c4df83d57 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -27,7 +27,7 @@ def firebaseDependenciesMap = [ 'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'], 'firestore' : ['com.google.firebase:firebase-firestore'], 'functions' : ['com.google.firebase:firebase-functions'], - 'gma' : ['com.google.android.gms:play-services-ads:22.4.0'], + 'gma' : ['com.google.android.gms:play-services-ads:22.3.0'], 'installations' : ['com.google.firebase:firebase-installations'], 'invites' : ['com.google.firebase:firebase-invites'], // Messaging has an additional local dependency to include. diff --git a/release_build_files/readme.md b/release_build_files/readme.md index fce0c81be1..6e0680c9b8 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -134,7 +134,7 @@ Google Mobile Ads | libfirebase_gma.a | | libfirebase_app.a | | com.google.firebase:firebase-analytics | | (Maven package) -| | com.google.android.gms:play-services-ads:22.4.0 +| | com.google.android.gms:play-services-ads:22.3.0 | | (Maven package) Firebase Installations | libfirebase_installations.a | | libfirebase_app.a @@ -640,7 +640,7 @@ code. USE_AUTH_EMULATOR=yes (and optionally AUTH_EMULATOR_PORT, default 9099) to connect to the local Firebase Auth Emulator. - GMA (iOS): Updated dependency to Google-Mobile-Ads-SDK version 10.10.0. - - GMA (Android): Updated dependency to play-services-ads version 22.4.0. + - GMA (Android): Updated dependency to play-services-ads version 22.3.0. ### 11.4.0 - Changes