Merge b1c6522 into 06ab3ec

firebase-workflow-trigger[bot] · web-flow · commit 51920656698b · 2024-09-18T17:33:27.000Z
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.2.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
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.0')
   implementation 'com.google.firebase:firebase-analytics'
 }
 
diff --git 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:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.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
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.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
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.0')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 
diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle
@@ -85,6 +85,7 @@ android {
   }
   packagingOptions {
     pickFirst 'META-INF/**/coroutines.pro'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git 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:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')
diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
@@ -76,6 +76,7 @@ android {
   }
   packagingOptions {
     pickFirst 'META-INF/**/coroutines.pro'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git 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:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-database'
   //implementation project(':app:app_resources')
diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle
@@ -76,6 +76,7 @@ android {
   }
   packagingOptions {
     pickFirst 'META-INF/**/coroutines.pro'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git 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:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.0')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-firestore'
 }
diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle
@@ -76,6 +76,7 @@ android {
   }
   packagingOptions {
     pickFirst 'META-INF/**/coroutines.pro'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle
@@ -51,6 +51,14 @@ android {
       java.srcDirs = ['src/android/java']
       res.srcDirs = ['res']
     }
+    all {
+      configurations.getByName(runtimeClasspathConfigurationName) {
+        attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
+      }
+      configurations.getByName(compileClasspathConfigurationName) {
+        attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
+      }
+    }
   }
 
   Properties localProperties = new Properties()
@@ -91,6 +99,7 @@ android {
   }
   packagingOptions {
     pickFirst 'META-INF/**/coroutines.pro'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
   lintOptions {
     abortOnError false
diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle
@@ -76,6 +76,7 @@ android {
   }
   packagingOptions {
     pickFirst 'META-INF/**/coroutines.pro'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.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
@@ -59,7 +59,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.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.2.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.2.0)
 |                          | (Android Bill of Materials)
 Firebase Analytics         | libfirebase_analytics.a
 |                          | libfirebase_app.a
diff --git 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:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.0')
   implementation 'com.google.firebase:firebase-config'
 }
 
diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle
@@ -76,6 +76,7 @@ android {
   }
   packagingOptions {
     pickFirst 'META-INF/**/coroutines.pro'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git 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:33.1.2')
+  implementation platform('com.google.firebase:firebase-bom:33.2.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.2.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
`@@ -50,7 +50,7 @@ android {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`dependencies {`
`53`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`53`	`+ implementation platform('com.google.firebase:firebase-bom:33.2.0')`
`54`	`54`	`implementation 'com.google.firebase:firebase-analytics'`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ android {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`dependencies {`
`56`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`56`	`+ implementation platform('com.google.firebase:firebase-bom:33.2.0')`
`57`	`57`	`implementation 'com.google.firebase:firebase-analytics'`
`58`	`58`	`implementation 'com.google.android.gms:play-services-base:18.5.0'`
`59`	`59`	`implementation project(':app:app_resources')`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ android {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`dependencies {`
`52`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`52`	`+ implementation platform('com.google.firebase:firebase-bom:33.2.0')`
`53`	`53`	`implementation 'com.google.firebase:firebase-analytics'`
`54`	`54`	`implementation 'com.google.firebase:firebase-dynamic-links'`
`55`	`55`	`implementation project(':app:app_resources')`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ android {`
`85`	`85`	`}`
`86`	`86`	`packagingOptions {`
`87`	`87`	`pickFirst 'META-INF/**/coroutines.pro'`
	`88`	`+ pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'`
`88`	`89`	`}`
`89`	`90`	`}`
`90`	`91`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ android {`
`76`	`76`	`}`
`77`	`77`	`packagingOptions {`
`78`	`78`	`pickFirst 'META-INF/**/coroutines.pro'`
	`79`	`+ pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ android {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`dependencies {`
`48`		`- implementation platform('com.google.firebase:firebase-bom:33.1.2')`
	`48`	`+ implementation platform('com.google.firebase:firebase-bom:33.2.0')`
`49`	`49`	`implementation 'com.google.firebase:firebase-analytics'`
`50`	`50`	`implementation 'com.google.firebase:firebase-database'`
`51`	`51`	`//implementation project(':app:app_resources')`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,14 @@ android {`
`51`	`51`	`java.srcDirs = ['src/android/java']`
`52`	`52`	`res.srcDirs = ['res']`
`53`	`53`	`}`
	`54`	`+ all {`
	`55`	`+ configurations.getByName(runtimeClasspathConfigurationName) {`
	`56`	`+ attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")`
	`57`	`+ }`
	`58`	`+ configurations.getByName(compileClasspathConfigurationName) {`
	`59`	`+ attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")`
	`60`	`+ }`
	`61`	`+ }`
`54`	`62`	`}`
`55`	`63`
`56`	`64`	`Properties localProperties = new Properties()`
`@@ -91,6 +99,7 @@ android {`
`91`	`99`	`}`
`92`	`100`	`packagingOptions {`
`93`	`101`	`pickFirst 'META-INF/**/coroutines.pro'`
	`102`	`+ pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'`
`94`	`103`	`}`
`95`	`104`	`lintOptions {`
`96`	`105`	`abortOnError false`
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.2.0')`
`63`	`63`	`implementation 'com.google.firebase:firebase-analytics'`
`64`	`64`	`implementation 'com.google.firebase:firebase-messaging'`
`65`	`65`	`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.2.0')`
`136`	`136`	`}`
`137`	`137`	`for (String lib : firebaseCpp.dependencies.libSet) {`
`138`	`138`	`// Messaging includes an aar, which to be depended on properly requires`