升级gradle、解决插件兼容问题

build.gradle

@@ -1,18 +1,22 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.4.10'
     repositories {
-        google()
-        jcenter()
+        maven {
+            url 'https://maven.aliyun.com/repository/public'
+        }
+        maven {
+            url 'https://maven.aliyun.com/repository/google'
+        }
         maven { url uri('./repo') }
         maven { url 'https://jitpack.io' }
-        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "gradle.plugin.cn.cxzheng.methodTracePlugin:tracemanplugin:1.0.4"
 //        classpath "cn.cxzheng:asmtraceman-plugin:0.0.1-test"
         // NOTE: Do not place your application dependencies here; they belong
@@ -22,11 +26,15 @@ buildscript {
 
 allprojects {
     repositories {
-        google()
-        jcenter()
+        maven {
+            url 'https://maven.aliyun.com/repository/public'
+        }
+        maven {
+            url 'https://maven.aliyun.com/repository/google'
+        }
         maven { url uri('./repo') }
         maven { url 'https://jitpack.io' }
-        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 25 00:03:47 CST 2019
+#Tue Dec 01 14:13:32 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-6.5-all.zip

settings.gradle

@@ -1,2 +1,2 @@
-include ':app'
-//include ':app', ':tracemanui',':tracemanplugin', ':tracemanui-noop'
+//include ':app'
+include ':app', ':tracemanui',':tracemanplugin', ':tracemanui-noop'

tracemanplugin/build.gradle

@@ -5,12 +5,12 @@ apply plugin: 'kotlin'
 apply plugin: "com.gradle.plugin-publish"
 
 dependencies {
-    compile gradleApi()
-    compile localGroovy()
+    implementation gradleApi()
+    implementation localGroovy()
 
     //这里根据插件需要，添加对应的依赖
-    compile 'com.android.tools.build:gradle:3.0.0'
-    compile 'org.javassist:javassist:3.20.0-GA'
+    implementation 'com.android.tools.build:gradle:3.0.0'
+    implementation 'org.javassist:javassist:3.25.0-GA'
 }
 
 repositories {
@@ -20,7 +20,13 @@ repositories {
 buildscript {
     repositories {
         maven {
-            url "https://plugins.gradle.org/m2/"
+            url "https://maven.aliyun.com/repository/gradle-plugin"
+        }
+        maven {
+            url 'https://maven.aliyun.com/repository/public'
+        }
+        maven {
+            url 'https://maven.aliyun.com/repository/google'
         }
     }
     dependencies {
@@ -73,15 +79,15 @@ sourceSets {
 
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile gradleApi()
-    compile localGroovy()
-    compile group: 'org.ow2.asm', name: 'asm', version: '5.1'
-    compile group: 'org.ow2.asm', name: 'asm-commons', version: '5.1'
-    compile 'com.android.tools.build:gradle:3.2.1'
-    compile 'com.android.tools.lint:lint:26.0.1'
-    compile 'com.android.tools.lint:lint-api:26.0.1'
-    compile 'com.android.tools.lint:lint-checks:26.0.1'
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api gradleApi()
+    api localGroovy()
+    api group: 'org.ow2.asm', name: 'asm', version: '6.0'
+    api group: 'org.ow2.asm', name: 'asm-commons', version: '6.0'
+    api 'com.android.tools.build:gradle:3.2.1'
+    api 'com.android.tools.lint:lint:26.0.1'
+    api 'com.android.tools.lint:lint-api:26.0.1'
+    api 'com.android.tools.lint:lint-checks:26.0.1'
 }
 
 compileGroovy {

tracemanplugin/src/main/groovy/cn/cxzheng/tracemanplugin/TraceManTransform.groovy

@@ -110,7 +110,7 @@ class TraceManTransform extends Transform {
                 if (traceConfig.isNeedTraceClass(name)) {
                     ClassReader classReader = new ClassReader(file.bytes)
                     ClassWriter classWriter = new ClassWriter(classReader, ClassWriter.COMPUTE_MAXS)
-                    ClassVisitor cv = new TraceClassVisitor(Opcodes.ASM5, classWriter, traceConfig)
+                    ClassVisitor cv = new TraceClassVisitor(Opcodes.ASM6, classWriter, traceConfig)
                     classReader.accept(cv, EXPAND_FRAMES)
                     byte[] code = classWriter.toByteArray()
                     FileOutputStream fos = new FileOutputStream(
@@ -157,7 +157,7 @@ class TraceManTransform extends Transform {
                     jarOutputStream.putNextEntry(zipEntry)
                     ClassReader classReader = new ClassReader(IOUtils.toByteArray(inputStream))
                     ClassWriter classWriter = new ClassWriter(classReader, ClassWriter.COMPUTE_MAXS)
-                    ClassVisitor cv = new TraceClassVisitor(Opcodes.ASM5, classWriter, traceConfig)
+                    ClassVisitor cv = new TraceClassVisitor(Opcodes.ASM6, classWriter, traceConfig)
                     classReader.accept(cv, EXPAND_FRAMES)
                     byte[] code = classWriter.toByteArray()
                     jarOutputStream.write(code)

tracemanplugin/src/main/java/cn/cxzheng/tracemanplugin/Config.kt

@@ -1,6 +1,7 @@
 package cn.cxzheng.tracemanplugin
 
 import java.io.File
+import java.io.FileNotFoundException
 import java.util.HashSet
 
 /**