kn: merge from main, upgrade to latest aws-kotlin-repo-tools (#129)

Author: lauzadis

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.9.1] - 01/28/2025
+
+### Fixes
+* Upgrade to latest version of CRT to pick up header signing changes
+
 ## [0.9.0] - 01/15/2025
 
 ### Miscellaneous

aws-crt-kotlin/build.gradle.kts

@@ -7,11 +7,10 @@ import aws.sdk.kotlin.gradle.crt.cmakeInstallDir
 import aws.sdk.kotlin.gradle.crt.configureCrtCMakeBuild
 import aws.sdk.kotlin.gradle.crt.disableCrossCompileTargets
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
+import aws.sdk.kotlin.gradle.kmp.configureIosSimulatorTasks
 import aws.sdk.kotlin.gradle.kmp.configureKmpTargets
 import aws.sdk.kotlin.gradle.util.typedProp
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
-import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -97,47 +96,7 @@ kotlin {
     }
 }
 
-// disable "standalone" mode in simulator tests since it causes TLS issues. this means we need to manage the simulator
-// ourselves (booting / shutting down). FIXME: https://youtrack.jetbrains.com/issue/KT-38317
-kotlin {
-    val simulatorDeviceName = project.findProperty("iosSimulatorDevice") as? String ?: "iPhone 15"
-
-    val xcrun = "/usr/bin/xcrun"
-
-    tasks.register<Exec>("bootIosSimulatorDevice") {
-        isIgnoreExitValue = true
-        commandLine(xcrun, "simctl", "boot", simulatorDeviceName)
-
-        doLast {
-            val result = executionResult.get()
-            val code = result.exitValue
-            if (code != 148 && code != 149) { // ignore "simulator already running" errors
-                result.assertNormalExitValue()
-            }
-        }
-    }
-
-    tasks.register<Exec>("shutdownIosSimulatorDevice") {
-        mustRunAfter(tasks.withType<KotlinNativeSimulatorTest>())
-        commandLine(xcrun, "simctl", "shutdown", simulatorDeviceName)
-
-        doLast {
-            executionResult.get().assertNormalExitValue()
-        }
-    }
-
-    tasks.withType<KotlinNativeSimulatorTest>().configureEach {
-        if (!HostManager.hostIsMac) {
-            return@configureEach
-        }
-
-        dependsOn("bootIosSimulatorDevice")
-        finalizedBy("shutdownIosSimulatorDevice")
-
-        standalone = false
-        device = simulatorDeviceName
-    }
-}
+configureIosSimulatorTasks()
 
 // Publishing
 configurePublishing("aws-crt-kotlin")

build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/CMakeUtils.kt

@@ -21,7 +21,6 @@ val KonanTarget.isSimulatorSdk: Boolean
         KonanTarget.TVOS_SIMULATOR_ARM64, KonanTarget.TVOS_X64,
         KonanTarget.WATCHOS_SIMULATOR_ARM64,
         KonanTarget.WATCHOS_X64,
-        KonanTarget.WATCHOS_X86,
         -> true
         else -> false
     }
@@ -46,7 +45,6 @@ val KonanTarget.osxDeviceSdkName: String?
         -> WATCHOS_DEVICE_SDK
         KonanTarget.WATCHOS_SIMULATOR_ARM64,
         KonanTarget.WATCHOS_X64,
-        KonanTarget.WATCHOS_X86,
         -> WATCHOS_SIMULATOR_SDK
         else -> null
     }

build-support/src/main/kotlin/aws/sdk/kotlin/gradle/crt/NativeUtils.kt

@@ -50,14 +50,14 @@ private val KotlinNativeTarget.isWindows: Boolean
 internal fun Project.disable(knTarget: KotlinNativeTarget) {
     logger.warn("disabling Kotlin/Native target: ${knTarget.name}")
     knTarget.apply {
+        binaries.all {
+            linkTaskProvider.configure { enabled = false }
+        }
         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 {

gradle.properties

@@ -1,4 +1,3 @@
-# kotlin
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
@@ -8,7 +7,7 @@ kotlin.daemon.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # aws-crt-kotlin
-sdkVersion=0.9.1-SNAPSHOT
+sdkVersion=0.9.2-SNAPSHOT
 
 # publishing
 publishGroupName=aws.sdk.kotlin.crt

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
 kotlin-version = "2.1.0"
 
-aws-kotlin-repo-tools-version = "0.4.21-kn"
+aws-kotlin-repo-tools-version = "0.4.22-kn"
 
 # libs
-crt-java-version = "0.33.7"
+crt-java-version = "0.33.10"
 coroutines-version = "1.9.0"
 binary-compatibility-validator-version = "0.16.3"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists