Update to Firebase Android BoM 33.3.0 while also including the Gradle 7 change. (#1653)

jonsimantov · a-maurice · firebase-workflow-trigger-bot · web-flow · commit 1431a42892e5 · 2024-09-25T23:19:40.000-07:00
* Update gradle versions to 7 * Update Java version and buildToolsVersion * Update integration_tests.yml * Update integration_tests.yml * More fixes * Update google services dependency version * Remove logic to set ANDROID_SDK_HOME * Update minSdkVersion. * Try working around a build tools error on Windows. * Call d8 directly via java instead of by broken shell script. * Add note about minSdkVersion. * Change Java version in CI build too. * Update Android dependencies - Wed Sep 25 2024 [Triggered](https://github.com/firebase/firebase-android-sdk/actions/runs/11037049925) by [firebase-android-sdk Sep 25 release](firebase/firebase-android-sdk@a95da3f). ### Android - com.google.firebase.firebase_bom → 33.3.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/11037058168). * Change APP_BINARY_DIR to instead scan for the directory. * Clean up prebuild dependencies from gradle files. * Add minSdkVersion and targetSdkVersion to resources gradle files. * Add targetSdkVersion to messaging. * Force Java 11 on packaging. * Use the full path to the message forwarding service. * Update version numbers. * Remove extraneous logging. * Fix Android packaging script to use new paths. --------- Co-authored-by: a-maurice <amaurice@google.com> Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>
diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -159,7 +159,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:33.1.2')
+      implementation platform('com.google.firebase:firebase-bom:33.3.0')
     }
     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
@@ -56,7 +56,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.0')
   implementation 'com.google.firebase:firebase-analytics'
 }
 
diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -59,7 +59,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.5.0'
   implementation project(':app:app_resources')
diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.0')
   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
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.0')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 
diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')
diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json
@@ -1,5 +1,5 @@
 {
-  "released": "12.2.0",
-  "stable": "12.2.0",
-  "head": "12.2.0"
+  "released": "12.3.0",
+  "stable": "12.3.0",
+  "head": "12.3.0"
 }
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.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
@@ -59,7 +59,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.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
@@ -56,7 +56,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-ads:23.0.0'
   implementation 'com.google.android.ump:user-messaging-platform:2.2.0'
diff --git a/messaging/messaging_java/build.gradle b/messaging/messaging_java/build.gradle
@@ -61,7 +61,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.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
@@ -132,7 +132,7 @@ project.afterEvaluate {
 
       // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:33.1.2')
+      implementation platform('com.google.firebase:firebase-bom:33.3.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
@@ -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:33.1.2)
+All Firebase SDKs          | platform(com.google.firebase:firebase-bom:33.3.0)
 |                          | (Android Bill of Materials)
 Firebase Analytics         | libfirebase_analytics.a
 |                          | libfirebase_app.a
@@ -631,8 +631,10 @@ workflow use only during the development of your app, not for publicly shipping
 code.
 
 ## Release Notes
-### Upcoming Release
+### 12.3.0
 -   Changes
+    - General (iOS): Update to Firebase Cocoapods version 11.2.0.
+    - General (Android): Update to Firebase Android BoM version 33.3.0.
     - General (Android): Updated minSdkVersion to 24.
     - Messaging: Changed SetListener to send the last token received
       before the listener was set.
diff --git a/remote_config/remote_config_resources/build.gradle b/remote_config/remote_config_resources/build.gradle
@@ -55,7 +55,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.0')
   implementation 'com.google.firebase:firebase-config'
 }
 
diff --git a/storage/storage_resources/build.gradle b/storage/storage_resources/build.gradle
@@ -54,7 +54,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.3.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-storage'
 }

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ project.afterEvaluate {`
`159`	`159`
`160`	`160`	`// Add the bill-of-materials`
`161`	`161`	`project.dependencies {`
`162`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`162`	`+ implementation platform('com.google.firebase:firebase-bom:33.3.0')`
`163`	`163`	`}`
`164`	`164`	`for (String lib : firebaseCpp.dependencies.libSet) {`
`165`	`165`	`// Generate and include the proguard file`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ android {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`dependencies {`
`59`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`59`	`+ implementation platform('com.google.firebase:firebase-bom:33.3.0')`
`60`	`60`	`implementation 'com.google.firebase:firebase-analytics'`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ android {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`dependencies {`
`62`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`62`	`+ implementation platform('com.google.firebase:firebase-bom:33.3.0')`
`63`	`63`	`implementation 'com.google.firebase:firebase-analytics'`
`64`	`64`	`implementation 'com.google.android.gms:play-services-base:18.5.0'`
`65`	`65`	`implementation project(':app:app_resources')`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ android {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`dependencies {`
`58`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`58`	`+ implementation platform('com.google.firebase:firebase-bom:33.3.0')`
`59`	`59`	`implementation 'com.google.firebase:firebase-analytics'`
`60`	`60`	`implementation 'com.google.firebase:firebase-dynamic-links'`
`61`	`61`	`implementation project(':app:app_resources')`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "released": "12.2.0",`
`3`		`- "stable": "12.2.0",`
`4`		`- "head": "12.2.0"`
	`2`	`+ "released": "12.3.0",`
	`3`	`+ "stable": "12.3.0",`
	`4`	`+ "head": "12.3.0"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ android {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`dependencies {`
`54`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`54`	`+ implementation platform('com.google.firebase:firebase-bom:33.3.0')`
`55`	`55`	`implementation 'com.google.firebase:firebase-analytics'`
`56`	`56`	`implementation 'com.google.firebase:firebase-database'`
`57`	`57`	`//implementation project(':app:app_resources')`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ android {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`dependencies {`
`64`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`64`	`+ implementation platform('com.google.firebase:firebase-bom:33.3.0')`
`65`	`65`	`implementation 'com.google.firebase:firebase-analytics'`
`66`	`66`	`implementation 'com.google.firebase:firebase-messaging'`
`67`	`67`	`implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ project.afterEvaluate {`
`132`	`132`
`133`	`133`	`// Add the bill-of-materials`
`134`	`134`	`project.dependencies {`
`135`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`135`	`+ implementation platform('com.google.firebase:firebase-bom:33.3.0')`
`136`	`136`	`}`
`137`	`137`	`for (String lib : firebaseCpp.dependencies.libSet) {`
`138`	`138`	`// Messaging includes an aar, which to be depended on properly requires`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ android {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`dependencies {`
`57`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`57`	`+ implementation platform('com.google.firebase:firebase-bom:33.3.0')`
`58`	`58`	`implementation 'com.google.firebase:firebase-analytics'`
`59`	`59`	`implementation 'com.google.firebase:firebase-storage'`
`60`	`60`	`}`