From 366bd93bb749fbc830002b61a62d2d996229202e Mon Sep 17 00:00:00 2001
From: Matas <lauzmata@amazon.com>
Date: Wed, 18 Sep 2024 17:54:13 -0400
Subject: [PATCH] misc: upgrade to kotlinx.coroutines 1.9.0 (#1408)

---
 .brazil.json                                             | 9 ++++++---
 .changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json       | 5 +++++
 .../sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifest.kt | 2 --
 .../gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt    | 2 --
 gradle/libs.versions.toml                                | 6 +++---
 5 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 .changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json

diff --git a/.brazil.json b/.brazil.json
index d11d9ea6888..654728738ed 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": {
@@ -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
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
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<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/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"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b373889eb77..51cc7d96d88 100644
--- 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"