release build-gradle 1.1.0

mrzhang · mrzhang · commit 72aeb6c85c5f · 2018-01-16T14:51:53.000+08:00
diff --git a/basiclib/build.gradle b/basiclib/build.gradle
@@ -28,7 +28,6 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:26.+'
     testCompile 'junit:junit:4.12'
-    compile 'com.squareup.okhttp3:okhttp:3.4.1'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.luojilab.ddcomponent:componentlib:1.0.0'
 }
diff --git a/basiclib/src/main/AndroidManifest.xml b/basiclib/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <application
         android:allowBackup="true"
-        android:label="@string/app_name"
+        android:label="@string/kotlin_app_name"
         android:supportsRtl="true">
 
     </application>
diff --git a/basiclib/src/main/res/values/strings.xml b/basiclib/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">basiclib</string>
+    <string name="kotlin_app_name">basiclib</string>
 </resources>
diff --git a/basicres/src/main/AndroidManifest.xml b/basicres/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 
     package="com.luojilab.component.basicres">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
+    <application android:allowBackup="true" android:label="@string/kotlin_app_name"
         android:supportsRtl="true">
 
     </application>
diff --git a/build-gradle/build.gradle b/build-gradle/build.gradle
@@ -5,7 +5,7 @@ ext {
     artifact = bintrayName
     libraryName = 'component build'
     libraryDescription = 'gradle plugin for buid component'
-    libraryVersion = "1.0.0"
+    libraryVersion = "1.1.0"
     licenseName = 'The Apache Software License, Version 2.0'
     licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
     allLicenses = ["Apache-2.0"]
diff --git a/build-gradle/src/main/groovy/com.dd.buildgradle/ComBuild.groovy b/build-gradle/src/main/groovy/com.dd.buildgradle/ComBuild.groovy
@@ -3,9 +3,8 @@ package com.dd.buildgradle
 import com.dd.buildgradle.exten.ComExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.Task
 
-public class ComBuild implements Plugin<Project> {
+class ComBuild implements Plugin<Project> {
 
     //默认是app，直接运行assembleRelease的时候，等同于运行app:assembleRelease
     String compilemodule = "app"
@@ -14,31 +13,31 @@ public class ComBuild implements Plugin<Project> {
         project.extensions.create('combuild', ComExtension)
 
         String taskNames = project.gradle.startParameter.taskNames.toString()
-        System.out.println("taskNames is " + taskNames);
+        System.out.println("taskNames is " + taskNames)
         String module = project.path.replace(":", "")
-        System.out.println("current module is " + module);
+        System.out.println("current module is " + module)
         AssembleTask assembleTask = getTaskInfo(project.gradle.startParameter.taskNames)
 
         if (assembleTask.isAssemble) {
-            fetchMainmodulename(project, assembleTask);
-            System.out.println("compilemodule  is " + compilemodule);
+            fetchMainmodulename(project, assembleTask)
+            System.out.println("compilemodule  is " + compilemodule)
         }
 
         if (!project.hasProperty("isRunAlone")) {
             throw new RuntimeException("you should set isRunAlone in " + module + "'s gradle.properties")
         }
 
         //对于isRunAlone==true的情况需要根据实际情况修改其值，
-        // 但如果是false，则不用修改，该module作为一个lib，运行module:assembleRelease则发布aar到中央仓库
+        // 但如果是false，则不用修改
         boolean isRunAlone = Boolean.parseBoolean((project.properties.get("isRunAlone")))
         String mainmodulename = project.rootProject.property("mainmodulename")
         if (isRunAlone && assembleTask.isAssemble) {
             //对于要编译的组件和主项目，isRunAlone修改为true，其他组件都强制修改为false
             //这就意味着组件不能引用主项目，这在层级结构里面也是这么规定的
             if (module.equals(compilemodule) || module.equals(mainmodulename)) {
-                isRunAlone = true;
+                isRunAlone = true
             } else {
-                isRunAlone = false;
+                isRunAlone = false
             }
         }
         project.setProperty("isRunAlone", isRunAlone)
@@ -55,32 +54,14 @@ public class ComBuild implements Plugin<Project> {
                     }
                 }
             }
-            System.out.println("apply plugin is " + 'com.android.application');
+            System.out.println("apply plugin is " + 'com.android.application')
             if (assembleTask.isAssemble && module.equals(compilemodule)) {
                 compileComponents(assembleTask, project)
                 project.android.registerTransform(new ComCodeTransform(project))
             }
         } else {
             project.apply plugin: 'com.android.library'
-            System.out.println("apply plugin is " + 'com.android.library');
-            project.afterEvaluate {
-                Task assembleReleaseTask = project.tasks.findByPath("assembleRelease")
-                if (assembleReleaseTask != null) {
-                    assembleReleaseTask.doLast {
-                        File infile = project.file("build/outputs/aar/$module-release.aar")
-                        File outfile = project.file("../componentrelease")
-                        File desFile = project.file("$module-release.aar");
-                        project.copy {
-                            from infile
-                            into outfile
-                            rename {
-                                String fileName -> desFile.name
-                            }
-                        }
-                        System.out.println("$module-release.aar copy success ");
-                    }
-                }
-            }
+            System.out.println("apply plugin is " + 'com.android.library')
         }
 
     }
