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.

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

misc: upgrade to Kotlin 2.0.0 #1337

Merged
merged 21 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .brazil.json
Original file line number Diff line number Diff line change
@@ -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:1.9.*": "KotlinStdlib-1.9.x",
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": "KotlinxCoroutinesCoreJvm-1.7.x",
"org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": "KotlinxCoroutinesCore-1.7.x"
Expand Down
6 changes: 6 additions & 0 deletions .changes/37cb919c-05c9-4fff-b720-c7b4d0b02876.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"id": "37cb919c-05c9-4fff-b720-c7b4d0b02876",
"type": "misc",
"description": "⚠️ **IMPORTANT**: Upgrade to Kotlin 2.0.0",
"requiresMinorVersionBump": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ public expect class DefaultRegionProviderChain constructor(
imdsClient: Lazy<InstanceMetadataProvider> = lazy { ImdsClient() },
profile: LazyAsyncValue<AwsProfile> = asyncLazy { loadAwsSharedConfig(platformProvider).activeProfile },
) : RegionProvider,
Closeable
Closeable {
override fun close()
override suspend fun getRegion(): String?
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public actual class DefaultRegionProviderChain actual constructor(
RegionProvider,
Closeable {

override fun close() {
actual override fun close() {
providers.forEach { provider ->
if (provider is Closeable) provider.close()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ public actual class DefaultRegionProviderChain actual constructor(
profile: LazyAsyncValue<AwsProfile>,
) : 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")
}
}
3 changes: 3 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ allprojects {
)
}
}

// Enables running `./gradlew allDeps` to get a comprehensive list of dependencies for every subproject
tasks.register<DependencyReportTask>("allDeps") { }
}

project.afterEvaluate {
Expand Down
11 changes: 5 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]
kotlin-version = "1.9.23"
kotlin-version = "2.0.0"
dokka-version = "1.9.10"

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

# 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.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"
Expand All @@ -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" }

Expand Down
4 changes: 2 additions & 2 deletions services/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading