Merge pull request #37 from kanyun-inc/feature/customVariant

Improve 'customVariant' api
kanyun-inc · May 9, 2023 · f2e33ff · f2e33ff
2 parents a8e31e2 + b1de3e3
commit f2e33ff
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 
 KOTLIN_PLUGIN_ID=com.kanyun.kace
-VERSION_NAME=1.8.20-1.0.4
+VERSION_NAME=1.8.20-1.0.5-SNAPSHOT
 
 GROUP=com.kanyun.kace
 

diff --git a/kace-gradle-plugin/src/main/java/com/kanyun/kace/gradle/KaceExtension.kt b/kace-gradle-plugin/src/main/java/com/kanyun/kace/gradle/KaceExtension.kt
@@ -16,8 +16,15 @@
 
 package com.kanyun.kace.gradle
 
+import com.android.build.gradle.api.BaseVariant
+
 open class KaceExtension {
     var whiteList: List<String> = listOf()
     var blackList: List<String> = listOf()
     var customVariant: Map<String, List<String>> = emptyMap()
+    internal val customVariantCallbacks: ArrayList<(BaseVariant) -> Map<String, List<String>>> = ArrayList()
+
+    fun customVariant(block: (BaseVariant) -> Map<String, List<String>>) {
+        customVariantCallbacks += block
+    }
 }
diff --git a/kace-gradle-plugin/src/main/java/com/kanyun/kace/gradle/KaceGradlePlugin.kt b/kace-gradle-plugin/src/main/java/com/kanyun/kace/gradle/KaceGradlePlugin.kt
@@ -110,7 +110,16 @@ class KaceGradlePlugin : Plugin<Project> {
         if (buildTypeName != variantName && buildTypeName != flavorName) {
             addSourceSetLayoutDir(extension, variantName, layoutDirList)
         }
-        addCustomVariantLayoutDir(kaceExtension.customVariant, layoutDirList)
+
+        val customVariant = kaceExtension.customVariantCallbacks.map { it.invoke(variant) }
+            .fold(HashMap<String, List<String>>(kaceExtension.customVariant)) { acc, customVariant ->
+                customVariant.forEach {
+                    acc.merge(it.key, it.value, List<String>::plus)
+                }
+                acc
+            }
+
+        addCustomVariantLayoutDir(customVariant, layoutDirList)
         return layoutDirList
     }
 

diff --git a/kace-sample/app/build.gradle.kts b/kace-sample/app/build.gradle.kts
@@ -74,3 +74,26 @@ android {
         implementation(project(":sample-lib"))
     }
 }
+
+kace {
+    customVariant = mapOf("debug" to listOf(file("src/debug/res000").absolutePath))
+    customVariant {
+        when {
+            "debug" in it.buildType.name -> mapOf(
+                "debug" to listOf(
+                    file("src/debug/res1").absolutePath,
+                    file("src/debug/res2").absolutePath
+                )
+            )
+
+            "release" in it.buildType.name -> mapOf(
+                "release" to listOf(
+                    file("src/release/res1").absolutePath,
+                    file("src/release/res2").absolutePath
+                )
+            )
+
+            else -> emptyMap()
+        }
+    }
+}