Merge pull request #332 from trello/dlew/module-name-collision

Namespace Kotlin module names
trello-archive · Nov 5, 2020 · 5725b69 · 5725b69
2 parents 53b3a9b + 6b3154f
commit 5725b69
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/rxlifecycle-android-lifecycle-kotlin/build.gradle b/rxlifecycle-android-lifecycle-kotlin/build.gradle
@@ -8,6 +8,10 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
     }
+
+    kotlinOptions {
+        freeCompilerArgs += ["-module-name", "rxlifecycle-android-lifecycle-kotlin-4"]
+    }
 }
 
 repositories {

diff --git a/rxlifecycle-kotlin/build.gradle b/rxlifecycle-kotlin/build.gradle
@@ -8,6 +8,10 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
     }
+
+    kotlinOptions {
+        freeCompilerArgs += ["-module-name", "rxlifecycle-kotlin-4"]
+    }
 }
 
 repositories {

diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,7 @@
-include ':rxlifecycle', ':rxlifecycle-android-lifecycle-kotlin'
+include ':rxlifecycle'
 include ':rxlifecycle-android'
 include ':rxlifecycle-android-lifecycle'
+include ':rxlifecycle-android-lifecycle-kotlin'
 include ':rxlifecycle-components'
 include ':rxlifecycle-components-preference'
 include ':rxlifecycle-kotlin'