Skip to content

Commit 1a4f498

Browse files
authored
feat: upgrade to Kotlin 2.2.0 (#1637)
1 parent 7dc1992 commit 1a4f498

File tree

8 files changed

+195
-193
lines changed

8 files changed

+195
-193
lines changed
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/build.gradle.kts

Lines changed: 2 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"

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

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"
16+
smithy-kotlin-codegen-version = "0.34.22"
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: 8 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"
@@ -90,6 +91,12 @@ subprojects {
9091
freeCompilerArgs.add("-Xexpect-actual-classes")
9192
}
9293
}
94+
95+
tasks.withType<JavaCompile> {
96+
sourceCompatibility = JavaVersion.VERSION_1_8.toString()
97+
targetCompatibility = JavaVersion.VERSION_1_8.toString()
98+
}
99+
93100
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {
94101
compilerOptions {
95102
freeCompilerArgs.add("-Xexpect-actual-classes")

hll/dynamodb-mapper/dynamodb-mapper-schema-generator-plugin/api/dynamodb-mapper-schema-generator-plugin.api

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPlug
44
public fun apply (Lorg/gradle/api/Project;)V
55
}
66

7-
public final class aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPlugin$apply$1$1$inlined$sam$i$org_gradle_api_Action$0 : org/gradle/api/Action {
8-
public fun <init> (Lkotlin/jvm/functions/Function1;)V
9-
public final synthetic fun execute (Ljava/lang/Object;)V
10-
}
11-
12-
public final class aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPlugin$inlined$sam$i$org_gradle_api_Action$0 : org/gradle/api/Action {
13-
public fun <init> (Lkotlin/jvm/functions/Function1;)V
14-
public final synthetic fun execute (Ljava/lang/Object;)V
15-
}
16-
177
public class aws/sdk/kotlin/hll/dynamodbmapper/plugins/SchemaGeneratorPluginExtension {
188
public fun <init> ()V
199
public final fun getDestinationPackage ()Laws/sdk/kotlin/hll/dynamodbmapper/codegen/annotations/DestinationPackage;

0 commit comments

Comments
 (0)