更换新的配置方式

qq549631030 · qq549631030 · commit 9a3694811669 · 2021-09-25T18:40:29.000+08:00
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.github.qq549631030:android-junk-code:1.0.7"
+        classpath "com.github.qq549631030:android-junk-code:1.0.8"
     }
 }
 ```
@@ -20,29 +20,45 @@ buildscript {
 
 
 app目录的build.gradle模块中：
-```
+```groovy
 apply plugin: 'com.android.application'
 apply plugin: 'android-junk-code'
 
-android {
-    //xxx
+androidJunkCode {
+    variantConfig {
+        release {//变体名称，如果没有设置productFlavors就是buildType名称，如果有设置productFlavors就是flavor+buildType，例如（freeRelease、proRelease）
+            packageBase = "cn.hx.plugin.ui"  //生成java类根包名
+            packageCount = 30 //生成包数量
+            activityCountPerPackage = 3 //每个包下生成Activity类数量
+            excludeActivityJavaFile = false //是否排除生成Activity的Java文件,默认false(layout和写入AndroidManifest.xml还会执行)，主要用于处理类似神策全埋点编译过慢问题
+            otherCountPerPackage = 50  //每个包下生成其它类的数量
+            methodCountPerClass = 20  //每个类下生成方法数量
+            resPrefix = "junk_"  //生成的layout、drawable、string等资源名前缀
+            drawableCount = 300  //生成drawable资源数量
+            stringCount = 300  //生成string数量
+        }
+    }
 }
+```
 
