Skip to content

Commit 6da7e3f

Browse files
authored
misc: upgrade to Kotlin 2.0.0 (#1337)
1 parent e520844 commit 6da7e3f

File tree

8 files changed

+31
-12
lines changed

8 files changed

+31
-12
lines changed

.brazil.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
{
22
"dependencies": {
3+
"org.jetbrains.kotlin:kotlin-stdlib-common:2.*.*": "KotlinStdlibCommon-2.x",
4+
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.*.*": "KotlinStdlibJdk8-2.x",
5+
"org.jetbrains.kotlin:kotlin-stdlib:2.*.*": "KotlinStdlib-2.x",
6+
"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",
10+
311
"org.jetbrains.kotlin:kotlin-stdlib:1.9.*": "KotlinStdlib-1.9.x",
412
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": "KotlinxCoroutinesCoreJvm-1.7.x",
513
"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": "KotlinxCoroutinesCore-1.7.x"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"id": "37cb919c-05c9-4fff-b720-c7b4d0b02876",
3+
"type": "misc",
4+
"description": "⚠️ **IMPORTANT**: Upgrade to Kotlin 2.0.0",
5+
"requiresMinorVersionBump": true
6+
}

aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ public expect class DefaultRegionProviderChain constructor(
2626
imdsClient: Lazy<InstanceMetadataProvider> = lazy { ImdsClient() },
2727
profile: LazyAsyncValue<AwsProfile> = asyncLazy { loadAwsSharedConfig(platformProvider).activeProfile },
2828
) : RegionProvider,
29-
Closeable
29+
Closeable {
30+
override fun close()
31+
override suspend fun getRegion(): String?
32+
}

aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainJVM.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public actual class DefaultRegionProviderChain actual constructor(
2424
RegionProvider,
2525
Closeable {
2626

27-
override fun close() {
27+
actual override fun close() {
2828
providers.forEach { provider ->
2929
if (provider is Closeable) provider.close()
3030
}

aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ public actual class DefaultRegionProviderChain actual constructor(
1717
profile: LazyAsyncValue<AwsProfile>,
1818
) : RegionProvider,
1919
Closeable {
20-
override suspend fun getRegion(): String? {
20+
actual override suspend fun getRegion(): String? {
2121
TODO("Not yet implemented")
2222
}
2323

24-
override fun close() {
24+
actual override fun close() {
2525
TODO("Not yet implemented")
2626
}
2727
}

build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ allprojects {
113113
)
114114
}
115115
}
116+
117+
// Enables running `./gradlew allDeps` to get a comprehensive list of dependencies for every subproject
118+
tasks.register<DependencyReportTask>("allDeps") { }
116119
}
117120

118121
project.afterEvaluate {

gradle/libs.versions.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[versions]
2-
kotlin-version = "1.9.23"
2+
kotlin-version = "2.0.0"
33
dokka-version = "1.9.10"
44

55
aws-kotlin-repo-tools-version = "0.4.9"
66

77
# libs
8-
coroutines-version = "1.7.3"
9-
atomicfu-version = "0.23.1"
8+
coroutines-version = "1.8.1"
9+
atomicfu-version = "0.24.0"
1010

1111
# smithy-kotlin codegen and runtime are versioned separately
12-
smithy-kotlin-runtime-version = "1.2.18"
13-
smithy-kotlin-codegen-version = "0.32.18"
12+
smithy-kotlin-runtime-version = "1.3.1"
13+
smithy-kotlin-codegen-version = "0.33.1"
1414

1515
# codegen
1616
smithy-version = "1.50.0"
@@ -23,7 +23,6 @@ kotlinx-serialization-version = "1.6.2"
2323
mockk-version = "1.13.7"
2424
slf4j-version = "2.0.9"
2525

26-
2726
[libraries]
2827
aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }
2928

services/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ subprojects {
6666
defaultSourceSet {
6767
kotlin.srcDir("e2eTest/src")
6868
resources.srcDir("e2eTest/test-resources")
69-
dependsOn(sourceSets.getByName("commonMain"))
70-
dependsOn(sourceSets.getByName("jvmMain"))
69+
dependsOn(this@kotlin.sourceSets.getByName("commonMain"))
70+
dependsOn(this@kotlin.sourceSets.getByName("jvmMain"))
7171

7272
dependencies {
7373
api(libraries.smithy.kotlin.testing)

0 commit comments

Comments
 (0)