feat: improve compatibility for agp 7.1.2

HookProguard/ProguardConfigurationResolver/build.gradle

@@ -2,6 +2,10 @@ apply plugin: 'java'
 group "$upload_group"
 version "$upload_version"
 apply from: rootProject.file('gradle/publish.gradle')
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 dependencies {
     compileOnly gradleApi()
 }

HookProguard/ProguardConfigurationResolver/task/build.gradle

@@ -2,6 +2,9 @@ apply plugin: 'java'
 group "$upload_group"
 version "$upload_version"
 
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 dependencies {
     compileOnly gradleApi()
     compileOnly "com.android.tools.build:gradle:3.6.2"

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

@@ -1,8 +1,6 @@
 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;
@@ -21,7 +19,7 @@ public ProguardConfigurableTaskResolver(Project project, String variantName) {
     @Override
     public Task getTask() {
         for (Task task : project.getTasks()) {
-            if ((task instanceof ProguardTask || task instanceof R8Task) &&
+            if (task instanceof ProguardConfigurableTask &&
                     ((ProguardConfigurableTask) task).getVariantName().equals(variantName)) {
                 return task;
             }

HookProguard/ProguardConfigurationResolver/transform/build.gradle

@@ -2,6 +2,9 @@ apply plugin: 'java'
 group "$upload_group"
 version "$upload_version"
 
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 dependencies {
     compileOnly gradleApi()
     compileOnly "com.android.tools.build:gradle:3.5.3"

HookProguard/build.gradle

@@ -1,5 +1,11 @@
 apply from: rootProject.file('gradle/plugin.gradle')
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 dependencies {
+    implementation "net.sf.proguard:proguard-gradle:6.0.3"
+
     implementation project(':ProguardConfigurationResolver')
     implementation project(':ProguardConfigurationResolver-task')
     implementation project(':ProguardConfigurationResolver-transform')

TransformEngine/build.gradle

@@ -1,5 +1,9 @@
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     compileOnly gradleApi()

example/build.gradle

@@ -94,6 +94,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.android.support:multidex:1.0.3' //fix r8 nullpointer
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation "com.google.code.gson:gson:2.8.2"

example/plugin-bytex.gradle

@@ -148,14 +148,15 @@ shrinkR {
     }
 }
 
-if (enableMinify) {
-    apply plugin: 'bytex.getter_setter_inline'
-    getter_setter_inline {
-        enable pluginEnable
-        enableInDebug pluginEnableInDebug
-        logLevel pluginLogLevel
-    }
-}
+// org.gradle.internal.work.NoAvailableWorkerLeaseException:: No worker lease associated with the current thread
+//if (enableMinify) {
+//    apply plugin: 'bytex.getter_setter_inline'
+//    getter_setter_inline {
+//        enable pluginEnable
+//        enableInDebug pluginEnableInDebug
+//        logLevel pluginLogLevel
+//    }
+//}
 
 apply plugin: 'bytex.closeable_checker'
 closeable_checker {

gradle.properties

@@ -24,4 +24,4 @@ org.gradle.caching.debug=true
 bytex.enableHtmlLog=true
 android.useAndroidX=false
 android.enableJetifier=false
-bytex.forbidUseLenientMutationDuringGetArtifact=true
+#bytex.forbidUseLenientMutationDuringGetArtifact=true

gradle/ext.gradle

@@ -39,7 +39,7 @@ ext {
     asm_version = '9.2'
     guava_version = '23.0'
     ByteX_Version = upload_version
-    gradle_compat_version = "1.1.0.2"
+    gradle_compat_version = "1.1.1.3"
     bintray_key = BINTRAY_KEY
 }
 println("upload2Maven:$upload2Maven")