kn: merge back into main

.github/actions/checkout-head/action.yml

@@ -23,6 +23,11 @@ inputs:
       commands. The post-job step removes the PAT.
     default: ${{ github.token }}
     required: false
+  submodules:
+    description: >
+      Whether to checkout submodules. `true` to checkout submodules or `recursive` to recursively checkout submodules
+    default: 'false'
+    required: 'false'
 
 runs:
   using: composite
@@ -44,7 +49,9 @@ runs:
           echo "ref=$ref" >> "$GITHUB_OUTPUT"
         else
           baseref="main"
-          if [ -n "$GITHUB_BASE_REF" ]; then
+          if [[ "$ref" == kn-* ]] && git ls-remote --exit-code --heads "https://github.com/$REPOSITORY.git" "kn-main"; then
+            baseref="kn-main"
+          elif [ -n "$GITHUB_BASE_REF" ]; then
             echo "attempting GH base ref: $GITHUB_BASE_REF"
             if git ls-remote --exit-code --heads "https://github.com/$REPOSITORY.git" "$GITHUB_BASE_REF"; then
               baseref="$GITHUB_BASE_REF"
@@ -60,4 +67,5 @@ runs:
         path: ${{ inputs.path }}
         repository: ${{ inputs.repository }}
         ref: ${{ steps.repo.outputs.ref }}
-        token: ${{ inputs.token }}
+        token: ${{ inputs.token }}
+        submodules: ${{ inputs.submodules }}

build-plugins/build-support/build.gradle.kts

