support android gradle plugin 3.0.0

typ0520 · Nov 2, 2017 · 2b74ab4 · 2b74ab4
1 parent 03ae8bb
commit 2b74ab4
Show file tree

Hide file tree

Showing 51 changed files with 1,471 additions and 4,068 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.8.0  (2017-11-2)
+
+Features:
+
+  - 支持android gradle plugin 3.0
+
+Bugfixes:
+
+   - 修复assets目录为空时生成资源补丁出错的问题
+
 ## 0.7.4  (2017-10-20)
 
 Bugfixes:

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Android API 9(2.3)+  ; android-gradle-build 2.0.0+
         }
         
         dependencies {
-            classpath 'com.github.typ0520:fastdex-gradle:0.7.4'
+            classpath 'com.github.typ0520:fastdex-gradle:0.8.0'
         }
     }
    	````
@@ -95,7 +95,7 @@ Android API 9(2.3)+  ; android-gradle-build 2.0.0+
      classes.dex         => classes2.dex
      classes2.dex        => classes3.dex
      然后运行期在入口Application(fastdex.runtime.FastdexApplication)使用MultiDex把所有的dex加载进来
-  - @see [fastdex.build.transform.FastdexTransform](https://github.com/typ0520/fastdex/blob/master/fastdex-gradle/src/main/groovy/fastdex/build/transform/FastdexTransform.groovy)
+  - @see [fastdex.build.transform.FastdexDexTransform](https://github.com/typ0520/fastdex/blob/master/fastdex-gradle/src/main/groovy/fastdex/build/transform/FastdexTransform.groovy)
   - 7、保存资源映射表，为了保持id的值一致，详情看
   - @see [fastdex.build.task.FastdexResourceIdTask](https://github.com/typ0520/fastdex/blob/master/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexResourceIdTask.groovy)
 

diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url 'https://maven.google.com' }
         maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
     }
 
@@ -17,6 +18,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url 'https://maven.google.com' }
     }
 }
 

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/FastdexPlugin.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/FastdexPlugin.groovy
diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/extension/FastdexExtension.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/extension/FastdexExtension.groovy
@@ -3,7 +3,7 @@ package fastdex.build.extension
 /**
  * Created by tong on 17/10/3.
  */
