Added reified configure Action signature

gmazzo · Dec 18, 2023 · 7ba5f8b · 7ba5f8b
1 parent 947d893
commit 7ba5f8b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,9 @@ buildConfig {
     buildConfigField("FEATURE_ENABLED", true)
     buildConfigField("MAGIC_NUMBERS", intArrayOf(1, 2, 3, 4))
     buildConfigField("STRING_LIST", arrayOf("a", "b", "c"))
-    buildConfigField("kotlin.collections.Map<String, Int>", "MAP", "mapOf(\"a\" to 1, \"b\" to 2)")
+    buildConfigField<Map<String, Int>>("MAP") {
+        expression("mapOf(\"a\" to 1, \"b\" to 2)")
+    }
     buildConfigField("com.github.gmazzo.buildconfig.demos.kts.SomeData", "DATA", "SomeData(\"a\", 1)")
 
 }

diff --git a/demo-project/kts/build.gradle.kts b/demo-project/kts/build.gradle.kts
@@ -172,16 +172,12 @@ buildConfig {
     buildConfigField("BOOLEAN_SET_PROVIDER", provider { setOf(true, null, false) })
 
     // custom formats with expressions, including Map and custom types
-    buildConfigField(
-        "kotlin.collections.Map<String, Int>",
-        "MAP",
-        "mapOf(\"a\" to 1, \"b\" to 2)"
-    )
-    buildConfigField(
-        "kotlin.collections.Map<String, Int>",
-        "MAP_PROVIDER",
-        provider { "mapOf(\"a\" to 1, \"b\" to 2)" }
-    )
+    buildConfigField<Map<String, Int>>("MAP")  {
+        expression("mapOf(\"a\" to 1, \"b\" to 2)")
+    }
+    buildConfigField<Map<String, Int>>("MAP_PROVIDER") {
+        expression("mapOf(\"a\" to 1, \"b\" to 2)")
+    }
     buildConfigField(
         "com.github.gmazzo.buildconfig.demos.kts.SomeData",
         "DATA",
@@ -216,8 +212,8 @@ buildConfig.forClass("BuildResources") {
         files.visit {
             val name = path.uppercase().replace("\\W".toRegex(), "_")
 
-            fields.add(objects.newInstance<BuildConfigField>( name).apply {
-                type(File::class.java)
+            fields.add(objects.newInstance<BuildConfigField>(name).apply {
+                type(File::class)
                 expression("File(\"$path\")")
             })
         }

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -55,7 +55,7 @@ gradlePlugin {
 tasks.withType<Test> {
     workingDir = temporaryDir
     useJUnitPlatform()
-    doLast { Thread.sleep(2000) } // allows GradleRunner to store JaCoCo data before computing task outputs
+    doLast { Thread.sleep(5000) } // allows GradleRunner to store JaCoCo data before computing task outputs
 }
 
 tasks.check {

diff --git a/plugin/src/main/kotlin/com/github/gmazzo/buildconfig/BuildConfigField.kt b/plugin/src/main/kotlin/com/github/gmazzo/buildconfig/BuildConfigField.kt
@@ -7,6 +7,7 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
 import java.io.Serializable
 import java.lang.reflect.Type
+import kotlin.reflect.KClass
 import kotlin.reflect.KType
 
 interface BuildConfigField : Named {
@@ -40,6 +41,10 @@ interface BuildConfigField : Named {
         this.type.value(nameOf(type)).disallowChanges()
     }
 
+    fun type(type: KClass<*>) = apply {
+        type(type.java)
+    }
+
     fun type(type: KType) = apply {
         this.type.value(nameOf(type)).disallowChanges()
     }

diff --git a/...in/src/main/kotlin/com/github/gmazzo/buildconfig/generators/BuildConfigKotlinGenerator.kt b/...in/src/main/kotlin/com/github/gmazzo/buildconfig/generators/BuildConfigKotlinGenerator.kt
@@ -91,7 +91,8 @@ data class BuildConfigKotlinGenerator(
     }
 
     private fun BuildConfigType.toTypeName(): TypeName {
-        var type: TypeName = when (className.lowercase()) {
+        val kotlinClassName = runCatching { Class.forName(className).kotlin.qualifiedName!! }.getOrDefault(className)
+        var type: TypeName = when (kotlinClassName.lowercase()) {
             "boolean" -> if (array && !nullable) BOOLEAN_ARRAY else BOOLEAN
             "byte" -> if (array && !nullable) BYTE_ARRAY else BYTE
             "short" -> if (array && !nullable) SHORT_ARRAY else SHORT
@@ -104,7 +105,7 @@ data class BuildConfigKotlinGenerator(
             "string" -> STRING
             "list" -> LIST
             "set" -> SET
-            else -> ClassName.bestGuess(className)
+            else -> ClassName.bestGuess(kotlinClassName)
         }
         if (typeArguments.isNotEmpty())
             type = (type as ClassName).parameterizedBy(*typeArguments.map { it.toTypeName() }.toTypedArray())

diff --git a/plugin/src/main/kotlin/org/gradle/kotlin/dsl/BuildConfigClassSpecDSL.kt b/plugin/src/main/kotlin/org/gradle/kotlin/dsl/BuildConfigClassSpecDSL.kt
@@ -9,6 +9,15 @@ import org.gradle.api.provider.Provider
 import java.io.Serializable
 import kotlin.reflect.typeOf
 
+@BuildConfigDsl
+inline fun <reified Type : Any> BuildConfigClassSpec.buildConfigField(
+    name: String,
+    crossinline configure: BuildConfigField.() -> Unit
+): NamedDomainObjectProvider<BuildConfigField> = buildConfigField(name, Action {
+    it.type(typeOf<Type>())
+    configure.invoke(it)
+})
+
 @BuildConfigDsl
 inline fun <reified Type : Serializable?> BuildConfigClassSpec.buildConfigField(
     name: String,