diff --git a/build.gradle b/build.gradle index 89eb7156..a4207b18 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:3.0.1" if (PLUGIN_ENABLE.toBoolean()) { - classpath "com.github.qq549631030:android-junk-code:1.2.2" + classpath "com.github.qq549631030:android-junk-code:1.2.3" } // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/library/gradle.properties b/library/gradle.properties index e726ab1d..3393db22 100644 --- a/library/gradle.properties +++ b/library/gradle.properties @@ -1,6 +1,6 @@ #project GROUP=com.github.qq549631030 -VERSION_NAME=1.2.2 +VERSION_NAME=1.2.3 POM_ARTIFACT_ID=android-junk-code POM_NAME=AndroidJunkCode diff --git a/library/src/main/groovy/cn/hx/plugin/junkcode/plugin/AndroidJunkCodePlugin.groovy b/library/src/main/groovy/cn/hx/plugin/junkcode/plugin/AndroidJunkCodePlugin.groovy index 31b2217e..8fa2ac7e 100644 --- a/library/src/main/groovy/cn/hx/plugin/junkcode/plugin/AndroidJunkCodePlugin.groovy +++ b/library/src/main/groovy/cn/hx/plugin/junkcode/plugin/AndroidJunkCodePlugin.groovy @@ -49,12 +49,11 @@ class AndroidJunkCodePlugin implements Plugin { def sourceSet = variant.sourceSets[i] if (!sourceSet.manifestFile.exists()) { sourceSet.manifest.srcFile(manifestFile) - def processManifestTask = project.tasks.findByName("process${variantName.capitalize()}MainManifest")//AGP 4.1.0+ - if (processManifestTask == null) { - processManifestTask = project.tasks.findByName("process${variantName.capitalize()}Manifest") - } - if (processManifestTask) { - processManifestTask.dependsOn(generateJunkCodeTask) + def processManifestTaskProvider = project.tasks.named("process${variantName.capitalize()}Manifest") + if (processManifestTaskProvider) { + processManifestTaskProvider.configure { + it.dependsOn(generateJunkCodeTask) + } } break } diff --git a/library/src/main/groovy/cn/hx/plugin/junkcode/task/AndroidJunkCodeTask.groovy b/library/src/main/groovy/cn/hx/plugin/junkcode/task/AndroidJunkCodeTask.groovy index 7e849c38..d0de7f0a 100644 --- a/library/src/main/groovy/cn/hx/plugin/junkcode/task/AndroidJunkCodeTask.groovy +++ b/library/src/main/groovy/cn/hx/plugin/junkcode/task/AndroidJunkCodeTask.groovy @@ -237,7 +237,7 @@ class AndroidJunkCodeTask extends DefaultTask { } void generateKeep() { - def keepFile = new File(outDir, "res/raw/keep.xml") + def keepFile = new File(outDir, "res/raw/android_junk_code_keep.xml") StringBuilder sb = new StringBuilder() sb.append("\n")