Use aws-kotlin-repo-tools disableCrossCompile

Author: lauzadis

build.gradle.kts

@@ -5,11 +5,6 @@
 import aws.sdk.kotlin.gradle.dsl.configureLinting
 import aws.sdk.kotlin.gradle.dsl.configureNexus
 import aws.sdk.kotlin.gradle.util.typedProp
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.konan.target.Family
-import org.jetbrains.kotlin.konan.target.HostManager
-import kotlin.apply
 
 buildscript {
     // NOTE: buildscript classpath for the root project is the parent classloader for the subprojects, we
@@ -159,69 +154,3 @@ apiValidation {
         ),
     )
 }
-
-val disableCrossCompile = typedProp<Boolean>("aws.kotlin.native.disableCrossCompile") == true
-
-if (disableCrossCompile) {
-    logger.warn("aws.kotlin.native.disableCrossCompile=true: Cross compilation is disabled.")
-    disableCrossCompileTargets()
-}
-
-private val KotlinNativeTarget.isLinux: Boolean
-    get() = konanTarget.family == Family.LINUX
-
-private val KotlinNativeTarget.isApple: Boolean
-    get() = konanTarget.family.isAppleFamily
-
-private val KotlinNativeTarget.isWindows: Boolean
-    get() = konanTarget.family == Family.MINGW
-
-/**
- * Kotlin/Native Linux and Windows targets are generally enabled on all hosts since
- * the Kotlin toolchain and backend compilers support cross compilation. We
- * are using cinterop and have to compile CRT for those platforms which sometimes
- * requires using docker which isn't always available in CI or setup in users environment.
- *
- * See [KT-30498](https://youtrack.jetbrains.com/issue/KT-30498)
- */
-fun Project.disableCrossCompileTargets() {
-    allprojects {
-        plugins.withId("org.jetbrains.kotlin.multiplatform") {
-            configure<KotlinMultiplatformExtension> {
-                targets.withType<KotlinNativeTarget> {
-                    val knTarget = this
-                    when {
-                        HostManager.hostIsMac && (knTarget.isLinux || knTarget.isWindows) -> disable(knTarget)
-                        HostManager.hostIsLinux && knTarget.isApple -> disable(knTarget)
-                        HostManager.hostIsMingw && (knTarget.isLinux || knTarget.isApple) -> disable(knTarget)
-                    }
-                }
-            }
-        }
-    }
-}
-
-internal fun Project.disable(knTarget: KotlinNativeTarget) {
-    logger.warn("disabling Kotlin/Native target: ${knTarget.name}")
-    knTarget.apply {
-        compilations.all {
-            cinterops.all {
-                tasks.named(interopProcessingTaskName).configure { enabled = false }
-            }
-            compileTaskProvider.configure { enabled = false }
-        }
-
-        binaries.all {
-            linkTaskProvider.configure { enabled = false }
-        }
-
-        mavenPublication {
-            tasks.withType<AbstractPublishToMaven>().configureEach {
-                onlyIf { publication != this@mavenPublication }
-            }
-            tasks.withType<GenerateModuleMetadata>().configureEach {
-                onlyIf { publication != this@mavenPublication }
-            }
-        }
-    }
-}

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 kotlin-version = "2.0.21"
 dokka-version = "1.9.10"
 
-aws-kotlin-repo-tools-version = "0.4.19-kn"
+aws-kotlin-repo-tools-version = "0.4.20-kn"
 
 # libs
 coroutines-version = "1.9.0"

runtime/build.gradle.kts

@@ -4,6 +4,7 @@
  */
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
 import aws.sdk.kotlin.gradle.kmp.*
+import aws.sdk.kotlin.gradle.util.typedProp
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -17,6 +18,15 @@ val sdkVersion: String by project
 // Apply KMP configuration from build plugin
 configureKmpTargets()
 
+// Disable cross compilation if flag is set
+val disableCrossCompile = typedProp<Boolean>("aws.kotlin.native.disableCrossCompile") == true
+if (disableCrossCompile) {
+    logger.warn("aws.kotlin.native.disableCrossCompile=true: Cross compilation is disabled.")
+    allprojects {
+        disableCrossCompileTargets()
+    }
+}
+
 // capture locally - scope issue with custom KMP plugin
 val libraries = libs