Exposed expression API and generics */? basic support

README.md

@@ -12,8 +12,8 @@ Designed for KTS scripts, with *experimental* support for Kotlin's **multi-platf
 On your `build.gradle.kts` add:
 ```kotlin
 plugins {
-    id("org.jetbrains.kotlin.jvm") version embeddedKotlinVersion
-    id("com.github.gmazzo.buildconfig") version <current version>
+    id("org.jetbrains.kotlin.jvm") version "<kotlin version>"
+    id("com.github.gmazzo.buildconfig") version "<current version>"
 }
 
 buildConfig {
@@ -25,9 +25,7 @@ buildConfig {
     buildConfigField("FEATURE_ENABLED", true)
     buildConfigField("MAGIC_NUMBERS", intArrayOf(1, 2, 3, 4))
     buildConfigField("STRING_LIST", arrayOf("a", "b", "c"))
-    buildConfigField<Map<String, Int>>("MAP") {
-        expression("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)")
 
 }
@@ -67,6 +65,7 @@ buildConfig {
     buildConfigField(int[], "MAGIC_NUMBERS", [1, 2, 3])
     buildConfigField('List<String>', "STRING_LIST", ["a", "b", "c"])
     buildConfigField("java.util.Map<String, Integer>", "MAP", "java.util.Map.of(\"a\", 1, \"b\", 2)")
+    buildConfigField(Map.class, "GENERIC_MAP", expression("java.util.Map.of(\"a\", 1, \"b\", 2)"))
     buildConfigField("com.github.gmazzo.buildconfig.demos.groovy.SomeData", "DATA", "new SomeData(\"a\", 1)")
 }
 ```

demo-project/groovy-gen-kotlin/build.gradle

@@ -170,6 +170,8 @@ buildConfig {
             "MAP_PROVIDER",
             provider { "mapOf(\"a\" to 1, \"b\" to 2)" }
     )