-public class FastdexExtension {
+class FastdexExtension {
     /**
      * 是否可用
      */

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexCleanTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexCleanTask.groovy
@@ -9,15 +9,15 @@ import org.gradle.api.tasks.TaskAction
  * 清空指定variantName的缓存，如果variantName == null清空所有缓存
  * Created by tong on 17/3/12.
  */
-public class FastdexCleanTask extends DefaultTask {
+class FastdexCleanTask extends DefaultTask {
     FastdexVariant fastdexVariant
 
     FastdexCleanTask() {
         group = 'fastdex'
     }
 
     @TaskAction
-    void clean() {
+    def clean() {
         if (fastdexVariant == null) {
             FastdexUtils.cleanAllCache(project)
         }

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexCreateMaindexlistFileTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexCreateMaindexlistFileTask.groovy
@@ -10,15 +10,15 @@ import org.gradle.api.tasks.TaskAction
  * 所以这个任务就没有存在的意义了，禁止掉这个任务以提高打包速度，但是transformClassesWithDexFor${variantName}会使用这个任务输出的txt文件，所以需要生成一个空文件防止报错
  * Created by tong on 17/3/12.
  */
-public class FastdexCreateMaindexlistFileTask extends DefaultTask {
+class FastdexCreateMaindexlistFileTask extends DefaultTask {
     FastdexVariant fastdexVariant
 
     FastdexCreateMaindexlistFileTask() {
         group = 'fastdex'
     }
 
     @TaskAction
-    void createFile() {
+    def createFile() {
         if (fastdexVariant.androidVariant != null) {
             File maindexlistFile = fastdexVariant.androidVariant.getVariantData().getScope().getMainDexListFile()
             File parentFile = maindexlistFile.getParentFile()

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexCustomJavacTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexCustomJavacTask.groovy
@@ -30,7 +30,7 @@ import java.nio.file.attribute.BasicFileAttributes
  *
  * Created by tong on 17/3/12.
  */
-public class FastdexCustomJavacTask extends DefaultTask {
+class FastdexCustomJavacTask extends DefaultTask {
     FastdexVariant fastdexVariant
     Task javaCompile
     Task javacIncrementalSafeguard
@@ -60,7 +60,7 @@ public class FastdexCustomJavacTask extends DefaultTask {
     }
 
     @TaskAction
-    void compile() {
+    def compile() {
         if (!fastdexVariant.hasDexCache) {
             project.logger.error("==fastdex miss dex cache, just ignore")
             return
@@ -248,8 +248,8 @@ public class FastdexCustomJavacTask extends DefaultTask {
                     project.logger.error("==fastdex apply class to ${destFile}")
 
                     String classRelativePath = relativePath.toString()
-                    classRelativePath = classRelativePath.substring(0, classRelativePath.length() - ShareConstants.CLASS_SUFFIX.length());
-                    classRelativePath = classRelativePath.replaceAll(Os.isFamily(Os.FAMILY_WINDOWS) ? "\\\\" : File.separator,"\\.");
+                    classRelativePath = classRelativePath.substring(0, classRelativePath.length() - ShareConstants.CLASS_SUFFIX.length())
+                    classRelativePath = classRelativePath.replaceAll(Os.isFamily(Os.FAMILY_WINDOWS) ? "\\\\" : File.separator,"\\.")
 
                     int index = classRelativePath.indexOf("\$")
                     if (index != -1) {

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexDataBindingPrepareTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexDataBindingPrepareTask.groovy
diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexInstantRunMarkTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexInstantRunMarkTask.groovy
@@ -7,15 +7,15 @@ import org.gradle.api.tasks.TaskAction
 /**
  * Created by tong on 17/3/12.
  */
-public class FastdexInstantRunMarkTask extends DefaultTask {
+class FastdexInstantRunMarkTask extends DefaultTask {
     FastdexVariant fastdexVariant
 
     FastdexInstantRunMarkTask() {
         group = 'fastdex'
     }
 
     @TaskAction
-    void mark() {
+    def mark() {
         fastdexVariant.fastdexInstantRun.fromFastdexInstantRun = true
         project.logger.error("==fastdex fromFastdexInstantRun: true")
 
@@ -27,11 +27,6 @@ public class FastdexInstantRunMarkTask extends DefaultTask {
                 } catch (Throwable e) {
 
                 }
-//                try {
-//                    fastdexVariant.fastdexInstantRun.startTransparentActivity(true)
-//                } catch (Throwable e) {
-//
-//                }
             }
         }).start()
     }

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexInstantRunTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexInstantRunTask.groovy
@@ -9,15 +9,15 @@ import org.gradle.api.tasks.TaskAction
 /**
  * Created by tong on 17/3/12.
  */
-public class FastdexInstantRunTask extends DefaultTask {
+class FastdexInstantRunTask extends DefaultTask {
     FastdexVariant fastdexVariant
 
     FastdexInstantRunTask() {
         group = 'fastdex'
     }
 
     @TaskAction
-    void instantRun() {
+    def instantRun() {
         FastdexInstantRun fastdexInstantRun = fastdexVariant.fastdexInstantRun
 
         if (!fastdexInstantRun.isInstallApk()) {

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexManifestTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexManifestTask.groovy
@@ -14,7 +14,7 @@ import org.gradle.api.tasks.TaskAction
  *
  * Created by tong on 17/3/11.
  */
-public class FastdexManifestTask extends DefaultTask {
+class FastdexManifestTask extends DefaultTask {
     static final String FASTDEX_ORIGIN_APPLICATION_CLASSNAME = "FASTDEX_ORIGIN_APPLICATION_CLASSNAME"
     static final String FASTDEX_BOOT_ACTIVITY_CLASSNAME = "FASTDEX_BOOT_ACTIVITY_CLASSNAME"
     static final String MIDDLEWARE_ACTIVITY = "fastdex.runtime.MiddlewareActivity"
@@ -34,7 +34,7 @@ public class FastdexManifestTask extends DefaultTask {
 
         def application = xml.application[0]
         if (application) {
-            QName nameAttr = new QName("http://schemas.android.com/apk/res/android", 'name', 'android');
+            QName nameAttr = new QName("http://schemas.android.com/apk/res/android", 'name', 'android')
             def applicationName = application.attribute(nameAttr)
             if (applicationName == null || applicationName.isEmpty()) {
                 applicationName = "android.app.Application"

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexPatchTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexPatchTask.groovy
@@ -16,7 +16,7 @@ import org.gradle.api.tasks.TaskAction
 /**
  * Created by tong on 17/3/12.
  */
-public class FastdexPatchTask extends DefaultTask {
+class FastdexPatchTask extends DefaultTask {
     FastdexVariant fastdexVariant
 
     FastdexPatchTask() {
@@ -59,7 +59,7 @@ public class FastdexPatchTask extends DefaultTask {
         try {
             runtimeMetaInfo = serviceCommunicator.talkToService(fastdexInstantRun.device, new Communicator<MetaInfo>() {
                 @Override
-                public MetaInfo communicate(DataInputStream input, DataOutputStream output) throws IOException {
+                MetaInfo communicate(DataInputStream input, DataOutputStream output) throws IOException {
                     output.writeInt(ProtocolConstants.MESSAGE_PING_AND_SHOW_TOAST)
 
                     MetaInfo info = new MetaInfo()
@@ -106,7 +106,6 @@ public class FastdexPatchTask extends DefaultTask {
 
         } catch (Throwable e) {
             if (!(e instanceof FastdexRuntimeException)) {
-                e.printStackTrace()
                 fastdexVariant.project.logger.error("==fastdex ping installed app fail: " + e.message)
             }
             return
@@ -140,7 +139,7 @@ public class FastdexPatchTask extends DefaultTask {
         try {
             boolean result = serviceCommunicator.talkToService(fastdexInstantRun.device, new Communicator<Boolean>() {
                 @Override
-                public Boolean communicate(DataInputStream input, DataOutputStream output) throws IOException {
+                Boolean communicate(DataInputStream input, DataOutputStream output) throws IOException {
                     output.writeInt(ProtocolConstants.MESSAGE_PATCHES)
                     output.writeLong(ShareConstants.MESSAGE_TOKEN)
                     output.writeInt(changeCount)
@@ -184,7 +183,7 @@ public class FastdexPatchTask extends DefaultTask {
                     }
                 }
             })
-            long end = System.currentTimeMillis();
+            long end = System.currentTimeMillis()
             project.logger.error("==fastdex send patch data success. use: ${end - start}ms")
 
             //app不在后台、补丁发送失败、补丁中包含dex并且有设置使用命令强制重启
@@ -195,7 +194,9 @@ public class FastdexPatchTask extends DefaultTask {
             }
             fastdexInstantRun.setInstallApk(false)
         } catch (Throwable e) {
-            e.printStackTrace()
+            if (!(e instanceof FastdexRuntimeException)) {
+                fastdexVariant.project.logger.error("==fastdex send patch fail: " + e.message)
+            }
         }
     }
 

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexPrepareTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexPrepareTask.groovy
@@ -8,15 +8,15 @@ import org.gradle.api.tasks.TaskAction
  * 准备上下文环境
  * Created by tong on 17/4/18.
  */
-public class FastdexPrepareTask extends DefaultTask {
+class FastdexPrepareTask extends DefaultTask {
     FastdexVariant fastdexVariant
 
     FastdexPrepareTask() {
         group = 'fastdex'
     }
 
     @TaskAction
-    void prepareContext() {
+    def prepareContext() {
         fastdexVariant.prepareEnv()
     }
 }
diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexResourceIdTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexResourceIdTask.groovy
@@ -22,7 +22,7 @@ import fastdex.build.util.FastdexUtils
  *
  * Created by tong on 17/3/11.
  */
-public class FastdexResourceIdTask {
+class FastdexResourceIdTask {
     Project project
     FastdexVariant fastdexVariant
     String resDir
@@ -43,8 +43,8 @@ public class FastdexResourceIdTask {
         File idsXmlFile = FastdexUtils.getIdxXmlFile(project,fastdexVariant.variantName)
         File publicXmlFile = FastdexUtils.getPublicXmlFile(project,fastdexVariant.variantName)
 
-        String idsXml = resDir + "/values/ids.xml";
-        String publicXml = resDir + "/values/public.xml";
+        String idsXml = resDir + "/values/ids.xml"
+        String publicXml = resDir + "/values/public.xml"
         File resDirIdsXmlFile = new File(idsXml)
         File resDirPublicXmlFile = new File(publicXml)
 
@@ -61,8 +61,9 @@ public class FastdexResourceIdTask {
             return
         }
 
-        FileUtils.deleteFile(idsXml);
-        FileUtils.deleteFile(publicXml);
+        FileUtils.deleteFile(idsXml)
+        FileUtils.deleteFile(publicXml)
+
         List<String> resourceDirectoryList = new ArrayList<String>()
         resourceDirectoryList.add(resDir)
 
@@ -72,7 +73,6 @@ public class FastdexResourceIdTask {
         AaptResourceCollector aaptResourceCollector = AaptUtil.collectResource(resourceDirectoryList, rTypeResourceMap)
         PatchUtil.generatePublicResourceXml(aaptResourceCollector, idsXml, publicXml)
         File publicFile = new File(publicXml)
-
         if (publicFile.exists()) {
             FileUtils.copyFileUsingStream(publicFile, publicXmlFile)
             project.logger.error("==fastdex gen resource public.xml in ${Constants.RESOURCE_PUBLIC_XML}")

diff --git a/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexScanAptOutputTask.groovy b/fastdex-gradle/src/main/groovy/fastdex/build/task/FastdexScanAptOutputTask.groovy
@@ -16,15 +16,15 @@ import org.gradle.api.tasks.TaskAction
  * 恢复对apt目录的扫描
  * Created by tong on 17/10/13.
  */
-public class FastdexScanAptOutputTask extends DefaultTask {
+class FastdexScanAptOutputTask extends DefaultTask {
     FastdexVariant fastdexVariant
 
     FastdexScanAptOutputTask() {
         group = 'fastdex'
     }
 
     @TaskAction
-    void scan() {
+    def scan() {
         //如果没有使用自定义的编译任务需要拿老的apt快照与当前的对比
         boolean needDiff = fastdexVariant.hasDexCache && !fastdexVariant.compiledByCustomJavac
         //开启自定义的javac任务正常是不需要在扫描apt目录的，但是如果执行了dex merge会在保存一次当前快照，所以这种情况下要重新加回去
@@ -60,16 +60,16 @@ public class FastdexScanAptOutputTask extends DefaultTask {
                     project.logger.error("==fastdex not find old apt snapshoot")
 
                     //add
-                    JavaDirectoryDiffResultSet resultSet = aptDirectorySnapshoot.createEmptyResultSet();
+                    JavaDirectoryDiffResultSet resultSet = aptDirectorySnapshoot.createEmptyResultSet()
                     for (FileNode node : aptDirectorySnapshoot.nodes) {
-                        resultSet.add(new JavaFileDiffInfo(Status.ADDED,node,null));
+                        resultSet.add(new JavaFileDiffInfo(Status.ADDED,node,null))
                         project.logger.error("==fastdex find new apt file: " + node.uniqueKey)
                     }
-                    diffResultSet.mergeJavaDirectoryResultSet(sourceSetSnapshoot.path,resultSet);
+                    diffResultSet.mergeJavaDirectoryResultSet(sourceSetSnapshoot.path,resultSet)
                 }
                 else {
                     //diff
-                    JavaDirectoryDiffResultSet resultSet = (JavaDirectoryDiffResultSet) aptDirectorySnapshoot.diff(oldAptJavaDirectorySnapshoot);
+                    JavaDirectoryDiffResultSet resultSet = (JavaDirectoryDiffResultSet) aptDirectorySnapshoot.diff(oldAptJavaDirectorySnapshoot)
                     for (JavaFileDiffInfo diffInfo : resultSet.changedDiffInfos) {
                         if (diffInfo.status == Status.ADDED) {
                             project.logger.error("==fastdex find new apt file: " + diffInfo.uniqueKey)
@@ -78,7 +78,7 @@ public class FastdexScanAptOutputTask extends DefaultTask {
                             project.logger.error("==fastdex find changed apt file: " + diffInfo.uniqueKey)
                         }
                     }
-                    diffResultSet.mergeJavaDirectoryResultSet(sourceSetSnapshoot.path,resultSet);
+                    diffResultSet.mergeJavaDirectoryResultSet(sourceSetSnapshoot.path,resultSet)
                 }
             }
         }