@@ -99,7 +80,7 @@ public class ComBuild implements Plugin<Project> {
         if (assembleTask.modules.size() > 0 && assembleTask.modules.get(0) != null
                 && assembleTask.modules.get(0).trim().length() > 0
                 && !assembleTask.modules.get(0).equals("all")) {
-            compilemodule = assembleTask.modules.get(0);
+            compilemodule = assembleTask.modules.get(0)
         } else {
             compilemodule = project.rootProject.property("mainmodulename")
         }
@@ -109,67 +90,72 @@ public class ComBuild implements Plugin<Project> {
     }
 
     private AssembleTask getTaskInfo(List<String> taskNames) {
-        AssembleTask assembleTask = new AssembleTask();
+        AssembleTask assembleTask = new AssembleTask()
         for (String task : taskNames) {
             if (task.toUpperCase().contains("ASSEMBLE")
                     || task.contains("aR")
+                    || task.toUpperCase().contains("INSTALL")
                     || task.toUpperCase().contains("RESGUARD")) {
                 if (task.toUpperCase().contains("DEBUG")) {
-                    assembleTask.isDebug = true;
+                    assembleTask.isDebug = true
                 }
-                assembleTask.isAssemble = true;
+                assembleTask.isAssemble = true
                 String[] strs = task.split(":")
-                assembleTask.modules.add(strs.length > 1 ? strs[strs.length - 2] : "all");
-                break;
+                assembleTask.modules.add(strs.length > 1 ? strs[strs.length - 2] : "all")
+                break
             }
         }
         return assembleTask
     }
 
     /**
      * 自动添加依赖，只在运行assemble任务的才会添加依赖，因此在开发期间组件之间是完全感知不到的，这是做到完全隔离的关键
-     * 支持两种语法：module或者modulePackage:module,前者之间引用module工程，后者使用componentrelease中已经发布的aar
+     * 支持两种语法：module或者groupId:artifactId:version(@aar),前者之间引用module工程，后者使用maven中已经发布的aar
      * @param assembleTask
      * @param project
      */
     private void compileComponents(AssembleTask assembleTask, Project project) {
-        String components;
+        String components
         if (assembleTask.isDebug) {
             components = (String) project.properties.get("debugComponent")
         } else {
             components = (String) project.properties.get("compileComponent")
         }
 
         if (components == null || components.length() == 0) {
-            System.out.println("there is no add dependencies ");
-            return;
+            System.out.println("there is no add dependencies ")
+            return
         }
         String[] compileComponents = components.split(",")
         if (compileComponents == null || compileComponents.length == 0) {
-            System.out.println("there is no add dependencies ");
-            return;
+            System.out.println("there is no add dependencies ")
+            return
         }
         for (String str : compileComponents) {
-            System.out.println("comp is " + str);
+            System.out.println("comp is " + str)
             if (str.contains(":")) {
-                File file = project.file("../componentrelease/" + str.split(":")[1] + "-release.aar")
-                if (file.exists()) {
-                    project.dependencies.add("compile", str + "-release@aar")
-                    System.out.println("add dependencies : " + str + "-release@aar");
-                } else {
-                    throw new RuntimeException(str + " not found ! maybe you should generate a new one ")
-                }
+                /**
+                 * 示例语法:groupId:artifactId:version(@aar)
+                 * compileComponent=com.luojilab.reader:readercomponent:1.0.0
+                 * 注意，前提是已经将组件aar文件发布到maven上，并配置了相应的repositories
+                 */
+                project.dependencies.add("compile", str)
+                System.out.println("add dependencies lib  : " + str)
             } else {
+                /**
+                 * 示例语法:module
+                 * compileComponent=readercomponent,sharecomponent
+                 */
                 project.dependencies.add("compile", project.project(':' + str))
-                System.out.println("add dependencies project : " + str);
+                System.out.println("add dependencies project : " + str)
             }
         }
     }
 
     private class AssembleTask {
-        boolean isAssemble = false;
-        boolean isDebug = false;
-        List<String> modules = new ArrayList<>();
+        boolean isAssemble = false
+        boolean isDebug = false
+        List<String> modules = new ArrayList<>()
     }
 
 }