+    buildConfigField(Map.class, "MAP_GENERIC", expression("mapOf(\"a\" to 1, \"b\" to 2)"))
+    buildConfigField(Map.class, "MAP_GENERIC_PROVIDER", provider { expression("mapOf(\"a\" to 1, \"b\" to 2)") })
     buildConfigField(
             "com.github.gmazzo.buildconfig.demos.groovy.SomeData",
             "DATA",

demo-project/groovy/build.gradle

@@ -170,6 +170,8 @@ buildConfig {
             "MAP_PROVIDER",
             provider { "java.util.Map.of(\"a\", 1, \"b\", 2)" }
     )
+    buildConfigField(Map.class, "MAP_GENERIC", expression("java.util.Map.of(\"a\", 1, \"b\", 2)"))
+    buildConfigField(Map.class, "MAP_GENERIC_PROVIDER", provider { expression("java.util.Map.of(\"a\", 1, \"b\", 2)") })
     buildConfigField(
             "com.github.gmazzo.buildconfig.demos.groovy.SomeData",
             "DATA",

demo-project/groovy/src/testFixtures/java/com/github/gmazzo/buildconfig/demos/groovy/BuildConfigBaseTest.java

@@ -176,6 +176,8 @@ public void testBooleans() {
     public void testCustomTypes() {
         assertEquals(Map.of("a", 1, "b", 2), BuildConfig.MAP);
         assertEquals(Map.of("a", 1, "b", 2), BuildConfig.MAP_PROVIDER);
+        assertEquals(Map.of("a", 1, "b", 2), BuildConfig.MAP_GENERIC);
+        assertEquals(Map.of("a", 1, "b", 2), BuildConfig.MAP_GENERIC_PROVIDER);
         assertEquals(new SomeData("a", 1), BuildConfig.DATA);
         assertEquals(new SomeData("a", 1), BuildConfig.DATA_PROVIDER);
     }

demo-project/kts-gen-java/build.gradle.kts

@@ -157,16 +157,10 @@ buildConfig {
     buildConfigField("BOOLEAN_SET_PROVIDER", provider { setOf(true, null, false) })
 
     // custom formats with expressions, including Map and custom types
-    buildConfigField(
-        "java.util.Map<String, Int>",
-        "MAP",
-        "java.util.Map.of(\"a\", 1, \"b\", 2)"
-    )
-    buildConfigField(
-        "java.util.Map<String, Int>",
-        "MAP_PROVIDER",
-        provider { "java.util.Map.of(\"a\", 1, \"b\", 2)" }
-    )
+    buildConfigField<Map<String, Int>>("MAP", expression("java.util.Map.of(\"a\", 1, \"b\", 2)"))
+    buildConfigField<Map<String, Int>>("MAP_PROVIDER", provider { expression("java.util.Map.of(\"a\", 1, \"b\", 2)") })
+    buildConfigField<Map<*, *>>("MAP_GENERIC", expression("java.util.Map.of(\"a\", 1, \"b\", 2)"))
+    buildConfigField<Map<*, *>>("MAP_GENERIC_PROVIDER", provider { expression("java.util.Map.of(\"a\", 1, \"b\", 2)") })
     buildConfigField(
         "com.github.gmazzo.buildconfig.demos.kts.SomeData",
         "DATA",

demo-project/kts/build.gradle.kts

@@ -172,12 +172,10 @@ buildConfig {
     buildConfigField("BOOLEAN_SET_PROVIDER", provider { setOf(true, null, false) })
 
     // custom formats with expressions, including Map and custom types
-    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<Map<String, Int>>("MAP", expression("mapOf(\"a\" to 1, \"b\" to 2)"))
+    buildConfigField<Map<String, Int>>("MAP_PROVIDER", provider { expression("mapOf(\"a\" to 1, \"b\" to 2)") })
+    buildConfigField<Map<*, *>>("MAP_GENERIC", expression("mapOf(\"a\" to 1, \"b\" to 2)"))
+    buildConfigField<Map<*, *>>("MAP_GENERIC_PROVIDER", provider { expression("mapOf(\"a\" to 1, \"b\" to 2)") })
     buildConfigField(
         "com.github.gmazzo.buildconfig.demos.kts.SomeData",
         "DATA",

plugin/src/main/kotlin/com/github/gmazzo/buildconfig/BuildConfigClassSpec.kt

@@ -72,6 +72,15 @@ interface BuildConfigClassSpec : Named {
         it.value(castToType(value, type) as Serializable?)
     }
 
+    fun buildConfigField(
+        type: Class<*>,
+        name: String,
+        expression: BuildConfigValue.Expression
+    ) = buildConfigField(name) {
+        it.type(type)
+        it.value.value(expression)
+    }
+
     /*
      Because of erasure types on Groovy, this method is call for two use cases:
      - when `buildConfigField('File', 'NAME', provider { 'File("aFile")' })` is called
@@ -87,7 +96,13 @@ interface BuildConfigClassSpec : Named {
     ) = buildConfigField(name) {
         it.type(type)
         it.value
-            .value(value.map { v -> if (v is String) BuildConfigValue.Expression(v) else BuildConfigValue.Literal(v) })
+            .value(value.map { v ->
+                when (v) {
+                    is BuildConfigValue -> v
+                    is String -> BuildConfigValue.Expression(v)
+                    else -> BuildConfigValue.Literal(v)
+                }
+            })
             .disallowChanges()
     }
 
@@ -97,7 +112,17 @@ interface BuildConfigClassSpec : Named {
         value: Provider<out Type>,
     ) = buildConfigField(name) {
         it.type(type)
-        it.value(value.map { v -> castToType(v, type) as Serializable })
+        it.value.value(value.map { v ->
+            when (v) {
+                is BuildConfigValue -> v
+                is String -> when (type) {
+                    String::class.java -> BuildConfigValue.Literal(v)
+                    else -> BuildConfigValue.Expression(v)
+                }
+
+                else -> BuildConfigValue.Literal(castToType(v, type) as Serializable)
+            }
+        })
     }
 
     fun buildConfigField(
@@ -110,4 +135,7 @@ interface BuildConfigClassSpec : Named {
         }
     }
 
+    fun expression(expression: String) =
+        BuildConfigValue.Expression(expression)
+
 }

plugin/src/main/kotlin/com/github/gmazzo/buildconfig/BuildConfigTypeUtils.kt

@@ -41,25 +41,32 @@ private val Type.genericName: String
         else -> error("Unsupported type: $this")
     }
 
-private val Type.isArray get() = when (this) {
-    is Class<*> -> isArray
-    is GenericArrayType -> true
-    else -> false
-}
+private val Type.isArray
+    get() = when (this) {
+        is Class<*> -> isArray
+        is GenericArrayType -> true
+        else -> false
+    }
 
-internal fun nameOf(type: Type): BuildConfigType = when(type) {
+internal fun nameOf(type: Type): BuildConfigType = when (type) {
     is Class<*> -> BuildConfigType(
         className = type.genericName,
-        typeArguments = type.typeParameters.map { nameOf(it.genericDeclaration) },
+        typeArguments = type.typeParameters.map {
+            nameOf(checkNotNull(it.bounds.singleOrNull()) {
+                "Types with complex parameters bounds are not supported: $type"
+            })
+        },
         nullable = false,
         array = type.isArray
     )
+
     is ParameterizedType -> BuildConfigType(
         className = type.rawType.genericName,
         typeArguments = type.actualTypeArguments.map { nameOf(it) },
         nullable = false,
         array = false
     )
+
     is GenericArrayType -> BuildConfigType(
         className = type.genericComponentType.genericName,
         typeArguments = checkNotNull(type.genericComponentType as? ParameterizedType) {
@@ -68,6 +75,7 @@ internal fun nameOf(type: Type): BuildConfigType = when(type) {
         nullable = false,
         array = true
     )
+
     else -> error("Unsupported type: $type")
 }
 
@@ -77,7 +85,7 @@ internal fun nameOf(type: KType): BuildConfigType {
 
     return BuildConfigType(
         className = type.javaType.genericName,
-        typeArguments = targetType.arguments.map { nameOf(it.type!!) },
+        typeArguments = targetType.arguments.map { it.type?.let(::nameOf) ?: nameOf("*") },
         nullable = targetType.isMarkedNullable,
         array = isArray
     )

plugin/src/main/kotlin/com/github/gmazzo/buildconfig/generators/BuildConfigJavaGenerator.kt

@@ -12,6 +12,7 @@ import com.squareup.javapoet.MethodSpec
 import com.squareup.javapoet.ParameterizedTypeName
 import com.squareup.javapoet.TypeName
 import com.squareup.javapoet.TypeSpec
+import com.squareup.javapoet.WildcardTypeName
 import org.gradle.api.logging.Logging
 import org.gradle.api.tasks.Input
 import javax.lang.model.element.Modifier
@@ -35,6 +36,7 @@ data class BuildConfigJavaGenerator(
             "string" -> STRING
             "list" -> LIST
             "set" -> SET
+            "*", "?" -> WildcardTypeName.get(Object::class.java)
             else -> ClassName.bestGuess(className)
         }
         if (typeArguments.isNotEmpty()) type = ParameterizedTypeName.get(

plugin/src/main/kotlin/com/github/gmazzo/buildconfig/generators/BuildConfigKotlinGenerator.kt

@@ -30,6 +30,7 @@ import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.SET
 import com.squareup.kotlinpoet.SHORT
 import com.squareup.kotlinpoet.SHORT_ARRAY
+import com.squareup.kotlinpoet.STAR
 import com.squareup.kotlinpoet.STRING
 import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.TypeSpec
@@ -105,6 +106,7 @@ data class BuildConfigKotlinGenerator(
             "string" -> STRING
             "list" -> LIST
             "set" -> SET
+            "*", "?" -> STAR
             else -> ClassName.bestGuess(kotlinClassName)
         }
         if (typeArguments.isNotEmpty())

plugin/src/main/kotlin/org/gradle/kotlin/dsl/BuildConfigClassSpecDSL.kt

@@ -3,6 +3,7 @@ package org.gradle.kotlin.dsl
 import com.github.gmazzo.buildconfig.BuildConfigClassSpec
 import com.github.gmazzo.buildconfig.BuildConfigDsl
 import com.github.gmazzo.buildconfig.BuildConfigField
+import com.github.gmazzo.buildconfig.BuildConfigValue
 import org.gradle.api.Action
 import org.gradle.api.NamedDomainObjectProvider
 import org.gradle.api.provider.Provider
@@ -36,6 +37,26 @@ inline fun <reified Type : Serializable> BuildConfigClassSpec.buildConfigField(
     it.value(value)
 })
 
+@BuildConfigDsl
+@JvmName("buildConfigFieldExpression")
+inline fun <reified Type : Any?> BuildConfigClassSpec.buildConfigField(
+    name: String,
+    expression: BuildConfigValue.Expression,
+): NamedDomainObjectProvider<BuildConfigField> = buildConfigField(name, Action {
+    it.type(typeOf<Type>())
+    it.value.set(expression)
+})
+
+@BuildConfigDsl
+@JvmName("buildConfigFieldExpression")
+inline fun <reified Type : Any?> BuildConfigClassSpec.buildConfigField(
+    name: String,
+    expression: Provider<BuildConfigValue.Expression>,
+): NamedDomainObjectProvider<BuildConfigField> = buildConfigField(name, Action {
+    it.type(typeOf<Type>())
+    it.value.set(expression)
+})
+
 @BuildConfigDsl
 @JvmName("buildConfigFieldArray")
 inline fun <reified Type : Serializable?> BuildConfigClassSpec.buildConfigField(