Pick first fixes for duplicate files

sadevelopment · sadevelopment · commit a37f506a24b7 · 2020-05-20T16:30:41.000+01:00
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -29,6 +29,8 @@ android {
     }
     packagingOptions {
         pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+        pickFirst("META-INF/AL2.0")
+        pickFirst("META-INF/LGPL2.1")
     }
 }
 
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -24,6 +24,8 @@ android {
     }
     packagingOptions {
         pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+        pickFirst("META-INF/AL2.0")
+        pickFirst("META-INF/LGPL2.1")
     }
 }
 
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -24,6 +24,8 @@ android {
     }
     packagingOptions {
         pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+        pickFirst("META-INF/AL2.0")
+        pickFirst("META-INF/LGPL2.1")
     }
 }
 
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -24,6 +24,8 @@ android {
     }
     packagingOptions {
         pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+        pickFirst("META-INF/AL2.0")
+        pickFirst("META-INF/LGPL2.1")
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ android {`
`29`	`29`	`}`
`30`	`30`	`packagingOptions {`
`31`	`31`	`pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")`
	`32`	`+ pickFirst("META-INF/AL2.0")`
	`33`	`+ pickFirst("META-INF/LGPL2.1")`
`32`	`34`	`}`
`33`	`35`	`}`
`34`	`36`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ android {`
`24`	`24`	`}`
`25`	`25`	`packagingOptions {`
`26`	`26`	`pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")`
	`27`	`+ pickFirst("META-INF/AL2.0")`
	`28`	`+ pickFirst("META-INF/LGPL2.1")`
`27`	`29`	`}`
`28`	`30`	`}`
`29`	`31`