diff --git a/build-gradle/src/main/groovy/com.dd.buildgradle/ComCodeTransform.groovy b/build-gradle/src/main/groovy/com.dd.buildgradle/ComCodeTransform.groovy
@@ -7,44 +7,44 @@ import org.apache.commons.codec.digest.DigestUtils
 import org.apache.commons.io.FileUtils
 import org.gradle.api.Project
 
-public class ComCodeTransform extends Transform {
+class ComCodeTransform extends Transform {
 
     private Project project
     ClassPool classPool
-    String applicationName;
+    String applicationName
 
     ComCodeTransform(Project project) {
         this.project = project
     }
 
     @Override
     void transform(TransformInvocation transformInvocation) throws TransformException, InterruptedException, IOException {
-        getRealApplicationName(transformInvocation.getInputs());
+        getRealApplicationName(transformInvocation.getInputs())
         classPool = new ClassPool()
         project.android.bootClasspath.each {
             classPool.appendClassPath((String) it.absolutePath)
         }
         def box = ConvertUtils.toCtClasses(transformInvocation.getInputs(), classPool)
 
         //要收集的application，一般情况下只有一个
-        List<CtClass> applications = new ArrayList<>();
+        List<CtClass> applications = new ArrayList<>()
         //要收集的applicationlikes，一般情况下有几个组件就有几个applicationlike
-        List<CtClass> activators = new ArrayList<>();
+        List<CtClass> activators = new ArrayList<>()
 
         for (CtClass ctClass : box) {
             if (isApplication(ctClass)) {
                 applications.add(ctClass)
-                continue;
+                continue
             }
             if (isActivator(ctClass)) {
                 activators.add(ctClass)
             }
         }
         for (CtClass ctClass : applications) {
-            System.out.println("application is   " + ctClass.getName());
+            System.out.println("application is   " + ctClass.getName())
         }
         for (CtClass ctClass : activators) {
-            System.out.println("applicationlike is   " + ctClass.getName());
+            System.out.println("applicationlike is   " + ctClass.getName())
         }
 
         transformInvocation.inputs.each { TransformInput input ->
@@ -78,7 +78,7 @@ public class ComCodeTransform extends Transform {
                         if (classNameTemp.endsWith(".class")) {
                             String className = classNameTemp.substring(1, classNameTemp.length() - 6)
                             if (className.equals(applicationName)) {
-                                injectApplicationCode(applications.get(0), activators, fileName);
+                                injectApplicationCode(applications.get(0), activators, fileName)
                             }
                         }
                     }
@@ -102,30 +102,30 @@ public class ComCodeTransform extends Transform {
 
 
     private void injectApplicationCode(CtClass ctClassApplication, List<CtClass> activators, String patch) {
-        System.out.println("injectApplicationCode begin");
-        ctClassApplication.defrost();
+        System.out.println("injectApplicationCode begin")
+        ctClassApplication.defrost()
         try {
             CtMethod attachBaseContextMethod = ctClassApplication.getDeclaredMethod("onCreate", null)
             attachBaseContextMethod.insertAfter(getAutoLoadComCode(activators))
         } catch (CannotCompileException | NotFoundException e) {
-            StringBuilder methodBody = new StringBuilder();
-            methodBody.append("protected void onCreate() {");
-            methodBody.append("super.onCreate();");
+            StringBuilder methodBody = new StringBuilder()
+            methodBody.append("protected void onCreate() {")
+            methodBody.append("super.onCreate();")
             methodBody.
-                    append(getAutoLoadComCode(activators));
-            methodBody.append("}");
-            ctClassApplication.addMethod(CtMethod.make(methodBody.toString(), ctClassApplication));
+                    append(getAutoLoadComCode(activators))
+            methodBody.append("}")
+            ctClassApplication.addMethod(CtMethod.make(methodBody.toString(), ctClassApplication))
         } catch (Exception e) {
 
         }
         ctClassApplication.writeFile(patch)
         ctClassApplication.detach()
 
-        System.out.println("injectApplicationCode success ");
+        System.out.println("injectApplicationCode success ")
     }
 
     private String getAutoLoadComCode(List<CtClass> activators) {
-        StringBuilder autoLoadComCode = new StringBuilder();
+        StringBuilder autoLoadComCode = new StringBuilder()
         for (CtClass ctClass : activators) {
             autoLoadComCode.append("new " + ctClass.getName() + "()" + ".onCreate();")
         }
@@ -137,26 +137,26 @@ public class ComCodeTransform extends Transform {
     private boolean isApplication(CtClass ctClass) {
         try {
             if (applicationName != null && applicationName.equals(ctClass.getName())) {
-                return true;
+                return true
             }
         } catch (Exception e) {
             println "class not found exception class name:  " + ctClass.getName()
         }
-        return false;
+        return false
     }
 
     private boolean isActivator(CtClass ctClass) {
         try {
             for (CtClass ctClassInter : ctClass.getInterfaces()) {
                 if ("com.luojilab.component.componentlib.applicationlike.IApplicationLike".equals(ctClassInter.name)) {
-                    return true;
+                    return true
                 }
             }
         } catch (Exception e) {
             println "class not found exception class name:  " + ctClass.getName()
         }
 
-        return false;
+        return false
     }
 
     @Override
diff --git a/build-gradle/src/main/groovy/com.dd.buildgradle/ConvertUtils.groovy b/build-gradle/src/main/groovy/com.dd.buildgradle/ConvertUtils.groovy
diff --git a/build.gradle b/build.gradle
diff --git a/sharecomponentkotlin/src/main/res/values/strings.xml b/sharecomponentkotlin/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ dependencies {`
`28`	`28`	`})`
`29`	`29`	`compile 'com.android.support:appcompat-v7:26.+'`
`30`	`30`	`testCompile 'junit:junit:4.12'`
`31`		`- compile 'com.squareup.okhttp3:okhttp:3.4.1'`
`32`	`31`	`compile 'com.squareup.picasso:picasso:2.5.2'`
`33`	`32`	`compile 'com.luojilab.ddcomponent:componentlib:1.0.0'`
`34`	`33`	`}`