Skip to content

Commit 366bd93

Browse files
authored
misc: upgrade to kotlinx.coroutines 1.9.0 (#1408)
1 parent 6ec9e41 commit 366bd93

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

.brazil.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.*.*": "KotlinStdlibJdk8-2.x",
55
"org.jetbrains.kotlin:kotlin-stdlib:2.*.*": "KotlinStdlib-2.x",
66
"org.jetbrains.kotlinx:atomicfu:0.*.*": "Atomicfu-0.x",
7-
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x",
8-
"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.*": "KotlinxCoroutinesCore-1.8.x",
9-
"org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.*": "KotlinxCoroutinesJdk8-1.8.x"
7+
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": "KotlinxCoroutinesCoreJvm-1.x",
8+
"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.*": "KotlinxCoroutinesCore-1.x",
9+
"org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": "KotlinxCoroutinesJdk8-1.x"
1010
},
1111
"packageHandlingRules": {
1212
"versioning": {
@@ -19,6 +19,9 @@
1919
"aws.sdk.kotlin:version-catalog"
2020
],
2121
"resolvesConflictDependencies": {
22+
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*" : ["KotlinxCoroutinesCoreJvm-1.x"],
23+
"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.*": ["KotlinxCoroutinesCore-1.x"],
24+
"org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.*": ["KotlinxCoroutinesJdk8-1.x"]
2225
}
2326
}
2427
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "36676f86-d1ea-46b6-aa99-2f6c840b5748",
3+
"type": "misc",
4+
"description": "Upgrade to kotlinx.coroutines 1.9.0"
5+
}

build-support/src/main/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import aws.sdk.kotlin.gradle.sdk.PackageManifest
88
import aws.sdk.kotlin.gradle.sdk.PackageMetadata
99
import aws.sdk.kotlin.gradle.sdk.orNull
1010
import aws.sdk.kotlin.gradle.sdk.validate
11-
import kotlinx.serialization.ExperimentalSerializationApi
1211
import kotlinx.serialization.encodeToString
1312
import kotlinx.serialization.json.Json
1413
import org.gradle.api.DefaultTask
@@ -46,7 +45,6 @@ abstract class UpdatePackageManifest : DefaultTask() {
4645
@get:Input
4746
public abstract val discover: Property<Boolean>
4847

49-
@OptIn(ExperimentalSerializationApi::class)
5048
@TaskAction
5149
fun updatePackageManifest() {
5250
check(modelFile.isPresent != modelDir.isPresent) { "Exactly one of `model` or `model-dir` must be set" }

build-support/src/test/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package aws.sdk.kotlin.gradle.sdk.tasks
66

77
import aws.sdk.kotlin.gradle.sdk.PackageManifest
88
import aws.sdk.kotlin.gradle.sdk.PackageMetadata
9-
import kotlinx.serialization.ExperimentalSerializationApi
109
import kotlinx.serialization.encodeToString
1110
import kotlinx.serialization.json.Json
1211
import org.gradle.kotlin.dsl.create
@@ -15,7 +14,6 @@ import org.junit.jupiter.api.io.TempDir
1514
import java.io.File
1615
import kotlin.test.*
1716

18-
@OptIn(ExperimentalSerializationApi::class)
1917
class UpdatePackageManifestTaskTest {
2018
fun modelContents(sdkId: String, serviceName: String = "TestService"): String = """
2119
${"$"}version: "2"

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ dokka-version = "1.9.10"
55
aws-kotlin-repo-tools-version = "0.4.10"
66

77
# libs
8-
coroutines-version = "1.8.1"
8+
coroutines-version = "1.9.0"
99
atomicfu-version = "0.24.0"
1010

1111
# smithy-kotlin codegen and runtime are versioned separately
12-
smithy-kotlin-runtime-version = "1.3.10"
13-
smithy-kotlin-codegen-version = "0.33.10"
12+
smithy-kotlin-runtime-version = "1.3.12"
13+
smithy-kotlin-codegen-version = "0.33.12"
1414

1515
# codegen
1616
smithy-version = "1.50.0"

0 commit comments

Comments
 (0)