回滚添加的依赖

qq549631030 · qq549631030 · commit 5bb80a739068 · 2022-09-11T11:12:03.000+08:00
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
@@ -48,12 +48,7 @@ class AndroidJunkCodePlugin implements Plugin<Project> {
         for (int i = variant.sourceSets.size() - 1; i >= 0; i--) {
             def sourceSet = variant.sourceSets[i]
             if (!sourceSet.manifestFile.exists()) {
-                sourceSet.manifest.srcFile(project.files(manifestFile).builtBy(generateJunkCodeTask).singleFile)
-                project.tasks.all {
-                    if (name == "process${variantName.capitalize()}MainManifest") {
-                        dependsOn(generateJunkCodeTask)
-                    }
-                }
+                sourceSet.manifest.srcFile(manifestFile)
                 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
@@ -48,7 +48,12 @@ class AndroidJunkCodeTask extends DefaultTask {
     void generateClasses() {
         def javaDir = new File(outDir, "java")
         for (int i = 0; i < config.packageCount; i++) {
-            String packageName = config.packageBase + "." + generateName(i)
+            String packageName
+            if (config.packageBase.isEmpty()) {
+                packageName = generateName(i)
+            } else {
+                packageName = config.packageBase + "." + generateName(i)
+            }
             //生成Activity
             for (int j = 0; j < config.activityCountPerPackage; j++) {
                 def activityPreName = generateName(j)

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,7 @@ class AndroidJunkCodePlugin implements Plugin<Project> {`
`48`	`48`	`for (int i = variant.sourceSets.size() - 1; i >= 0; i--) {`
`49`	`49`	`def sourceSet = variant.sourceSets[i]`
`50`	`50`	`if (!sourceSet.manifestFile.exists()) {`
`51`		`- sourceSet.manifest.srcFile(project.files(manifestFile).builtBy(generateJunkCodeTask).singleFile)`
`52`		`- project.tasks.all {`
`53`		`- if (name == "process${variantName.capitalize()}MainManifest") {`
`54`		`- dependsOn(generateJunkCodeTask)`
`55`		`- }`
`56`		`- }`
	`51`	`+ sourceSet.manifest.srcFile(manifestFile)`
`57`	`52`	`break`
`58`	`53`	`}`
`59`	`54`	`}`