Add pickFirst for kotlin file that breaks build.

firebase · Sep 12, 2024 · ccaab81 · ccaab81
1 parent a1acb7a
commit ccaab81
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
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_shared_runtime.kotlin_module'
   }
 }
 

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_shared_runtime.kotlin_module'
   }
 }
 

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_shared_runtime.kotlin_module'
   }
 }
 

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_shared_runtime.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_shared_runtime.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_shared_runtime.kotlin_module'
   }
 }
 

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_shared_runtime.kotlin_module'
   }
 }
-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_shared_runtime.kotlin_module'
       }
     }
@@ Expand Down @@