From d0079ba3070e4ce5627b3748547eab02d8b44c39 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 26 Feb 2023 22:03:57 +0300 Subject: [PATCH] Make selective native targets... again --- .../kscience/gradle/KScienceExtension.kt | 112 +++++++++++------- 1 file changed, 67 insertions(+), 45 deletions(-) diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index 51d9e0a..1ac0bfb 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -47,7 +47,6 @@ public val Project.isInDevelopment: Boolean || version.toString().endsWith("SNAPSHOT") - private const val defaultJdkVersion = 11 public open class KScienceExtension(public val project: Project) { @@ -294,28 +293,50 @@ public data class KScienceNativeTarget( } public class KScienceNativeConfiguration { - internal var targets: MutableMap = listOf( - KScienceNativeTarget.linuxX64, - KScienceNativeTarget.mingwX64, - KScienceNativeTarget.macosX64, - KScienceNativeTarget.macosArm64, - KScienceNativeTarget.iosX64, - KScienceNativeTarget.iosArm64, - KScienceNativeTarget.iosSimulatorArm64, - ).associateByTo(mutableMapOf()) { it.preset } + + + internal companion object { + private fun defaultNativeTargets(): Map { + + val hostOs = System.getProperty("os.name") + return when { + hostOs.startsWith("Windows") -> listOf( + KScienceNativeTarget.linuxX64, + KScienceNativeTarget.mingwX64 + ) + + hostOs == "Mac OS X" -> listOf( + KScienceNativeTarget.macosX64, + KScienceNativeTarget.macosArm64, + KScienceNativeTarget.iosX64, + KScienceNativeTarget.iosArm64, + KScienceNativeTarget.iosSimulatorArm64, + ) + + hostOs == "Linux" -> listOf(KScienceNativeTarget.linuxX64) + else -> { + emptyList() + } + }.associateBy { it.preset } + } + } + + + internal var targets: Map = defaultNativeTargets() + /** * Replace all targets */ public fun setTargets(vararg target: KScienceNativeTarget) { - targets = target.associateByTo(mutableMapOf()) { it.preset } + targets = target.associateBy { it.preset } } /** * Add a native target */ public fun target(target: KScienceNativeTarget) { - targets[target.preset] = target + targets += target.preset to target } public fun target( @@ -441,51 +462,52 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro val nativeConfiguration = KScienceNativeConfiguration().apply(block) pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { configure { - sourceSets { - val nativeTargets: List = - nativeConfiguration.targets.values.map { nativeTarget -> - when (nativeTarget.preset) { - KotlinNativePreset.linuxX64 -> linuxX64( - nativeTarget.targetName, - nativeTarget.targetConfiguration - ) + val nativeTargets: List = + nativeConfiguration.targets.values.map { nativeTarget -> + when (nativeTarget.preset) { + KotlinNativePreset.linuxX64 -> linuxX64( + nativeTarget.targetName, + nativeTarget.targetConfiguration + ) - KotlinNativePreset.mingwX64 -> mingwX64( - nativeTarget.targetName, - nativeTarget.targetConfiguration - ) + KotlinNativePreset.mingwX64 -> mingwX64( + nativeTarget.targetName, + nativeTarget.targetConfiguration + ) - KotlinNativePreset.macosX64 -> macosX64( - nativeTarget.targetName, - nativeTarget.targetConfiguration - ) + KotlinNativePreset.macosX64 -> macosX64( + nativeTarget.targetName, + nativeTarget.targetConfiguration + ) - KotlinNativePreset.macosArm64 -> macosArm64( - nativeTarget.targetName, - nativeTarget.targetConfiguration - ) + KotlinNativePreset.macosArm64 -> macosArm64( + nativeTarget.targetName, + nativeTarget.targetConfiguration + ) - KotlinNativePreset.iosX64 -> iosX64( - nativeTarget.targetName, - nativeTarget.targetConfiguration - ) + KotlinNativePreset.iosX64 -> iosX64( + nativeTarget.targetName, + nativeTarget.targetConfiguration + ) - KotlinNativePreset.iosArm64 -> iosArm64( - nativeTarget.targetName, - nativeTarget.targetConfiguration - ) + KotlinNativePreset.iosArm64 -> iosArm64( + nativeTarget.targetName, + nativeTarget.targetConfiguration + ) - KotlinNativePreset.iosSimulatorArm64 -> iosSimulatorArm64( - nativeTarget.targetName, - nativeTarget.targetConfiguration - ) + KotlinNativePreset.iosSimulatorArm64 -> iosSimulatorArm64( + nativeTarget.targetName, + nativeTarget.targetConfiguration + ) // else -> { // logger.error("Native preset ${nativeTarget.preset} not recognised.") // null // } - } } + } + + sourceSets { val commonMain by getting val commonTest by getting