From 57a4a627bf942812855b37f224114897995f2eaa Mon Sep 17 00:00:00 2001 From: firebase-workflow-trigger-bot Date: Wed, 12 Oct 2022 20:28:31 +0000 Subject: [PATCH 1/3] Update Android dependencies - Wed Oct 12 2022 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Android - com.google.android.gms.play_services_ads → 21.3.0 - com.google.firebase.firebase_bom → 31.0.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/3237674877). --- Android/firebase_dependencies.gradle | 4 ++-- admob/admob_resources/build.gradle | 2 +- app/app_resources/build.gradle | 2 +- app/google_api_resources/build.gradle | 2 +- app/invites_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 | 4 ++-- storage/storage_resources/build.gradle | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle index b763263fb5..4f09733b17 100644 --- a/Android/firebase_dependencies.gradle +++ b/Android/firebase_dependencies.gradle @@ -26,7 +26,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:21.2.0'], + 'gma' : ['com.google.android.gms:play-services-ads:21.3.0'], 'installations' : ['com.google.firebase:firebase-installations'], 'invites' : ['com.google.firebase:firebase-invites'], // Messaging has an additional local dependency to include. @@ -156,7 +156,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') } for (String lib : firebaseCpp.dependencies.libSet) { // Generate and include the proguard file diff --git a/admob/admob_resources/build.gradle b/admob/admob_resources/build.gradle index 3b01ad9212..de8531a42c 100644 --- a/admob/admob_resources/build.gradle +++ b/admob/admob_resources/build.gradle @@ -45,7 +45,7 @@ android { } dependencies { - implementation platform('com.google.firebase:firebase-bom:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-ads:19.8.0' } diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle index bccb14df25..5212d293d9 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') implementation 'com.google.firebase:firebase-analytics' } diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle index f3ac58e06d..65ee0da5ce 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.android.gms:play-services-base:18.1.0' implementation project(':app:app_resources') diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle index 2e84f3fe43..f4e4538a2b 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-dynamic-links' implementation project(':app:app_resources') diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle index 262fbefeee..dd0d8c1db3 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') 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 b3505ac28f..6173701e32 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') 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 a635c2743b..bb9a0ee354 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') 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 3e10810ef8..ed36fd2edc 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') implementation 'com.google.firebase:firebase-analytics' - implementation 'com.google.android.gms:play-services-ads:21.2.0' + implementation 'com.google.android.gms:play-services-ads:21.3.0' } afterEvaluate { diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle index 03e594be45..b01f78f0a4 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') 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 23b81f00e1..fbf8572d88 100644 --- a/release_build_files/Android/firebase_dependencies.gradle +++ b/release_build_files/Android/firebase_dependencies.gradle @@ -26,7 +26,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:21.2.0'], + 'gma' : ['com.google.android.gms:play-services-ads:21.3.0'], 'installations' : ['com.google.firebase:firebase-installations'], 'invites' : ['com.google.firebase:firebase-invites'], // Messaging has an additional local dependency to include. @@ -130,7 +130,7 @@ project.afterEvaluate { // Add the bill-of-materials project.dependencies { - implementation platform('com.google.firebase:firebase-bom:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') } 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 80cb3950c9..6c2d3192a5 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -79,7 +79,7 @@ distributed as part of the core Firebase Feature | Required Libraries and Gradle Packages -------------------------- | -------------------------------------- -All Firebase SDKs | platform(com.google.firebase:firebase-bom:30.5.0) +All Firebase SDKs | platform(com.google.firebase:firebase-bom:31.0.0) | | (Android Bill of Materials) Firebase AdMob | libfirebase_admob.a | (deprecated) | libfirebase_app.a @@ -125,7 +125,7 @@ Google Mobile Ads | libfirebase_gma.a | | libfirebase_app.a | | com.google.firebase:firebase-analytics | | (Maven package) -| | com.google.android.gms:play-services-ads:21.2.0 +| | com.google.android.gms:play-services-ads:21.3.0 | | (Maven package) Firebase Installations | libfirebase_installations.a | | libfirebase_app.a diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle index ea70c77145..69fe5c2542 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:30.5.0') + implementation platform('com.google.firebase:firebase-bom:31.0.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-storage' } From c671f034325fee13f9c354cccf3006d3eb7ecb99 Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Wed, 12 Oct 2022 13:38:28 -0700 Subject: [PATCH 2/3] add android version update to readme --- 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 6c2d3192a5..e693ae45da 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -636,6 +636,7 @@ code. ## Release Notes ### 10.0.0 - Changes + - General (Android): Update to Firebase Android BoM version 31.0.0. - General (iOS): Update to Firebase Cocoapods version 10.0.0. - General: Remove unused headers for performance and test lab from the package. From 8d18cacc26ad5580df1d91682398a35071d19ee2 Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Wed, 12 Oct 2022 15:58:03 -0700 Subject: [PATCH 3/3] update cpp version json --- cpp_sdk_version.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json index 572bd0a38d..af062b42d1 100644 --- a/cpp_sdk_version.json +++ b/cpp_sdk_version.json @@ -1,5 +1,5 @@ { - "released": "9.6.0", - "stable": "9.6.0", - "head": "9.6.0" + "released": "10.0.0", + "stable": "10.0.0", + "head": "10.0.0" }