@@ -29,7 +29,8 @@ dependencies {
     compileOnly(gradleApi())
     implementation(libs.aws.sdk.s3)
     implementation(libs.aws.sdk.cloudwatch)
-    testImplementation(libs.junit.jupiter)
+    testImplementation(kotlin("test"))
+    testImplementation(libs.kotlinx.coroutines.test)
 }
 
 gradlePlugin {

build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/Publish.kt

@@ -38,14 +38,13 @@ private object EnvironmentVariables {
     const val GPG_SECRET_KEY = "JRELEASER_GPG_SECRET_KEY"
 }
 
-private val ALLOWED_PUBLICATION_NAMES = setOf(
+internal val ALLOWED_PUBLICATION_NAMES = setOf(
     "common",
     "jvm",
-    "metadata",
     "kotlinMultiplatform",
+    "metadata",
     "bom",
     "versionCatalog",
-    "android", // aws-crt-kotlin
     "codegen",
     "codegen-testutils",
 
@@ -57,6 +56,22 @@ private val ALLOWED_PUBLICATION_NAMES = setOf(
     "dynamodb-mapper-schema-generatorPluginMarkerMaven",
 )
 
+internal val KOTLIN_NATIVE_PUBLICATION_NAMES = setOf(
+    "iosArm64",
+    "iosX64",
+    "linuxArm64",
+    "linuxX64",
+    "macosArm64",
+    "macosX64",
+    "mingwX64",
+)
+
+// TODO Refactor to support project names _or_ publication group names.
+// aws-crt-kotlin is not published with a group name, so we need to check project names instead.
+private val KOTLIN_NATIVE_PROJECT_NAMES = setOf(
+    "aws-crt-kotlin",
+)
+
 /**
  * Mark this project as excluded from publishing
  */
@@ -360,7 +375,7 @@ fun Project.configureJReleaser() {
     }
 }
 
-private fun isAvailableForPublication(project: Project, publication: MavenPublication): Boolean {
+internal fun isAvailableForPublication(project: Project, publication: MavenPublication): Boolean {
     var shouldPublish = true
 
     // Check SKIP_PUBLISH_PROP
@@ -371,7 +386,12 @@ private fun isAvailableForPublication(project: Project, publication: MavenPublic
     shouldPublish = shouldPublish && (publishGroupName == null || publication.groupId.startsWith(publishGroupName))
 
     // Validate publication name is allowed to be published
-    shouldPublish = shouldPublish && ALLOWED_PUBLICATION_NAMES.any { publication.name.equals(it, ignoreCase = true) }
+    shouldPublish = shouldPublish &&
+        (
+            ALLOWED_PUBLICATION_NAMES.any { publication.name.equals(it, ignoreCase = true) } ||
+                // standard publication
+                (KOTLIN_NATIVE_PUBLICATION_NAMES.any { publication.name.equals(it, ignoreCase = true) } && KOTLIN_NATIVE_PROJECT_NAMES.any { project.name.equals(it, ignoreCase = true) }) // Kotlin/Native publication
+            )
 
     return shouldPublish
 }

build-plugins/build-support/src/test/kotlin/aws/sdk/kotlin/gradle/dsl/PublishTest.kt

@@ -0,0 +1,105 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.sdk.kotlin.gradle.dsl
+
+import kotlinx.coroutines.test.runTest
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.testfixtures.ProjectBuilder
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class PublishTest {
+    @Test
+    fun `aws-crt-kotlin can publish Kotlin Native artifacts`() = runTest {
+        val project = ProjectBuilder.builder().withName("aws-crt-kotlin").build()
+        project.group = "aws.sdk.kotlin.crt"
+        project.version = "1.2.3"
+
+        project.configurePublishing("aws-crt-kotlin")
+
+        val publishing = project.extensions.getByType(PublishingExtension::class.java)
+        publishing.publications {
+            ALLOWED_PUBLICATION_NAMES.forEach {
+                val jvmRuntimePublication = create(it, MavenPublication::class.java).apply {
+                    groupId = "aws.sdk.kotlin.crt"
+                    version = "1.2.3"
+                    artifactId = "aws-crt-kotlin"
+                }
+                assertTrue(isAvailableForPublication(project, jvmRuntimePublication))
+            }
+
+            KOTLIN_NATIVE_PUBLICATION_NAMES.forEach {
+                val nativeRuntimePublication = create(it, MavenPublication::class.java).apply {
+                    groupId = "aws.sdk.kotlin.crt"
+                    version = "1.2.3"
+                    artifactId = "aws-crt-kotlin"
+                }
+                assertTrue(isAvailableForPublication(project, nativeRuntimePublication))
+            }
+        }
+    }
+
+    @Test
+    fun `aws-sdk-kotlin cannot publish Kotlin Native artifacts`() = runTest {
+        val project = ProjectBuilder.builder().withName("aws-sdk-kotlin").build()
+        project.group = "aws.sdk.kotlin"
+        project.version = "1.2.3"
+
+        project.configurePublishing("aws-sdk-kotlin")
+
+        val publishing = project.extensions.getByType(PublishingExtension::class.java)
+        publishing.publications {
+            ALLOWED_PUBLICATION_NAMES.forEach {
+                val jvmRuntimePublication = create(it, MavenPublication::class.java).apply {
+                    groupId = "aws.sdk.kotlin"
+                    version = "1.2.3"
+                    artifactId = "aws-runtime"
+                }
+                assertTrue(isAvailableForPublication(project, jvmRuntimePublication))
+            }
+
+            KOTLIN_NATIVE_PUBLICATION_NAMES.forEach {
+                val nativeRuntimePublication = create(it, MavenPublication::class.java).apply {
+                    groupId = "aws.sdk.kotlin"
+                    version = "1.2.3"
+                    artifactId = "aws-runtime"
+                }
+                assertFalse(isAvailableForPublication(project, nativeRuntimePublication))
+            }
+        }
+    }
+
+    @Test
+    fun `smithy-kotlin cannot publish Kotlin Native artifacts`() = runTest {
+        val project = ProjectBuilder.builder().withName("aws-smithy-kotlin").build()
+        project.group = "aws.smithy.kotlin"
+        project.version = "1.2.3"
+
+        project.configurePublishing("smithy-kotlin", "smithy-lang")
+
+        val publishing = project.extensions.getByType(PublishingExtension::class.java)
+        publishing.publications {
+            ALLOWED_PUBLICATION_NAMES.forEach {
+                val jvmRuntimePublication = create(it, MavenPublication::class.java).apply {
+                    groupId = "aws.smithy.kotlin"
+                    version = "1.2.3"
+                    artifactId = "runtime"
+                }
+                assertTrue(isAvailableForPublication(project, jvmRuntimePublication))
+            }
+
+            KOTLIN_NATIVE_PUBLICATION_NAMES.forEach {
+                val nativeRuntimePublication = create(it, MavenPublication::class.java).apply {
+                    groupId = "aws.smithy.kotlin"
+                    version = "1.2.3"
+                    artifactId = "runtime"
+                }
+                assertFalse(isAvailableForPublication(project, nativeRuntimePublication))
+            }
+        }
+    }
+}

build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureIosSimulator.kt

@@ -0,0 +1,61 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package aws.sdk.kotlin.gradle.kmp
+
+import org.gradle.api.Project
+import org.gradle.api.tasks.Exec
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
+import org.jetbrains.kotlin.konan.target.HostManager
+
+private val DEFAULT_SIMULATOR_DEVICE_NAME = "iPhone 16"
+
+/**
+ * Disables standalone mode in simulator tests since it causes issues with TLS.
+ * This means we need to manage the simulator state ourselves (booting, shutting down).
+ * https://youtrack.jetbrains.com/issue/KT-38317
+ */
+public fun Project.configureIosSimulatorTasks() {
+    if (!HostManager.hostIsMac) return
+
+    val simulatorDeviceName = project.findProperty("iosSimulatorDevice") as? String ?: DEFAULT_SIMULATOR_DEVICE_NAME
+    val xcrun = "/usr/bin/xcrun"
+
+    val bootTask = rootProject.tasks.maybeCreate("bootIosSimulatorDevice", Exec::class.java).apply {
+        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()
+            }
+        }
+    }
+
+    val shutdownTask = rootProject.tasks.maybeCreate("shutdownIosSimulatorDevice", Exec::class.java).apply {
+        isIgnoreExitValue = true
+        commandLine(xcrun, "simctl", "shutdown", simulatorDeviceName)
+
+        doLast {
+            val result = executionResult.get()
+            val code = result.exitValue
+            if (code != 148 && code != 149) { // ignore "simulator already shutdown" errors
+                result.assertNormalExitValue()
+            }
+        }
+    }
+
+    allprojects {
+        val simulatorTasks = tasks.withType<KotlinNativeSimulatorTest>()
+        simulatorTasks.configureEach {
+            dependsOn(bootTask)
+            standalone.set(false)
+            device.set(simulatorDeviceName)
+        }
+        shutdownTask.mustRunAfter(simulatorTasks)
+    }
+}