兼容AGP4.1

1. 使用新版本对dx.jar 2. 在gradle-plugin 中去除RobustApkHashAction，避免兼容性问题
wutongke · Oct 30, 2020 · 06b7564 · 06b7564
1 parent 955adcc
commit 06b7564
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/auto-patch-plugin/src/main/resources/libs/dx.jar b/auto-patch-plugin/src/main/resources/libs/dx.jar
diff --git a/build.gradle b/build.gradle
@@ -4,6 +4,10 @@ buildscript {
     repositories {
         mavenLocal()
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.0'
@@ -28,6 +32,10 @@ allprojects {
             url "http://depot.sankuai.com/nexus/content/groups/public/"
         }
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     tasks.withType(JavaCompile) { options.encoding = "UTF-8" }
 }

diff --git a/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustTransform.groovy b/gradle-plugin/src/main/groovy/robust/gradle/plugin/RobustTransform.groovy
@@ -59,15 +59,15 @@ class RobustTransform extends Transform implements Plugin<Project> {
             }
             if (!isDebugTask) {
                 project.android.registerTransform(this)
-                project.afterEvaluate(new RobustApkHashAction())
+//                project.afterEvaluate(new RobustApkHashAction())
                 logger.quiet "Register robust transform successful !!!"
             }
             if (null != robust.switch.turnOnRobust && !"true".equals(String.valueOf(robust.switch.turnOnRobust))) {
                 return;
             }
         } else {
             project.android.registerTransform(this)
-            project.afterEvaluate(new RobustApkHashAction())
+//            project.afterEvaluate(new RobustApkHashAction())
         }
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,6 +16,6 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=0.4.99
+VERSION_NAME=0.4.100
 GROUP=com.meituan.robust