Add hack for Kotlin/kotlinx.coroutines#1120

caarmen · caarmen · commit 603690c2a6ca · 2019-04-21T16:14:29.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -281,3 +281,7 @@ kapt {
         option("-Xmaxerrs", 10000)
     }
 }
+
+android.packagingOptions {
+    pickFirst "META-INF/atomicfu.kotlin_module"
+}
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@
 buildscript {
     ext.gradle_plugin_version = '3.4.0'
     ext.kotlin_version = '1.3.30'
-    ext.kotlin_coroutines_version = '1.2.0'
+    ext.kotlin_coroutines_version = '1.2.0' // when we upgrade this, see if we can remove the packagingOptions hack https://github.com/Kotlin/kotlinx.coroutines/pull/1120
 
     ext.appcompat_version = "1.0.2"
     ext.collection_version = "1.0.0"

Original file line number	Diff line number	Diff line change
`@@ -281,3 +281,7 @@ kapt {`
`281`	`281`	`option("-Xmaxerrs", 10000)`
`282`	`282`	`}`
`283`	`283`	`}`
	`284`	`+`
	`285`	`+android.packagingOptions {`
	`286`	`+ pickFirst "META-INF/atomicfu.kotlin_module"`
	`287`	`+}`