diff --git a/HookProguard/ProguardConfigurationResolver/build.gradle b/HookProguard/ProguardConfigurationResolver/build.gradle index 14c1800..7096b10 100644 --- a/HookProguard/ProguardConfigurationResolver/build.gradle +++ b/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() } \ No newline at end of file diff --git a/HookProguard/ProguardConfigurationResolver/task/build.gradle b/HookProguard/ProguardConfigurationResolver/task/build.gradle index 2a4fc3b..b65be51 100644 --- a/HookProguard/ProguardConfigurationResolver/task/build.gradle +++ b/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" diff --git a/HookProguard/ProguardConfigurationResolver/task/src/main/java/com/ss/android/ugc/bytex/proguardconfigurationresolver/task/ProguardConfigurableTaskResolver.java b/HookProguard/ProguardConfigurationResolver/task/src/main/java/com/ss/android/ugc/bytex/proguardconfigurationresolver/task/ProguardConfigurableTaskResolver.java index c4e4dc4..ac3a110 100644 --- a/HookProguard/ProguardConfigurationResolver/task/src/main/java/com/ss/android/ugc/bytex/proguardconfigurationresolver/task/ProguardConfigurableTaskResolver.java +++ b/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; } diff --git a/HookProguard/ProguardConfigurationResolver/transform/build.gradle b/HookProguard/ProguardConfigurationResolver/transform/build.gradle index 4ccc138..f2ac376 100644 --- a/HookProguard/ProguardConfigurationResolver/transform/build.gradle +++ b/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" diff --git a/HookProguard/build.gradle b/HookProguard/build.gradle index dae27ae..8f69281 100644 --- a/HookProguard/build.gradle +++ b/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') diff --git a/TransformEngine/build.gradle b/TransformEngine/build.gradle index 520603d..2da331b 100644 --- a/TransformEngine/build.gradle +++ b/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() diff --git a/example/build.gradle b/example/build.gradle index 9586847..b76abc2 100644 --- a/example/build.gradle +++ b/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" diff --git a/example/plugin-bytex.gradle b/example/plugin-bytex.gradle index 81f3cb7..6b1dcba 100644 --- a/example/plugin-bytex.gradle +++ b/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 { diff --git a/gradle.properties b/gradle.properties index 8605722..b7323ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ org.gradle.caching.debug=true bytex.enableHtmlLog=true android.useAndroidX=false android.enableJetifier=false -bytex.forbidUseLenientMutationDuringGetArtifact=true \ No newline at end of file +#bytex.forbidUseLenientMutationDuringGetArtifact=true \ No newline at end of file diff --git a/gradle/ext.gradle b/gradle/ext.gradle index f9f9273..797d5b6 100644 --- a/gradle/ext.gradle +++ b/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")