Merge branch 'workflow/auto-update-deps-234-20240910-133322' into js-…

…gradle_update
firebase · Sep 24, 2024 · 8e18f60 · 8e18f60
2 parents 8de882c + 7a4a555
commit 8e18f60
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 14 deletions.
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
@@ -51,7 +51,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
@@ -54,7 +54,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
@@ -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.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
@@ -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-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
@@ -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.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
@@ -46,7 +46,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
@@ -54,7 +54,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
@@ -91,6 +91,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
@@ -51,7 +51,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
@@ -60,7 +60,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
@@ -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-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
@@ -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.firebase:firebase-storage'
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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'
       }
     }
@@ Expand Down @@