feat: upgrade to Kotlin 2.2.0 (#1313)

Author: ianbotsf

.changes/2ec4ad9a-f964-4cf1-be58-d0229493bb81.json

@@ -0,0 +1,5 @@
+{
+    "id": "2ec4ad9a-f964-4cf1-be58-d0229493bb81",
+    "type": "feature",
+    "description": "Upgrade to Kotlin 2.2.0"
+}

bom/build.gradle.kts

@@ -7,8 +7,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
-import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
-import java.util.*
 
 plugins {
     `maven-publish`
@@ -52,7 +50,6 @@ fun createBomConstraintsAndVersionCatalog() {
 
 fun Project.artifactId(target: KotlinTarget): String = when (target) {
     is KotlinMetadataTarget -> name
-    is KotlinJsTarget -> "$name-js"
     else -> "$name-${target.targetName.lowercase()}"
 }
 

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt

@@ -37,7 +37,7 @@ private fun getDefaultRuntimeVersion(): String {
 // publishing info
 const val RUNTIME_GROUP: String = "aws.smithy.kotlin"
 val RUNTIME_VERSION: String = System.getProperty("smithy.kotlin.codegen.clientRuntimeVersion", getDefaultRuntimeVersion())
-val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.1.0")
+val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "2.2.0")
 
 enum class SourceSet {
     CommonMain,

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/rendering/GradleGenerator.kt

@@ -6,7 +6,10 @@ package software.amazon.smithy.kotlin.codegen.rendering
 
 import software.amazon.smithy.build.FileManifest
 import software.amazon.smithy.kotlin.codegen.KotlinSettings
-import software.amazon.smithy.kotlin.codegen.core.*
+import software.amazon.smithy.kotlin.codegen.core.InlineCodeWriter
+import software.amazon.smithy.kotlin.codegen.core.InlineCodeWriterFormatter
+import software.amazon.smithy.kotlin.codegen.core.KOTLIN_COMPILER_VERSION
+import software.amazon.smithy.kotlin.codegen.core.KotlinDependency
 import software.amazon.smithy.utils.AbstractCodeWriter
 
 // Determines the jvmTarget version emitted to the build file
@@ -134,7 +137,7 @@ fun renderRootJvmPluginConfig(writer: GradleWriter) {
         """
             jvm {
                 compilations.all {
-                    kotlinOptions.jvmTarget = #S
+                    compilerOptions.jvmTarget = #S
                 }
                 testRuns["test"].executionTask.configure {
                     useJUnitPlatform()

codegen/smithy-kotlin-codegen/src/test/kotlin/software/amazon/smithy/kotlin/codegen/KotlinSettingsTest.kt

@@ -11,6 +11,7 @@ import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.ArgumentsProvider
 import org.junit.jupiter.params.provider.ArgumentsSource
 import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.support.ParameterDeclarations
 import software.amazon.smithy.codegen.core.CodegenException
 import software.amazon.smithy.kotlin.codegen.test.TestModelDefault
 import software.amazon.smithy.kotlin.codegen.test.toSmithyModel
@@ -392,7 +393,10 @@ class TestProtocolSelectionArgumentProvider : ArgumentsProvider {
         private const val NO_CBOR = "awsJson1_0, awsJson1_1, restJson1, restXml, awsQuery, ec2Query"
     }
 
-    override fun provideArguments(context: ExtensionContext?): Stream<out Arguments> = Stream.of(
+    override fun provideArguments(
+        parameters: ParameterDeclarations?,
+        context: ExtensionContext?,
+    ): Stream<out Arguments> = Stream.of(
         Arguments.of(
             ALL_PROTOCOLS,
             "rpcv2Cbor, awsJson1_0",

gradle/libs.versions.toml

@@ -1,26 +1,26 @@
 [versions]
-kotlin-version = "2.1.0"
+kotlin-version = "2.2.0"
 dokka-version = "2.0.0"
 
 aws-kotlin-repo-tools-version = "0.4.31"
 
 # libs
-coroutines-version = "1.9.0"
-atomicfu-version = "0.25.0"
+coroutines-version = "1.10.2"
+atomicfu-version = "0.29.0"
 okhttp-version = "5.0.0-alpha.14"
 okhttp4-version = "4.12.0"
 okio-version = "3.9.1"
 otel-version = "1.45.0"
 slf4j-version = "2.0.16"
 slf4j-v1x-version = "1.7.36"
-crt-kotlin-version = "0.9.1"
+crt-kotlin-version = "0.9.2"
 micrometer-version = "1.14.2"
-binary-compatibility-validator-version = "0.16.3"
+binary-compatibility-validator-version = "0.18.0"
 
 smithy-version = "1.60.2"
 
 # testing
-junit-version = "5.10.5"
+junit-version = "5.13.2"
 kotest-version = "5.9.1"
 kotlin-compile-testing-version = "0.7.0"
 kotlinx-benchmark-version = "0.4.12"

runtime/auth/aws-credentials/api/aws-credentials.api

@@ -18,21 +18,16 @@ public abstract interface class aws/smithy/kotlin/runtime/auth/awscredentials/Cl
 public abstract interface class aws/smithy/kotlin/runtime/auth/awscredentials/Credentials : aws/smithy/kotlin/runtime/identity/Identity {
 	public static final field Companion Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials$Companion;
 	public abstract fun getAccessKeyId ()Ljava/lang/String;
-	public abstract fun getProviderName ()Ljava/lang/String;
+	public fun getProviderName ()Ljava/lang/String;
 	public abstract fun getSecretAccessKey ()Ljava/lang/String;
-	public abstract fun getSessionToken ()Ljava/lang/String;
+	public fun getSessionToken ()Ljava/lang/String;
 }
 
 public final class aws/smithy/kotlin/runtime/auth/awscredentials/Credentials$Companion {
 	public final fun invoke (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/time/Instant;Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;)Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials;
 	public static synthetic fun invoke$default (Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials$Companion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/time/Instant;Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials;
 }
 
-public final class aws/smithy/kotlin/runtime/auth/awscredentials/Credentials$DefaultImpls {
-	public static fun getProviderName (Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials;)Ljava/lang/String;
-	public static fun getSessionToken (Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials;)Ljava/lang/String;
-}
-
 public final class aws/smithy/kotlin/runtime/auth/awscredentials/CredentialsKt {
 	public static final fun copy (Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/time/Instant;Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;)Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials;
 	public static synthetic fun copy$default (Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/time/Instant;Ljava/lang/String;Laws/smithy/kotlin/runtime/collections/Attributes;ILjava/lang/Object;)Laws/smithy/kotlin/runtime/auth/awscredentials/Credentials;

runtime/auth/aws-signing-tests/build.gradle.kts

@@ -17,7 +17,6 @@ kotlin {
                 api(project(":runtime:auth:http-auth-aws"))
                 implementation(libs.kotlin.test)
                 implementation(libs.kotlinx.coroutines.test)
-                implementation(libs.junit.jupiter.params)
             }
         }
 
@@ -28,6 +27,7 @@ kotlin {
                 implementation(libs.ktor.http.cio)
                 implementation(libs.ktor.utils)
                 implementation(libs.kotlin.test.junit5)
+                implementation(libs.junit.jupiter.params)
                 implementation(libs.kotlinx.serialization.json)
             }
         }

runtime/auth/http-auth-api/api/http-auth-api.api

@@ -1,11 +1,7 @@
 public abstract interface class aws/smithy/kotlin/runtime/http/auth/AuthScheme {
 	public abstract fun getSchemeId-DepwgT4 ()Ljava/lang/String;
 	public abstract fun getSigner ()Laws/smithy/kotlin/runtime/http/auth/HttpSigner;
-	public abstract fun identityProvider (Laws/smithy/kotlin/runtime/identity/IdentityProviderConfig;)Laws/smithy/kotlin/runtime/identity/IdentityProvider;
-}
-
-public final class aws/smithy/kotlin/runtime/http/auth/AuthScheme$DefaultImpls {
-	public static fun identityProvider (Laws/smithy/kotlin/runtime/http/auth/AuthScheme;Laws/smithy/kotlin/runtime/identity/IdentityProviderConfig;)Laws/smithy/kotlin/runtime/identity/IdentityProvider;
+	public fun identityProvider (Laws/smithy/kotlin/runtime/identity/IdentityProviderConfig;)Laws/smithy/kotlin/runtime/identity/IdentityProvider;
 }
 
 public abstract interface class aws/smithy/kotlin/runtime/http/auth/HttpAuthConfig {

runtime/auth/http-auth-aws/api/http-auth-aws.api

@@ -60,7 +60,6 @@ public final class aws/smithy/kotlin/runtime/http/auth/SigV4AuthScheme : aws/smi
 	public fun getSchemeId-DepwgT4 ()Ljava/lang/String;
 	public fun getSigner ()Laws/smithy/kotlin/runtime/http/auth/AwsHttpSigner;
 	public synthetic fun getSigner ()Laws/smithy/kotlin/runtime/http/auth/HttpSigner;
-	public fun identityProvider (Laws/smithy/kotlin/runtime/identity/IdentityProviderConfig;)Laws/smithy/kotlin/runtime/identity/IdentityProvider;
 }
 
 public final class aws/smithy/kotlin/runtime/http/auth/SigV4AuthSchemeKt {