-android.applicationVariants.all { variant ->
-    switch (variant.name) {//变体名称，如果没有设置productFlavors就是buildType名称，如果有设置productFlavors就是flavor+buildType，例如（freeRelease、proRelease）
-        case "release":
-            androidJunkCode.configMap.put(variant.name, {
-                packageBase = "cn.hx.plugin.ui"  //生成java类根包名
-                packageCount = 30 //生成包数量
-                activityCountPerPackage = 3 //每个包下生成Activity类数量
-                excludeActivityJavaFile = false //是否排除生成Activity的Java文件,默认false(layout和写入AndroidManifest.xml还会执行)，主要用于处理类似神策全埋点编译过慢问题
-                otherCountPerPackage = 50  //每个包下生成其它类的数量
-                methodCountPerClass = 20  //每个类下生成方法数量
-                resPrefix = "junk_"  //生成的layout、drawable、string等资源名前缀
-                drawableCount = 300  //生成drawable资源数量
-                stringCount = 300  //生成string数量
-            })
-            break
+**原configMap配置方式已过时，1.0.8版以后请使用variantConfig配置方式"**
+如果有多个变体共用一个配置可以这样做
+```groovy
+androidJunkCode {
+    def config = {
+        packageBase = "cn.hx.plugin.ui"
+        packageCount = 30
+        activityCountPerPackage = 3
+        excludeActivityJavaFile = false
+        otherCountPerPackage = 50
+        methodCountPerClass = 20
+        resPrefix = "junk_"
+        drawableCount = 300
+        stringCount = 300
+    }
+    variantConfig {
+        debug config
+        release config
     }
 }
 ```
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "cn.hx.plugin.junkcode.demo"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -32,33 +32,32 @@ android {
     }
 }
 
-android.applicationVariants.all { variant ->
-    switch (variant.name) {
-        case "release":
-            androidJunkCode.configMap.put(variant.name, {
-                packageBase = "cn.hx.plugin.ui"
-                packageCount = 30
-                activityCountPerPackage = 3
-                excludeActivityJavaFile = false
-                otherCountPerPackage = 50
-                methodCountPerClass = 20
-                resPrefix = "junk_"
-                drawableCount = 300
-                stringCount = 300
-            })
-            break
+androidJunkCode {
+    def config = {
+        packageBase = "cn.hx.plugin.ui"
+        packageCount = 30
+        activityCountPerPackage = 3
+        excludeActivityJavaFile = false
+        otherCountPerPackage = 50
+        methodCountPerClass = 20
+        resPrefix = "junk_"
+        drawableCount = 300
+        stringCount = 300
+    }
+    variantConfig {
+        debug config
+        release config
     }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.5.10"
+    ext.kotlin_version = "1.5.31"
     repositories {
         google()
         mavenCentral()
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.github.qq549631030:android-junk-code:1.0.7"
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
-        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:2.1.0-RC01"
+        classpath "com.github.qq549631030:android-junk-code:1.0.8"
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
+        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:3.0.1"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,8 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+
+org.gradle.warning.mode=all
+
+RELEASE_SIGNING_ENABLED=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/library/gradle.properties b/library/gradle.properties
@@ -1,6 +1,6 @@
 #project
 GROUP=com.github.qq549631030
-VERSION_NAME=1.0.7
+VERSION_NAME=1.0.8
 
 POM_ARTIFACT_ID=android-junk-code
 POM_NAME=AndroidJunkCode
@@ -26,5 +26,5 @@ POM_DEVELOPER_URL=https://github.com/qq549631030/
 #signing.password=[you key password]
 #signing.secretKeyRingFile=[you gpg key file location]
 #
-#mavenCentralRepositoryUsername=[you sonatype username]
-#mavenCentralRepositoryPassword=[you sonatype password]
+#mavenCentralUsername=[you sonatype username]
+#mavenCentralPassword=[you sonatype password]
diff --git a/library/src/main/groovy/cn/hx/plugin/junkcode/ext/AndroidJunkCodeExt.groovy b/library/src/main/groovy/cn/hx/plugin/junkcode/ext/AndroidJunkCodeExt.groovy
@@ -1,5 +1,10 @@
 package cn.hx.plugin.junkcode.ext
 
+import org.gradle.api.NamedDomainObjectContainer
+
 class AndroidJunkCodeExt {
+    @Deprecated(since = "1.0.8")
     Map<String, Closure<JunkCodeConfig>> configMap = [:]
+
+    NamedDomainObjectContainer<JunkCodeConfig> variantConfig
 }
diff --git a/library/src/main/groovy/cn/hx/plugin/junkcode/ext/JunkCodeExtension.groovy b/library/src/main/groovy/cn/hx/plugin/junkcode/ext/JunkCodeExtension.groovy
@@ -1,6 +1,7 @@
 package cn.hx.plugin.junkcode.ext
 
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
 
 class JunkCodeConfig {
     @Input
@@ -21,4 +22,11 @@ class JunkCodeConfig {
     int drawableCount = 0
     @Input
     int stringCount = 0
+
+    @Internal
+    String name = ""
+
+    JunkCodeConfig(String name) {
+        this.name = name
+    }
 }
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
@@ -4,7 +4,6 @@ import cn.hx.plugin.junkcode.ext.AndroidJunkCodeExt
 import cn.hx.plugin.junkcode.ext.JunkCodeConfig
 import cn.hx.plugin.junkcode.task.AndroidJunkCodeTask
 import com.android.build.gradle.AppExtension
-import com.android.build.gradle.api.ApplicationVariant
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
@@ -17,71 +16,82 @@ class AndroidJunkCodePlugin implements Plugin<Project> {
             throw IllegalArgumentException("must apply this plugin after 'com.android.application'")
         }
         def generateJunkCodeExt = project.extensions.create("androidJunkCode", AndroidJunkCodeExt)
+        generateJunkCodeExt.variantConfig = project.container(JunkCodeConfig.class, new JunkCodeConfigFactory())
+
+        android.applicationVariants.all { variant ->
+            def variantName = variant.name
+            def junkCodeConfig = generateJunkCodeExt.variantConfig.findByName(variantName)
+            if (junkCodeConfig) {
+                createGenerateJunkCodeTask(project, android, variant, junkCodeConfig)
+            }
+        }
+
         project.afterEvaluate {
             android.applicationVariants.all { variant ->
                 def variantName = variant.name
-                Closure<JunkCodeConfig> junkCodeConfig = generateJunkCodeExt.configMap[variantName]
-                if (junkCodeConfig) {
-                    def dir = new File(project.buildDir, "generated/source/junk/$variantName")
-                    def resDir = new File(dir, "res")
-                    def javaDir = new File(dir, "java")
-                    def manifestFile = new File(dir, "AndroidManifest.xml")
-                    String packageName = findPackageName(variant)
-                    def generateJunkCodeTask = project.task("generate${variantName.capitalize()}JunkCode", type: AndroidJunkCodeTask) {
-                        junkCodeConfig.delegate = config
-                        junkCodeConfig.resolveStrategy = DELEGATE_FIRST
-                        junkCodeConfig.call()
-                        manifestPackageName = packageName
-                        outDir = dir
-                    }
-                    //将自动生成的AndroidManifest.xml加入到一个未被占用的manifest位置(如果都占用了就不合并了，通常较少出现全被占用情况)
-                    for (int i = variant.sourceSets.size() - 1; i >= 0; i--) {
-                        def sourceSet = variant.sourceSets[i]
-                        if (!sourceSet.manifestFile.exists()) {
-                            android.sourceSets."${sourceSet.name}".manifest.srcFile(manifestFile.absolutePath)
-                            break
-                        }
-                    }
-                    if (variant.respondsTo("registerGeneratedResFolders")) {
-                        generateJunkCodeTask.ext.generatedResFolders = project
-                                .files(resDir)
-                                .builtBy(generateJunkCodeTask)
-                        variant.registerGeneratedResFolders(generateJunkCodeTask.generatedResFolders)
-                        if (variant.hasProperty("mergeResourcesProvider")) {
-                            variant.mergeResourcesProvider.configure { dependsOn(generateJunkCodeTask) }
-                        } else {
-                            //noinspection GrDeprecatedAPIUsage
-                            variant.mergeResources.dependsOn(generateJunkCodeTask)
-                        }
-                    } else {
-                        //noinspection GrDeprecatedAPIUsage
-                        variant.registerResGeneratingTask(generateJunkCodeTask, resDir)
-                    }
-                    variant.registerJavaGeneratingTask(generateJunkCodeTask, javaDir)
+                def generateJunkCodeTaskName = "generate${variantName.capitalize()}JunkCode"
+                def generateJunkCodeTask = project.tasks.findByName(generateJunkCodeTaskName)
+                if (generateJunkCodeTask) {
+                    //已经用variantConfig方式配置过了
+                    return
+                }
+                def closure = generateJunkCodeExt.configMap[variantName]
+                if (closure) {
+                    def junkCodeConfig = new JunkCodeConfig()
+                    closure.delegate = junkCodeConfig
+                    closure.resolveStrategy = Closure.DELEGATE_FIRST
+                    closure.call()
+                    println("AndroidJunkCode: configMap配置方式已过时，请使用variantConfig配置方式")
+                    createGenerateJunkCodeTask(project, android, variant, junkCodeConfig)
                 }
             }
         }
     }
 
-
-    /**
-     * 从AndroidManifest.xml找到package name
-     * @param variant
-     * @return
-     */
-    static String findPackageName(ApplicationVariant variant) {
-        String packageName = null
-        for (int i = 0; i < variant.sourceSets.size(); i++) {
+    private def createGenerateJunkCodeTask = { project, android, variant, junkCodeConfig ->
+        def variantName = variant.name
+        def generateJunkCodeTaskName = "generate${variantName.capitalize()}JunkCode"
+        def dir = new File(project.buildDir, "generated/source/junk/$variantName")
+        def resDir = new File(dir, "res")
+        def javaDir = new File(dir, "java")
+        def manifestFile = new File(dir, "AndroidManifest.xml")
+        //从main/AndroidManifest.xml找到package name
+        def mainManifestFile = android.sourceSets.findByName("main").manifest.srcFile
+        def parser = new XmlParser()
+        def node = parser.parse(mainManifestFile)
+        def packageName = node.attribute("package")
+        def generateJunkCodeTask = project.task(generateJunkCodeTaskName, type: AndroidJunkCodeTask) {
+            config = junkCodeConfig
+            manifestPackageName = packageName
+            outDir = dir
+        }
+        //将自动生成的AndroidManifest.xml加入到一个未被占用的manifest位置(如果都占用了就不合并了，通常较少出现全被占用情况)
+        for (int i = variant.sourceSets.size() - 1; i >= 0; i--) {
             def sourceSet = variant.sourceSets[i]
-            if (sourceSet.manifestFile.exists()) {
-                def parser = new XmlParser()
-                Node node = parser.parse(sourceSet.manifestFile)
-                packageName = node.attribute("package")
-                if (packageName != null) {
-                    break
+            if (!sourceSet.manifestFile.exists()) {
+                android.sourceSets."${sourceSet.name}".manifest.srcFile(manifestFile.absolutePath)
+                def processMainManifestTask = project.tasks.findByName("process${variantName.capitalize()}MainManifest")
+                if (processMainManifestTask) {
+                    processMainManifestTask.dependsOn(generateJunkCodeTask)
                 }
+                break
+            }
+        }
+        if (variant.respondsTo("registerGeneratedResFolders")) {
+            generateJunkCodeTask.ext.generatedResFolders = project
+                    .files(resDir)
+                    .builtBy(generateJunkCodeTask)
+            variant.registerGeneratedResFolders(generateJunkCodeTask.generatedResFolders)
+            if (variant.hasProperty("mergeResourcesProvider")) {
+                variant.mergeResourcesProvider.configure { dependsOn(generateJunkCodeTask) }
+            } else {
+                //noinspection GrDeprecatedAPIUsage
+                variant.mergeResources.dependsOn(generateJunkCodeTask)
             }
+        } else {
+            //noinspection GrDeprecatedAPIUsage
+            variant.registerResGeneratingTask(generateJunkCodeTask, resDir)
         }
-        return packageName
+        variant.registerJavaGeneratingTask(generateJunkCodeTask, javaDir)
     }
 }
diff --git a/library/src/main/groovy/cn/hx/plugin/junkcode/plugin/JunkCodeConfigFactory.groovy b/library/src/main/groovy/cn/hx/plugin/junkcode/plugin/JunkCodeConfigFactory.groovy
