调整keep文件名称

qq549631030 · qq549631030 · commit d8d07b64d642 · 2023-05-24T22:26:57.000+08:00
diff --git 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
@@ -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
@@ -49,12 +49,11 @@ class AndroidJunkCodePlugin implements Plugin<Project> {
                     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
@@ -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("<resources xmlns:tools=\"http://schemas.android.com/tools\"\n" +
                 "    tools:keep=\"@layout/${config.resPrefix}*, @drawable/${config.resPrefix}*\" />\n")

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ buildscript {`
`11`	`11`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`12`	`12`	`classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:3.0.1"`
`13`	`13`	`if (PLUGIN_ENABLE.toBoolean()) {`
`14`		`- classpath "com.github.qq549631030:android-junk-code:1.2.2"`
	`14`	`+ classpath "com.github.qq549631030:android-junk-code:1.2.3"`
`15`	`15`	`}`
`16`	`16`	`// NOTE: Do not place your application dependencies here; they belong`
`17`	`17`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ class AndroidJunkCodeTask extends DefaultTask {`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`void generateKeep() {`
`240`		`- def keepFile = new File(outDir, "res/raw/keep.xml")`
	`240`	`+ def keepFile = new File(outDir, "res/raw/android_junk_code_keep.xml")`
`241`	`241`	`StringBuilder sb = new StringBuilder()`
`242`	`242`	`sb.append("<resources xmlns:tools=\"http://schemas.android.com/tools\"\n" +`
`243`	`243`	`" tools:keep=\"@layout/${config.resPrefix}, @drawable/${config.resPrefix}\" />\n")`