Add a wildcard since it's more than one file.

jonsimantov · jonsimantov · commit b9931afa3b0c · 2024-09-12T16:48:28.000-07:00
diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle
@@ -85,7 +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'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
@@ -76,7 +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'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle
@@ -76,7 +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'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle
@@ -76,7 +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'
+    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,7 +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'
+    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,7 +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'
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
   }
 }
 
diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle
@@ -76,8 +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'
-  }
+    pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

Original file line number	Diff line number	Diff line change
`@@ -85,7 +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_shared_runtime.kotlin_module'`
	`88`	`+ pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +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_shared_runtime.kotlin_module'`
	`79`	`+ pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ android {`
`91`	`91`	`}`
`92`	`92`	`packagingOptions {`
`93`	`93`	`pickFirst 'META-INF/**/coroutines.pro'`
`94`		`- pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.kotlin_shared_runtime.kotlin_module'`
	`94`	`+ pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'`
`95`	`95`	`}`
`96`	`96`	`lintOptions {`
`97`	`97`	`abortOnError false`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +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_shared_runtime.kotlin_module'`
`80`		`- }`
	`79`	`+ pickFirst 'META-INF/third_party.java_src.protobuf.current.java.com.google.protobuf.*.kotlin_module'`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"`