Skip to content

Commit 383d16d

Browse files
ianbotsfianbotsf
committed
feat: upgrade to Kotlin 2.2.0
1 parent 7dc1992 commit 383d16d

File tree

8 files changed

+25
-69
lines changed

8 files changed

+25
-69
lines changed

‎.changes/f56de67b-6779-4296-a7d0-dcdefa0d4acd.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "f56de67b-6779-4296-a7d0-dcdefa0d4acd",
3+
"type": "feature",
4+
"description": "Upgrade to Kotlin 2.2.0"
5+
}

‎aws-runtime/aws-http/api/aws-http.api‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -119,48 +119,13 @@ public final class aws/sdk/kotlin/runtime/http/SdkMetadata {
119119

120120
public final class aws/sdk/kotlin/runtime/http/interceptors/AddUserAgentMetadataInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
121121
public fun <init> (Ljava/util/Map;)V
122-
public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
123-
public fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
124-
public fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
125-
public fun modifyBeforeRetryLoop (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
126-
public fun modifyBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
127-
public fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
128-
public fun modifyBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
129-
public fun readAfterAttempt (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
130-
public fun readAfterDeserialization (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
131-
public fun readAfterExecution (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
132-
public fun readAfterSerialization (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
133-
public fun readAfterSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
134-
public fun readAfterTransmit (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
135-
public fun readBeforeAttempt (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
136-
public fun readBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
137122
public fun readBeforeExecution (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
138-
public fun readBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
139-
public fun readBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
140-
public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
141123
}
142124

143125
public final class aws/sdk/kotlin/runtime/http/interceptors/AwsSpanInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
144126
public static final field INSTANCE Laws/sdk/kotlin/runtime/http/interceptors/AwsSpanInterceptor;
145127
public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
146128
public fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
147-
public fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
148-
public fun modifyBeforeRetryLoop (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
149-
public fun modifyBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
150-
public fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
151-
public fun modifyBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
152-
public fun readAfterAttempt (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
153-
public fun readAfterDeserialization (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
154-
public fun readAfterExecution (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
155-
public fun readAfterSerialization (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
156-
public fun readAfterSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
157-
public fun readAfterTransmit (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
158-
public fun readBeforeAttempt (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
159-
public fun readBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
160-
public fun readBeforeExecution (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
161-
public fun readBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
162-
public fun readBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
163-
public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
164129
}
165130

166131
public final class aws/sdk/kotlin/runtime/http/interceptors/IgnoreCompositeFlexibleChecksumResponseInterceptor : aws/smithy/kotlin/runtime/http/interceptors/FlexibleChecksumsResponseInterceptor {
@@ -210,25 +175,7 @@ public final class aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/AwsB
210175

211176
public final class aws/sdk/kotlin/runtime/http/interceptors/businessmetrics/BusinessMetricsInterceptor : aws/smithy/kotlin/runtime/client/Interceptor {
212177
public fun <init> ()V
213-
public fun modifyBeforeAttemptCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
214-
public fun modifyBeforeCompletion-gIAlu-s (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
215-
public fun modifyBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
216-
public fun modifyBeforeRetryLoop (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
217-
public fun modifyBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
218-
public fun modifyBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
219178
public fun modifyBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
220-
public fun readAfterAttempt (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
221-
public fun readAfterDeserialization (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
222-
public fun readAfterExecution (Laws/smithy/kotlin/runtime/client/ResponseInterceptorContext;)V
223-
public fun readAfterSerialization (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
224-
public fun readAfterSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
225-
public fun readAfterTransmit (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
226-
public fun readBeforeAttempt (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
227-
public fun readBeforeDeserialization (Laws/smithy/kotlin/runtime/client/ProtocolResponseInterceptorContext;)V
228-
public fun readBeforeExecution (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
229-
public fun readBeforeSerialization (Laws/smithy/kotlin/runtime/client/RequestInterceptorContext;)V
230-
public fun readBeforeSigning (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
231-
public fun readBeforeTransmit (Laws/smithy/kotlin/runtime/client/ProtocolRequestInterceptorContext;)V
232179
}
233180

234181
public final class aws/sdk/kotlin/runtime/http/middleware/AwsRetryHeaderMiddleware : aws/smithy/kotlin/runtime/http/operation/MutateMiddleware {
@@ -242,7 +189,6 @@ public final class aws/sdk/kotlin/runtime/http/middleware/RecursionDetection : a
242189
public fun <init> ()V
243190
public fun <init> (Laws/smithy/kotlin/runtime/util/EnvironmentProvider;)V
244191
public synthetic fun <init> (Laws/smithy/kotlin/runtime/util/EnvironmentProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
245-
public fun install (Laws/smithy/kotlin/runtime/http/operation/SdkHttpOperation;)V
246192
public fun modifyRequest (Laws/smithy/kotlin/runtime/http/operation/OperationRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
247193
public synthetic fun modifyRequest (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
248194
}

‎aws-runtime/build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
import aws.sdk.kotlin.gradle.dsl.configurePublishing
6-
import aws.sdk.kotlin.gradle.kmp.*
6+
import aws.sdk.kotlin.gradle.kmp.kotlin
7+
import aws.sdk.kotlin.gradle.kmp.needsKmpConfigured
78
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
89

910
description = "AWS client runtime support for generated service clients"
@@ -65,6 +66,7 @@ subprojects {
6566
jvmTarget.set(JvmTarget.JVM_1_8)
6667
freeCompilerArgs.add("-Xjdk-release=1.8")
6768
freeCompilerArgs.add("-Xexpect-actual-classes")
69+
freeCompilerArgs.add("-jvm-default=no-compatibility") // https://youtrack.jetbrains.com/issue/KT-77376
6870
}
6971
}
7072
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {

‎bom/build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
77
import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
88
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
99
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
10-
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
11-
import java.util.*
1210

1311
plugins {
1412
`maven-publish`
@@ -84,7 +82,6 @@ fun createBomConstraintsAndVersionCatalog() {
8482

8583
fun Project.artifactId(target: KotlinTarget): String = when (target) {
8684
is KotlinMetadataTarget -> name
87-
is KotlinJsTarget -> "$name-js"
8885
else -> "$name-${target.targetName.lowercase()}"
8986
}
9087

‎codegen/sdk/aws-models/cloudwatch.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
"smithy": "2.0",
33
"metadata": {
44
"suppressions": [
5+
{
6+
"id": "QueryErrorCode",
7+
"namespace": "*"
8+
},
59
{
610
"id": "HttpMethodSemantics",
711
"namespace": "*"

‎docs/targets.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
targetCompatibility = JavaVersion.VERSION_1_8
3333
isCoreLibraryDesugaringEnabled = true
3434
}
35-
kotlinOptions {
35+
compilerOptions {
3636
jvmTarget = "1.8"
3737
}
3838
}
@@ -49,4 +49,4 @@ The AWS SDK for Kotlin supports [native image compilation using GraalVM](https:/
4949
Compiling native images is easily accomplished by applying [the GraalVM build plugin](https://github.com/graalvm/native-build-tools) to your application and running `./gradlew nativeCompile`.
5050
View [their getting started guide](https://graalvm.github.io/native-build-tools/latest/gradle-plugin-quickstart.html) for further details.
5151

52-
NOTE: [log4j2 does not currently support](https://github.com/apache/logging-log4j2/issues/1539) GraalVM native image compilation, so we recommend selecting a different logger implementation such as Logback.
52+
NOTE: [log4j2 does not currently support](https://github.com/apache/logging-log4j2/issues/1539) GraalVM native image compilation, so we recommend selecting a different logger implementation such as Logback.

‎gradle/libs.versions.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
[versions]
2-
kotlin-version = "2.1.0"
3-
ksp-version = "2.1.0-1.0.29" # Keep in sync with kotlin-version
2+
kotlin-version = "2.2.0"
3+
ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version
44

55
dokka-version = "2.0.0"
66

77
aws-kotlin-repo-tools-version = "0.4.31"
88

99
# libs
10-
coroutines-version = "1.9.0"
11-
atomicfu-version = "0.25.0"
12-
binary-compatibility-validator-version = "0.16.3"
10+
coroutines-version = "1.10.2"
11+
atomicfu-version = "0.29.0"
12+
binary-compatibility-validator-version = "0.18.0"
1313

1414
# smithy-kotlin codegen and runtime are versioned separately
15-
smithy-kotlin-runtime-version = "1.4.21"
16-
smithy-kotlin-codegen-version = "0.34.21"
15+
smithy-kotlin-runtime-version = "1.4.22-SNAPSHOT"
16+
smithy-kotlin-codegen-version = "0.34.22-SNAPSHOT"
1717

1818
# codegen
1919
smithy-version = "1.60.2"
2020

2121
# testing
2222
ddb-local-version = "2.5.2"
23-
junit-version = "5.10.5"
23+
junit-version = "5.13.2"
2424
kotest-version = "5.9.1"
2525
kotlinx-benchmark-version = "0.4.12"
2626
kotlinx-serialization-version = "1.7.3"

‎hll/build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
*/
55

66
import aws.sdk.kotlin.gradle.dsl.configurePublishing
7-
import aws.sdk.kotlin.gradle.kmp.*
7+
import aws.sdk.kotlin.gradle.kmp.kotlin
8+
import aws.sdk.kotlin.gradle.kmp.needsKmpConfigured
89
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
910

1011
description = "High-level libraries for the AWS SDK for Kotlin"
@@ -88,6 +89,7 @@ subprojects {
8889
jvmTarget.set(JvmTarget.JVM_1_8)
8990
freeCompilerArgs.add("-Xjdk-release=1.8")
9091
freeCompilerArgs.add("-Xexpect-actual-classes")
92+
freeCompilerArgs.add("-jvm-default=no-compatibility") // https://youtrack.jetbrains.com/issue/KT-77376
9193
}
9294
}
9395
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {

0 commit comments

Comments
 (0)