兼容Gradle 8.0

qq549631030 · qq549631030 · commit d86552875cfa · 2023-03-21T00:42:24.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.1.7"
+            classpath "com.github.qq549631030:android-junk-code:1.1.9"
         }
         // 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.1.7
+VERSION_NAME=1.1.9
 
 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,6 +49,12 @@ class AndroidJunkCodePlugin implements Plugin<Project> {
                     def sourceSet = variant.sourceSets[i]
                     if (!sourceSet.manifestFile.exists()) {
                         sourceSet.manifest.srcFile(manifestFile)
+                        def processManifestTaskProvider = project.tasks.named("process${variantName.capitalize()}MainManifest")
+                        if (processManifestTaskProvider) {
+                            processManifestTaskProvider.configure {
+                                it.dependsOn(generateJunkCodeTask)
+                            }
+                        }
                         break
                     }
                 }

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.1.7"`
	`14`	`+ classpath "com.github.qq549631030:android-junk-code:1.1.9"`
`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
`@@ -49,6 +49,12 @@ class AndroidJunkCodePlugin implements Plugin<Project> {`
`49`	`49`	`def sourceSet = variant.sourceSets[i]`
`50`	`50`	`if (!sourceSet.manifestFile.exists()) {`
`51`	`51`	`sourceSet.manifest.srcFile(manifestFile)`
	`52`	`+ def processManifestTaskProvider = project.tasks.named("process${variantName.capitalize()}MainManifest")`
	`53`	`+ if (processManifestTaskProvider) {`
	`54`	`+ processManifestTaskProvider.configure {`
	`55`	`+ it.dependsOn(generateJunkCodeTask)`
	`56`	`+ }`
	`57`	`+ }`
`52`	`58`	`break`
`53`	`59`	`}`
`54`	`60`	`}`