misc: upgrade to kotlinx.coroutines 1.9.0 (#1408)

awslabs · Sep 18, 2024 · 366bd93 · 366bd93
1 parent 6ec9e41
commit 366bd93
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git 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": {
@@ -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"]
     }
   }
 }
diff --git a/.changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json 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"
+}
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
@@ -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<Boolean>
 
-    @OptIn(ExperimentalSerializationApi::class)
     @TaskAction
     fun updatePackageManifest() {
         check(modelFile.isPresent != modelDir.isPresent) { "Exactly one of `model` or `model-dir` must be set" }

diff --git a/...-support/src/test/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt b/...-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"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,12 +5,12 @@ 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
-smithy-kotlin-runtime-version = "1.3.10"
-smithy-kotlin-codegen-version = "0.33.10"
+smithy-kotlin-runtime-version = "1.3.12"
+smithy-kotlin-codegen-version = "0.33.12"
 
 # codegen
 smithy-version = "1.50.0"