From 0970b85320bdd6ef870430f2cc0196ceef989745 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Fri, 12 Apr 2024 10:45:34 -0400 Subject: [PATCH 01/15] latest --- gradle.properties | 4 +++- gradle/libs.versions.toml | 2 +- run-test.sh | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100755 run-test.sh diff --git a/gradle.properties b/gradle.properties index 4c9306918f6..5bcbf79fae3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,6 @@ smithyKotlinDocBaseUrl=https://sdk.amazonaws.com/kotlin/api/smithy-kotlin/api/$s # atomicfu kotlinx.atomicfu.enableJvmIrTransformation=true # FIXME - https://github.com/Kotlin/kotlinx-atomicfu/issues/274 -kotlinx.atomicfu.enableNativeIrTransformation=false \ No newline at end of file +kotlinx.atomicfu.enableNativeIrTransformation=false + +kotlin.experimental.tryK2=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 28d6a59a159..34cbe487115 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin-version = "1.9.21" +kotlin-version = "2.0.0-rc1" dokka-version = "1.9.10" aws-kotlin-repo-tools-version = "0.4.0" diff --git a/run-test.sh b/run-test.sh new file mode 100755 index 00000000000..537457ea0cd --- /dev/null +++ b/run-test.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +counter=0 + +while true; do + ./gradlew :services:s3:jvmTest --tests "aws.sdk.kotlin.services.s3.express.DefaultS3ExpressCredentialsProviderTest.testAsyncRefreshDebounce" + if [ $? -ne 0 ]; then + echo "Command failed after $counter executions with exit code $?" + break + else + ((counter++)) + fi +done \ No newline at end of file From a268ffe7f342c82a9bd008ae350364432ea6dcfa Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Mon, 15 Apr 2024 11:26:08 -0400 Subject: [PATCH 02/15] latest --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34cbe487115..a439646cedc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin-version = "2.0.0-rc1" +kotlin-version = "2.0.0-RC1" dokka-version = "1.9.10" aws-kotlin-repo-tools-version = "0.4.0" From d71569691092c43d24314321f9a4a3ffafafe3dd Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Mon, 15 Apr 2024 13:56:50 -0400 Subject: [PATCH 03/15] latest --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a439646cedc..1a346a11706 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ smithy-version = "1.47.0" junit-version = "5.10.1" kotest-version = "5.8.0" kotlinx-benchmark-version = "0.4.9" -kotlinx-serialization-version = "1.6.2" +kotlinx-serialization-version = "1.6.3" mockk-version = "1.13.7" slf4j-version = "2.0.9" From f8313a44a906883766e76f079db41739d4649777 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Sat, 25 May 2024 12:52:26 +0200 Subject: [PATCH 04/15] Compiles --- .../sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt | 5 ++++- .../kotlin/runtime/region/DefaultRegionProviderChainJVM.kt | 2 +- .../runtime/region/DefaultRegionProviderChainNative.kt | 4 ++-- gradle.properties | 2 -- gradle/libs.versions.toml | 2 +- services/build.gradle.kts | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt index 92385e6ba39..cba23c8fb26 100644 --- a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt +++ b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt @@ -25,4 +25,7 @@ public expect class DefaultRegionProviderChain constructor( platformProvider: PlatformProvider = PlatformProvider.System, imdsClient: Lazy = lazy { ImdsClient() }, profile: LazyAsyncValue = asyncLazy { loadAwsSharedConfig(platformProvider).activeProfile }, -) : RegionProvider, Closeable +) : RegionProvider, Closeable { + override fun close() + override suspend fun getRegion(): String? +} diff --git a/aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainJVM.kt b/aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainJVM.kt index 237c089a9e4..460a49a9bae 100644 --- a/aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainJVM.kt +++ b/aws-runtime/aws-config/jvm/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainJVM.kt @@ -24,7 +24,7 @@ public actual class DefaultRegionProviderChain actual constructor( ImdsRegionProvider(client = imdsClient, platformProvider = platformProvider), ) { - override fun close() { + actual override fun close() { providers.forEach { provider -> if (provider is Closeable) provider.close() } diff --git a/aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt b/aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt index 777cd69903a..894d69c2596 100644 --- a/aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt +++ b/aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt @@ -16,11 +16,11 @@ public actual class DefaultRegionProviderChain actual constructor( imdsClient: Lazy, profile: LazyAsyncValue, ) : RegionProvider, Closeable { - override suspend fun getRegion(): String? { + actual override suspend fun getRegion(): String? { TODO("Not yet implemented") } - override fun close() { + actual override fun close() { TODO("Not yet implemented") } } diff --git a/gradle.properties b/gradle.properties index 2f415ce631b..addd6355cda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,3 @@ smithyKotlinDocBaseUrl=https://sdk.amazonaws.com/kotlin/api/smithy-kotlin/api/$s kotlinx.atomicfu.enableJvmIrTransformation=true # FIXME - https://github.com/Kotlin/kotlinx-atomicfu/issues/274 kotlinx.atomicfu.enableNativeIrTransformation=false - -kotlin.experimental.tryK2=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6c820af795e..504e323b41f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlin-version = "2.0.0" dokka-version = "1.9.10" -aws-kotlin-repo-tools-version = "0.4.6" +aws-kotlin-repo-tools-version = "0.4.7-SNAPSHOT" # libs coroutines-version = "1.7.3" diff --git a/services/build.gradle.kts b/services/build.gradle.kts index f1fb421cd62..17572d8ab34 100644 --- a/services/build.gradle.kts +++ b/services/build.gradle.kts @@ -66,8 +66,8 @@ subprojects { defaultSourceSet { kotlin.srcDir("e2eTest/src") resources.srcDir("e2eTest/test-resources") - dependsOn(sourceSets.getByName("commonMain")) - dependsOn(sourceSets.getByName("jvmMain")) + dependsOn(this@kotlin.sourceSets.getByName("commonMain")) + dependsOn(this@kotlin.sourceSets.getByName("jvmMain")) dependencies { api(libraries.smithy.kotlin.testing) From ce22bc6bd7de3dfefcd9e80c296aeba6c9d9304c Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Sat, 25 May 2024 12:55:10 +0200 Subject: [PATCH 05/15] revert kotlinx-serialization dependency upgrade --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 504e323b41f..e7384b2ab29 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ smithy-version = "1.47.0" junit-version = "5.10.1" kotest-version = "5.8.0" kotlinx-benchmark-version = "0.4.9" -kotlinx-serialization-version = "1.6.3" +kotlinx-serialization-version = "1.6.2" mockk-version = "1.13.7" slf4j-version = "2.0.9" From 28c3f6160490f695222510b88c7dfa192dc349b4 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Sat, 25 May 2024 12:55:36 +0200 Subject: [PATCH 06/15] remove script file --- run-test.sh | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100755 run-test.sh diff --git a/run-test.sh b/run-test.sh deleted file mode 100755 index 537457ea0cd..00000000000 --- a/run-test.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -counter=0 - -while true; do - ./gradlew :services:s3:jvmTest --tests "aws.sdk.kotlin.services.s3.express.DefaultS3ExpressCredentialsProviderTest.testAsyncRefreshDebounce" - if [ $? -ne 0 ]; then - echo "Command failed after $counter executions with exit code $?" - break - else - ((counter++)) - fi -done \ No newline at end of file From 3cf908dfe5f24f6f5938ef3def42e67724dc4517 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Sat, 25 May 2024 12:56:03 +0200 Subject: [PATCH 07/15] remove extra newline --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index addd6355cda..5f79f9fcded 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,4 @@ smithyKotlinDocBaseUrl=https://sdk.amazonaws.com/kotlin/api/smithy-kotlin/api/$s # atomicfu kotlinx.atomicfu.enableJvmIrTransformation=true # FIXME - https://github.com/Kotlin/kotlinx-atomicfu/issues/274 -kotlinx.atomicfu.enableNativeIrTransformation=false +kotlinx.atomicfu.enableNativeIrTransformation=false \ No newline at end of file From 8b81a5a4714f3b5a6b27ffe74acbd5f752424413 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Sat, 25 May 2024 12:58:18 +0200 Subject: [PATCH 08/15] changelog --- .changes/37cb919c-05c9-4fff-b720-c7b4d0b02876.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/37cb919c-05c9-4fff-b720-c7b4d0b02876.json diff --git a/.changes/37cb919c-05c9-4fff-b720-c7b4d0b02876.json b/.changes/37cb919c-05c9-4fff-b720-c7b4d0b02876.json new file mode 100644 index 00000000000..953222568f9 --- /dev/null +++ b/.changes/37cb919c-05c9-4fff-b720-c7b4d0b02876.json @@ -0,0 +1,6 @@ +{ + "id": "37cb919c-05c9-4fff-b720-c7b4d0b02876", + "type": "misc", + "description": "⚠️ **IMPORTANT**: Upgrade to Kotlin 2.0.0", + "requiresMinorVersionBump": true +} \ No newline at end of file From 8f18f84961c2a48ccb8230a4e92e47d2d6ba1b86 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Mon, 17 Jun 2024 08:58:23 -0500 Subject: [PATCH 09/15] upgrade to 0.4.7 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5742fd16813..a629e0264ad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlin-version = "2.0.0" dokka-version = "1.9.10" -aws-kotlin-repo-tools-version = "0.4.7-SNAPSHOT" +aws-kotlin-repo-tools-version = "0.4.7" # libs coroutines-version = "1.7.3" From 537594e4a3b5e1f513565923a156f7886076046c Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Thu, 20 Jun 2024 23:16:17 -0500 Subject: [PATCH 10/15] Upgrade coroutines and atomicfu version --- gradle/libs.versions.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a629e0264ad..649150cc25b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,11 +2,11 @@ kotlin-version = "2.0.0" dokka-version = "1.9.10" -aws-kotlin-repo-tools-version = "0.4.7" +aws-kotlin-repo-tools-version = "0.5.0-SNAPSHOT" # libs -coroutines-version = "1.7.3" -atomicfu-version = "0.23.1" +coroutines-version = "1.8.1" +atomicfu-version = "0.24.0" # smithy-kotlin codegen and runtime are versioned separately smithy-kotlin-runtime-version = "1.2.7" @@ -23,7 +23,6 @@ kotlinx-serialization-version = "1.6.2" mockk-version = "1.13.7" slf4j-version = "2.0.9" - [libraries] aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" } From cd5e7f91de3b40f7fdb55b4e56a9fdc72e6b39b6 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Fri, 21 Jun 2024 09:43:51 -0500 Subject: [PATCH 11/15] Upgrade to latest aws-kotlin-repo-tools plugin --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 649150cc25b..30217f7c2a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlin-version = "2.0.0" dokka-version = "1.9.10" -aws-kotlin-repo-tools-version = "0.5.0-SNAPSHOT" +aws-kotlin-repo-tools-version = "0.4.8" # libs coroutines-version = "1.8.1" From 07c80aec1785b40865d75c8ddde3858697bc5a48 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Fri, 21 Jun 2024 15:14:52 -0500 Subject: [PATCH 12/15] Add allDeps task --- build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index f2f6e5accb5..14c782a477e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -112,6 +112,9 @@ allprojects { ) } } + + // Enables running `./gradlew allDeps` to get a comprehensive list of dependencies for every subproject + tasks.register("allDeps") { } } project.afterEvaluate { From 6f8fbcbf5d046b064187ecd7fff34534f5385955 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Mon, 24 Jun 2024 10:00:45 -0500 Subject: [PATCH 13/15] Add latest brazil transform --- .brazil.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.brazil.json b/.brazil.json index 40566118f5c..f9501d78f42 100644 --- a/.brazil.json +++ b/.brazil.json @@ -1,5 +1,13 @@ { "dependencies": { + "org.jetbrains.kotlin:kotlin-stdlib-common:2.*.*": "KotlinStdlibCommon-2.x", + "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.kotlin:kotlin-stdlib-common:1.9.*": "KotlinStdlibCommon-1.9.x", "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.*": "KotlinStdlibJdk8-1.9.x", "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": "KotlinStdlib-1.9.x", From 114b69a9159ebda5ef4de07261b5e6144b5c3eef Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 24 Jul 2024 10:21:00 -0400 Subject: [PATCH 14/15] ktlint --- .../sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt | 3 ++- .../kotlin/runtime/region/DefaultRegionProviderChainNative.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt index cba23c8fb26..25d59284b6c 100644 --- a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt +++ b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChain.kt @@ -25,7 +25,8 @@ public expect class DefaultRegionProviderChain constructor( platformProvider: PlatformProvider = PlatformProvider.System, imdsClient: Lazy = lazy { ImdsClient() }, profile: LazyAsyncValue = asyncLazy { loadAwsSharedConfig(platformProvider).activeProfile }, -) : RegionProvider, Closeable { +) : RegionProvider, + Closeable { override fun close() override suspend fun getRegion(): String? } diff --git a/aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt b/aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt index 894d69c2596..18ffb383e84 100644 --- a/aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt +++ b/aws-runtime/aws-config/native/src/aws/sdk/kotlin/runtime/region/DefaultRegionProviderChainNative.kt @@ -15,7 +15,8 @@ public actual class DefaultRegionProviderChain actual constructor( platformProvider: PlatformProvider, imdsClient: Lazy, profile: LazyAsyncValue, -) : RegionProvider, Closeable { +) : RegionProvider, + Closeable { actual override suspend fun getRegion(): String? { TODO("Not yet implemented") } From 402b7cbe2a2729ce9d9bfc4105c2704973b59e60 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Fri, 26 Jul 2024 12:12:00 -0400 Subject: [PATCH 15/15] Upgrade smithy-kotlin version --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b22831b4533..a79219d7a6b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,8 +9,8 @@ coroutines-version = "1.8.1" atomicfu-version = "0.24.0" # smithy-kotlin codegen and runtime are versioned separately -smithy-kotlin-runtime-version = "1.2.18" -smithy-kotlin-codegen-version = "0.32.18" +smithy-kotlin-runtime-version = "1.3.1" +smithy-kotlin-codegen-version = "0.33.1" # codegen smithy-version = "1.50.0"