不再为每个micromodule生成各自的R类

EastWoodYang · Jul 2, 2019 · 99ef8bc · 99ef8bc
1 parent dbecfad
commit 99ef8bc
Show file tree

Hide file tree

Showing 27 changed files with 61 additions and 694 deletions.
diff --git a/application/p_base/src/main/java/com/eastwood/demo/application/base/Base.java b/application/p_base/src/main/java/com/eastwood/demo/application/base/Base.java
@@ -1,5 +1,7 @@
 package com.eastwood.demo.application.base;
 
+import com.eastwood.demo.application.R;
+
 /**
  * @author eastwood
  * createDate: 2018-05-29

diff --git a/application/p_common/src/main/java/com/eastwood/demo/application/common/Common.java b/application/p_common/src/main/java/com/eastwood/demo/application/common/Common.java
@@ -1,5 +1,7 @@
 package com.eastwood.demo.application.common;
 
+import com.eastwood.demo.application.R;
+
 /**
  * @author eastwood
  * createDate: 2018-11-26

diff --git a/application/p_home/src/main/java/com/eastwood/demo/application/home/Home.java b/application/p_home/src/main/java/com/eastwood/demo/application/home/Home.java
@@ -1,5 +1,7 @@
 package com.eastwood.demo.application.home;
 
+import com.eastwood.demo.application.R;
+
 /**
  * @author eastwood
  * createDate: 2018-11-26

diff --git a/kotlin/build.gradle b/kotlin/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'micro-module'
 apply plugin: 'com.android.library'
 
 apply plugin: 'kotlin-android'
-
 apply plugin: 'kotlin-android-extensions'
 
 android {
@@ -23,8 +22,15 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+
+        preview {
+
+        }
     }
 
+    androidExtensions {
+        experimental = true
+    }
 }
 
 microModule {

diff --git a/kotlin/main/build.gradle b/kotlin/main/build.gradle
@@ -1,19 +1,6 @@
 // MicroModule build file where you can add configuration options to publish MicroModule(aar) to Maven 
 // and declare MicroModule dependencies.
 
-microModule {
-    mavenArtifact {
-        groupId 'com.eastwood.demo'
-        artifactId 'kotlin-main'
-        version '1.0.0-SNAPSHOT'
-
-        repository {
-            url "***"
-            authentication(userName: '***', password: '***')
-        }
-    }
-}
-
 dependencies {
     implementation fileTree(dir: 'main/libs', include: ['*.jar'])
 //    implementation microModule(':p_common')

diff --git a/kotlin/main/src/main/java/com/eastwood/demo/kotlin/Test.kt b/kotlin/main/src/main/java/com/eastwood/demo/kotlin/Test.kt
@@ -9,7 +9,7 @@ class Test {
 
     fun test() {
         // can't use [R.string.kotlin_common] which from microModule ':p_common'.
-        var i = R.string.kotlin_common
+//        var i = R.string.kotlin_common
     }
 
 }
diff --git a/kotlin/main/src/main/kotlin/com/eastwood/demo/kotlin/Test1.kt b/kotlin/main/src/main/kotlin/com/eastwood/demo/kotlin/Test1.kt
@@ -9,7 +9,7 @@ class Test1 {
 
     fun test() {
         // can't use [R.string.kotlin_common] which from microModule ':p_common'.
-        var i = R.string.kotlin_common
+//        var i = R.string.kotlin_common
     }
 
 }
diff --git a/kotlin/p_common/build.gradle b/kotlin/p_common/build.gradle
@@ -1,22 +1,6 @@
 // MicroModule build file where you can add configuration options to publish MicroModule(aar) to Maven 
 // and declare MicroModule dependencies.
 
-microModule {
-
-    useMavenArtifact false
-
-    mavenArtifact {
-        groupId 'com.eastwood.demo'
-        artifactId 'kotlin-p_common'
-        version '1.0.0-SNAPSHOT'
-
-        repository {
-            url "***"
-            authentication(userName: '***', password: '***')
-        }
-    }
-}
-
 dependencies {
     implementation fileTree(dir: 'p_common/libs', include: ['*.jar'])
 }
diff --git a/kotlin/p_common/src/main/java/com/eastwood/demo/kotlin/common/Common.kt b/kotlin/p_common/src/main/java/com/eastwood/demo/kotlin/common/Common.kt
@@ -1,5 +1,7 @@
 package com.eastwood.demo.kotlin.common
 
+import com.eastwood.demo.kotlin.R
+
 /**
  *
  * @author eastwood
@@ -8,6 +10,7 @@ package com.eastwood.demo.kotlin.common
 class Common {
 
     fun test() {
+
         var i = R.string.kotlin_common
     }
 

diff --git a/kotlin/p_common/src/main/kotlin/com/eastwood/demo/kotlin/common/Common1.kt b/kotlin/p_common/src/main/kotlin/com/eastwood/demo/kotlin/common/Common1.kt
@@ -1,5 +1,7 @@
 package com.eastwood.demo.kotlin.common
 
+import com.eastwood.demo.kotlin.R
+
 /**
  *
  * @author eastwood

diff --git a/library/main/build.gradle b/library/main/build.gradle
@@ -1,19 +1,3 @@
-microModule {
-
-    useMavenArtifact false
-
-    mavenArtifact {
-        groupId 'com.eastwood.demo'
-        artifactId 'library-main'
-        version '1.0.0-SNAPSHOT'
-
-        repository {
-            url "***"
-            authentication(userName: '***', password: '***')
-        }
-    }
-
-}
 
 dependencies {
     implementation microModule(':p_common')

diff --git a/library/p_base/build.gradle b/library/p_base/build.gradle
@@ -1,18 +1,3 @@
-microModule {
-
-    useMavenArtifact false
-
-    mavenArtifact {
-        groupId 'com.eastwood.demo'
-        artifactId 'library-p_base'
-        version '1.0.0-SNAPSHOT'
-
-        repository {
-            url "***"
-            authentication(userName: '***', password: '***')
-        }
-    }
-}
 
 dependencies {
 

diff --git a/library/p_base/src/main/java/com/eastwood/demo/library/base/Base.java b/library/p_base/src/main/java/com/eastwood/demo/library/base/Base.java
@@ -1,5 +1,7 @@
 package com.eastwood.demo.library.base;
 
+import com.eastwood.demo.library.R;
+
 /**
  * @author eastwood
  * createDate: 2018-11-09

diff --git a/library/p_common/build.gradle b/library/p_common/build.gradle
@@ -1,18 +1,3 @@
-microModule {
-
-    useMavenArtifact false
-
-    mavenArtifact {
-        groupId 'com.eastwood.demo'
-        artifactId 'library-p_common'
-        version '1.0.0-SNAPSHOT'
-
-        repository {
-            url "***"
-            authentication(userName: '***', password: '***')
-        }
-    }
-}
 
 dependencies {
     implementation microModule(':p_base')

diff --git a/library/p_common/src/main/java/com/eastwood/demo/library/common/Common.java b/library/p_common/src/main/java/com/eastwood/demo/library/common/Common.java
@@ -1,5 +1,7 @@
 package com.eastwood.demo.library.common;
 
+import com.eastwood.demo.library.R;
+
 /**
  * @author eastwood
  * createDate: 2018-11-09

diff --git a/library/p_utils/build.gradle b/library/p_utils/build.gradle
@@ -1,18 +1,3 @@
-microModule {
-
-    useMavenArtifact false
-
-    mavenArtifact {
-        groupId 'com.eastwood.demo'
-        artifactId 'library-p_util'
-        version '1.0.0-SNAPSHOT'
-
-        repository {
-            url "***"
-            authentication(userName: '***', password: '***')
-        }
-    }
-}
 
 dependencies {
 

diff --git a/library/p_utils/src/main/java/com/eastwood/demo/library/utils/Utils.java b/library/p_utils/src/main/java/com/eastwood/demo/library/utils/Utils.java
@@ -1,5 +1,7 @@
 package com.eastwood.demo.library.utils;
 
+import com.eastwood.demo.library.R;
+
 /**
  * @author eastwood
  * createDate: 2018-05-29