Updated targets setup

Author: Mr3zee

gradle-conventions/common/src/main/kotlin/util/OptionalProperty.kt

@@ -6,24 +6,43 @@ package util
 
 import org.gradle.api.Project
 import kotlin.reflect.KProperty
+import kotlin.text.replaceFirstChar
+
+class OptionalProperty(private val target: Project, private val subpaths: Array<out String>) {
+    private var cachedValue: Boolean? = null
 
-class OptionalProperty(private val target: Project) {
     operator fun getValue(thisRef: Any?, property: KProperty<*>): Boolean {
-        return getValue("kotlinx.rpc.${property.name}")
+        return cachedValue ?: target.getValue(property.name, subpaths).also { cachedValue = it }
     }
+}
+
+private fun Project.getValue(propertyName: String, subpaths: Array<out String>): Boolean {
+    val subpathProperty = subpaths
+        .joinToString(".", postfix = ".")
+        .takeIf { it != "." && it.isNotEmpty() }
+        ?: ""
+
+    val subpathCamelCase = subpaths
+        .joinToString("") { it.replaceFirstChar(Char::titlecase) }
+        .replaceFirstChar { it.lowercase() }
+
+    val name = propertyName
+        .removePrefix(subpathCamelCase)
+        .replaceFirstChar { it.lowercase() }
+
+    val fullName = "kotlinx.rpc.$subpathProperty$name"
 
-    fun getValue(propName: String): Boolean {
-        return when {
-            target.hasProperty(propName) -> (target.properties[propName] as String).toBoolean()
-            else -> false
-        }
+    return when {
+        hasProperty(fullName) -> (properties[fullName] as? String)?.toBooleanStrictOrNull()
+            ?: error("Invalid value for '$fullName' property: ${properties[fullName]}")
+        else -> false
     }
 }
 
-fun Project.optionalProperty(): OptionalProperty {
-    return OptionalProperty(this)
+fun Project.optionalProperty(vararg subpaths: String): OptionalProperty {
+    return OptionalProperty(this, subpaths)
 }
 
-fun Project.optionalProperty(name: String): Boolean {
-    return OptionalProperty(this).getValue(name)
+fun Project.optionalPropertyValue(name: String, vararg subpaths: String): Boolean {
+    return getValue(name, subpaths)
 }

gradle-conventions/common/src/main/kotlin/util/ProjectKotlinConfig.kt

@@ -35,12 +35,6 @@ private fun loadTargetsSinceKotlinLookupTable(rootDir: String): Map<String, Stri
 class ProjectKotlinConfig(
     project: Project,
     val kotlinVersion: KotlinVersion,
-    jvm: Boolean = true,
-    js: Boolean = true,
-    wasmJs: Boolean = true,
-    wasmJsD8: Boolean = true,
-    wasmWasi: Boolean = true,
-    val native: Boolean = true,
 ) : Project by project {
     private val targetsLookup by lazy {
         val globalRootDir: String by extra
@@ -56,11 +50,19 @@ class ProjectKotlinConfig(
         } ?: false
     }
 
-    val jvm: Boolean by lazy { jvm && isIncluded("jvm") }
-    val js: Boolean by lazy { js && isIncluded("js") }
-    val wasmJs: Boolean by lazy {  wasmJs && isIncluded("wasmJs") }
-    val wasmJsD8: Boolean by lazy {  wasmJsD8 && wasmJs }
-    val wasmWasi: Boolean by lazy {  wasmWasi && isIncluded("wasmWasi") }
+    private val excludeJvm: Boolean by optionalProperty("exclude")
+    private val excludeJs: Boolean by optionalProperty("exclude")
+    private val excludeWasmJs: Boolean by optionalProperty("exclude")
+    private val excludeWasmJsD8: Boolean by optionalProperty("exclude")
+    private val excludeWasmWasi: Boolean by optionalProperty("exclude")
+    val excludeNative: Boolean by optionalProperty("exclude")
+
+    val jvm: Boolean by lazy { !excludeJvm && isIncluded("jvm") }
+    val js: Boolean by lazy { !excludeJs && isIncluded("js") }
+    val wasmJs: Boolean by lazy { !excludeWasmJs && isIncluded("wasmJs") }
+    val wasmJsD8: Boolean by lazy { !excludeWasmJsD8 && wasmJs }
+    val wasmWasi: Boolean by lazy { !excludeWasmWasi && isIncluded("wasmWasi") }
+    val native = !excludeNative
 
     private val nativeLookup by lazy {
         targetsLookup.filterKeys { key ->
@@ -75,29 +77,17 @@ class ProjectKotlinConfig(
             !kotlinMasterBuild && targetFunction.parameters.size == 1 && isIncluded(
                 targetName = targetFunction.name,
                 lookupTable = nativeLookup,
-            )
+            ) && !optionalPropertyValue(targetFunction.name, "exclude")
         }.map { function ->
             function.call(kmp) as KotlinTarget
         }
 }
 
 fun Project.withKotlinConfig(configure: ProjectKotlinConfig.() -> Unit) {
     val kotlinVersion: KotlinVersion by extra
-    val excludeJvm: Boolean by optionalProperty()
-    val excludeJs: Boolean by optionalProperty()
-    val excludeWasmJs: Boolean by optionalProperty()
-    val excludeWasmJsD8: Boolean by optionalProperty()
-    val excludeWasmWasi: Boolean by optionalProperty()
-    val excludeNative: Boolean by optionalProperty()
 
     ProjectKotlinConfig(
         project = project,
         kotlinVersion = kotlinVersion,
-        jvm = !excludeJvm,
-        js = !excludeJs,
-        wasmJs = !excludeWasmJs,
-        wasmJsD8 = !excludeWasmJsD8,
-        wasmWasi = !excludeWasmWasi,
-        native = !excludeNative,
     ).configure()
 }

krpc/gradle.properties

@@ -3,4 +3,6 @@
 #
 
 # https://github.com/oshai/kotlin-logging/issues/433
-kotlinx.rpc.excludeWasmWasi=true
+kotlinx.rpc.exclude.wasmWasi=true
+kotlinx.rpc.exclude.watchosArm32=true
+kotlinx.rpc.exclude.watchosDeviceArm64=true

krpc/krpc-test/gradle.properties

@@ -3,4 +3,4 @@
 #
 
 # tests fail with some obscure reason
-kotlinx.rpc.excludeWasmJsD8=true
+kotlinx.rpc.exclude.wasmJsD8=true

versions-root/targets-since-kotlin-lookup.json

@@ -5,7 +5,7 @@
   "wasmJs": "*",
   "wasmWasi": "*",
 
-  "mingwX64": "-",
+  "mingwX64": "*",
 
   "linuxX64": "*",
   "linuxArm64": "*",
@@ -15,15 +15,20 @@
   "iosSimulatorArm64": "*",
 
   "watchosX64": "*",
-  "watchosArm32": "-",
+  "watchosArm32": "*",
   "watchosArm64": "*",
   "watchosSimulatorArm64": "*",
-  "watchosDeviceArm64": "-",
+  "watchosDeviceArm64": "*",
 
   "tvosX64": "*",
   "tvosArm64": "*",
-  "tvosSimulatorArm64": "-",
+  "tvosSimulatorArm64": "*",
 
   "macosX64": "*",
-  "macosArm64": "*"
+  "macosArm64": "*",
+
+  "androidNativeArm32": "-",
+  "androidNativeArm64": "-",
+  "androidNativeX86": "-",
+  "androidNativeX64": "-"
 }