Merge pull request #47 from bytedance/yangzhiqian/master

merge internal:optimize hook proguard、improve compatibility、add checkIncrementalInDebug、fix npe cased by refer-checker

Author: yangzhiqian

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Change Log
+### Version 0.1.8
+- improve compatibility
+- optimize hook proguard
+- add checkIncrementalInDebug
+- fix npe cased by refer-checker
+- 
 ### Version 0.1.7
 - Optimize incremental build and fix bugs
 - Fix memory leak in plugins

GradleToolKit/src/main/kotlin/com/ss/android/ugc/bytex/gradletoolkit/MergeResources.kt

@@ -5,34 +5,34 @@ package com.ss.android.ugc.bytex.gradletoolkit
  */
 
 import com.android.build.gradle.tasks.MergeResources
-import com.android.ide.common.resources.ResourceSet
 import java.io.File
 
+//todo fix reflection
 fun MergeResources.resourceSetList(): List<File> {
     val resourceSets = try {
         resourceSetList1()
     } catch (e: Exception) {
         resourceSetList2()
     }
-    return resourceSets.flatMap { it.sourceFiles }.toSet().toList()
+    return resourceSets.flatMap { it!!.javaClass.getMethod("getSourceFiles").invoke(it) as List<File> }.toSet().toList()
 }
 
 
-fun MergeResources.resourceSetList1(): Iterable<ResourceSet> {
+private fun MergeResources.resourceSetList1(): Iterable<*> {
 
     val computeResourceSetListMethod = MergeResources::class.java.declaredMethods
             .find { it.name == "computeResourceSetList" && it.parameterCount == 0 }!!
 
     val oldIsAccessible = computeResourceSetListMethod.isAccessible
     try {
         computeResourceSetListMethod.isAccessible = true
-        return computeResourceSetListMethod.invoke(this) as Iterable<ResourceSet>
+        return computeResourceSetListMethod.invoke(this) as Iterable<*>
     } finally {
         computeResourceSetListMethod.isAccessible = oldIsAccessible
     }
 }
 
-fun MergeResources.resourceSetList2(): Iterable<ResourceSet> {
+private fun MergeResources.resourceSetList2(): Iterable<*> {
     val getConfiguredResourceSets = MergeResources::class.java.declaredMethods
             .find { it.name == "getConfiguredResourceSets" && it.parameterCount == 1 }!!
 
@@ -44,7 +44,7 @@ fun MergeResources.resourceSetList2(): Iterable<ResourceSet> {
     try {
         getConfiguredResourceSets.isAccessible = true
         getPreprocessor.isAccessible = true
-        return getConfiguredResourceSets.invoke(this, getPreprocessor.invoke(this)) as Iterable<ResourceSet>
+        return getConfiguredResourceSets.invoke(this, getPreprocessor.invoke(this)) as Iterable<*>
     } finally {
         getConfiguredResourceSets.isAccessible = getConfiguredResourceSetsAccess
         getPreprocessor.isAccessible = getPreprocessorAccess

HookProguard/ProguardConfigurationResolver/.gitignore

@@ -0,0 +1 @@
+/build

HookProguard/ProguardConfigurationResolver/build.gradle

@@ -0,0 +1,7 @@
+apply plugin: 'java'
+group "$upload_group"
+version "$upload_version"
+apply from: rootProject.file('gradle/publish.gradle')
+dependencies {
+    compileOnly gradleApi()
+}

HookProguard/ProguardConfigurationResolver/gradle.properties

@@ -0,0 +1,2 @@
+ARTIFACT_GROUP=com.bytedance.android.byteX
+ARTIFACT_NAME=ProguardConfigurationResolver

HookProguard/ProguardConfigurationResolver/src/main/java/com/ss/android/ugc/bytex/proguardconfigurationresolver/ProguardConfigurationResolver.java

@@ -0,0 +1,27 @@
+package com.ss.android.ugc.bytex.proguardconfigurationresolver;
+
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.file.FileCollection;
+
+import javax.annotation.Nullable;
+
+/**
+ * Created by yangzhiqian on 2020/7/6<br/>
+ */
+public abstract class ProguardConfigurationResolver {
+    protected Project project;
+    protected String variantName;
+
+    public ProguardConfigurationResolver(Project project, String variantName) {
+        this.project = project;
+        this.variantName = variantName;
+    }
+
+    @Nullable
+    public abstract Task getTask();
+
+    @Nullable
+    public abstract FileCollection getAllConfigurationFiles();
+}
+

HookProguard/ProguardConfigurationResolver/task/.gitignore

@@ -0,0 +1 @@
+/build

HookProguard/ProguardConfigurationResolver/task/build.gradle

@@ -0,0 +1,11 @@
+apply plugin: 'java'
+group "$upload_group"
+version "$upload_version"
+
+dependencies {
+    compileOnly gradleApi()
+    compileOnly "com.android.tools.build:gradle:3.6.2"
+    implementation project(":ProguardConfigurationResolver")
+}
+
+apply from: rootProject.file('gradle/publish.gradle')

HookProguard/ProguardConfigurationResolver/task/gradle.properties

@@ -0,0 +1,2 @@
+ARTIFACT_GROUP=com.bytedance.android.byteX
+ARTIFACT_NAME=ProguardConfigurationResolver-task

HookProguard/ProguardConfigurationResolver/task/src/main/java/com/ss/android/ugc/bytex/proguardconfigurationresolver/task/ProguardConfigurableTaskResolver.java

@@ -0,0 +1,40 @@
+package com.ss.android.ugc.bytex.proguardconfigurationresolver.task;
+
+import com.android.build.gradle.internal.tasks.ProguardConfigurableTask;
+import com.android.build.gradle.internal.tasks.ProguardTask;
+import com.android.build.gradle.internal.tasks.R8Task;
+import com.ss.android.ugc.bytex.proguardconfigurationresolver.ProguardConfigurationResolver;
+
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.file.FileCollection;
+
+/**
+ * Created by yangzhiqian on 2020/7/6<br/>
+ */
+public class ProguardConfigurableTaskResolver extends ProguardConfigurationResolver {
+
+    public ProguardConfigurableTaskResolver(Project project, String variantName) {
+        super(project, variantName);
+    }
+
+    @Override
+    public Task getTask() {
+        for (Task task : project.getTasks()) {
+            if ((task instanceof ProguardTask || task instanceof R8Task) &&
+                    ((ProguardConfigurableTask) task).getVariantName().equals(variantName)) {
+                return task;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public FileCollection getAllConfigurationFiles() {
+        Task task = getTask();
+        if (task == null) {
+            return null;
+        }
+        return ((ProguardConfigurableTask) getTask()).getConfigurationFiles();
+    }
+}