From 65f83d81631f0749711ec646e1b55b2f78135adf Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Tue, 17 Sep 2024 09:54:46 -0400 Subject: [PATCH 1/6] Upgrade to kotlinx.coroutines 1.9.0 --- .brazil.json | 6 +++--- gradle/libs.versions.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.brazil.json b/.brazil.json index d11d9ea6888..5c69c379ee6 100644 --- a/.brazil.json +++ b/.brazil.json @@ -4,9 +4,9 @@ "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.*.*": "KotlinStdlibJdk8-2.x", "org.jetbrains.kotlin:kotlin-stdlib:2.*.*": "KotlinStdlib-2.x", "org.jetbrains.kotlinx:atomicfu:0.*.*": "Atomicfu-0.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.*": "KotlinxCoroutinesCore-1.8.x", - "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.*": "KotlinxCoroutinesJdk8-1.8.x" + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x", + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.*": "KotlinxCoroutinesCore-1.x", + "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x" }, "packageHandlingRules": { "versioning": { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b26ae24fed1..943c196aca7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ dokka-version = "1.9.10" aws-kotlin-repo-tools-version = "0.4.10" # libs -coroutines-version = "1.8.1" +coroutines-version = "1.9.0" atomicfu-version = "0.24.0" # smithy-kotlin codegen and runtime are versioned separately From c154b20f3ee2290713e7e99888b93d0755f149d6 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Tue, 17 Sep 2024 09:55:00 -0400 Subject: [PATCH 2/6] Changelog --- .changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json diff --git a/.changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json b/.changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json new file mode 100644 index 00000000000..2b0184bd760 --- /dev/null +++ b/.changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json @@ -0,0 +1,5 @@ +{ + "id": "36676f86-d1ea-46b6-aa99-2f6c840b5748", + "type": "misc", + "description": "Upgrade to kotlinx.coroutines 1.9.0" +} \ No newline at end of file From 36a2fc52f5594c0b05a65d66cf064fc87a7bbb2e Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 18 Sep 2024 09:55:22 -0400 Subject: [PATCH 3/6] Remove unnecessary OptIn annotations --- .../aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifest.kt | 2 -- .../kotlin/gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifest.kt b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifest.kt index 55f76c1a07f..1690c4621b4 100644 --- a/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifest.kt +++ b/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifest.kt @@ -8,7 +8,6 @@ import aws.sdk.kotlin.gradle.sdk.PackageManifest import aws.sdk.kotlin.gradle.sdk.PackageMetadata import aws.sdk.kotlin.gradle.sdk.orNull import aws.sdk.kotlin.gradle.sdk.validate -import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.gradle.api.DefaultTask @@ -46,7 +45,6 @@ abstract class UpdatePackageManifest : DefaultTask() { @get:Input public abstract val discover: Property - @OptIn(ExperimentalSerializationApi::class) @TaskAction fun updatePackageManifest() { check(modelFile.isPresent != modelDir.isPresent) { "Exactly one of `model` or `model-dir` must be set" } diff --git a/build-support/src/test/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt b/build-support/src/test/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt index 29695159a5f..004bbc01689 100644 --- a/build-support/src/test/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt +++ b/build-support/src/test/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt @@ -6,7 +6,6 @@ package aws.sdk.kotlin.gradle.sdk.tasks import aws.sdk.kotlin.gradle.sdk.PackageManifest import aws.sdk.kotlin.gradle.sdk.PackageMetadata -import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import org.gradle.kotlin.dsl.create @@ -15,7 +14,6 @@ import org.junit.jupiter.api.io.TempDir import java.io.File import kotlin.test.* -@OptIn(ExperimentalSerializationApi::class) class UpdatePackageManifestTaskTest { fun modelContents(sdkId: String, serviceName: String = "TestService"): String = """ ${"$"}version: "2" From a8b583ab30475171a4854685f38c3e2043c8f1b8 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 18 Sep 2024 13:34:38 -0400 Subject: [PATCH 4/6] Upgrade smithy-kotlin version --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 943c196aca7..361ce29fcc5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,8 +9,8 @@ coroutines-version = "1.9.0" atomicfu-version = "0.24.0" # smithy-kotlin codegen and runtime are versioned separately -smithy-kotlin-runtime-version = "1.3.8" -smithy-kotlin-codegen-version = "0.33.8" +smithy-kotlin-runtime-version = "1.3.11" +smithy-kotlin-codegen-version = "0.33.11" # codegen smithy-version = "1.50.0" From 95911aadf80ffff8cdd09bce321cd73f5ef85ea4 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 18 Sep 2024 16:15:50 -0400 Subject: [PATCH 5/6] Add resolves-conflict-dependencies --- .brazil.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.brazil.json b/.brazil.json index 5c69c379ee6..654728738ed 100644 --- a/.brazil.json +++ b/.brazil.json @@ -19,6 +19,9 @@ "aws.sdk.kotlin:version-catalog" ], "resolvesConflictDependencies": { + "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*" : ["KotlinxCoroutinesCoreJvm-1.x"], + "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.*": ["KotlinxCoroutinesCore-1.x"], + "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": ["KotlinxCoroutinesJdk8-1.x"] } } } From b672da212a902ac42421112b728bc96ec524756a Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 18 Sep 2024 16:16:19 -0400 Subject: [PATCH 6/6] Bump smithy-kotlin version --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 361ce29fcc5..51cc7d96d88 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,8 +9,8 @@ coroutines-version = "1.9.0" atomicfu-version = "0.24.0" # smithy-kotlin codegen and runtime are versioned separately -smithy-kotlin-runtime-version = "1.3.11" -smithy-kotlin-codegen-version = "0.33.11" +smithy-kotlin-runtime-version = "1.3.12" +smithy-kotlin-codegen-version = "0.33.12" # codegen smithy-version = "1.50.0"