Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

misc: upgrade to kotlinx.coroutines 1.9.0 #1408

Merged
merged 7 commits into from
Sep 18, 2024
Merged

misc: upgrade to kotlinx.coroutines 1.9.0 #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65f83d8
Upgrade to kotlinx.coroutines 1.9.0
lauzadis Sep 17, 2024
c154b20
Changelog
lauzadis Sep 17, 2024
36a2fc5
Remove unnecessary OptIn annotations
lauzadis Sep 18, 2024
a8b583a
Upgrade smithy-kotlin version
lauzadis Sep 18, 2024
95911aa
Add resolves-conflict-dependencies
lauzadis Sep 18, 2024
b672da2
Bump smithy-kotlin version
lauzadis Sep 18, 2024
46a5659
Merge branch 'main' into misc-upgrade-coroutines
lauzadis Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .brazil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"]
}
}
}
5 changes: 5 additions & 0 deletions .changes/36676f86-d1ea-46b6-aa99-2f6c840b5748.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "36676f86-d1ea-46b6-aa99-2f6c840b5748",
"type": "misc",
"description": "Upgrade to kotlinx.coroutines 1.9.0"
}
2 changes: 0 additions & 2 deletions build-support/src/main/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" }
Expand Down
2 changes: 0 additions & 2 deletions ...-support/src/test/kotlin/aws/sdk/kotlin/gradle/sdk/tasks/UpdatePackageManifestTaskTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading