From a13c1879d494db19a750e42bb49fab99948ff35f Mon Sep 17 00:00:00 2001 From: Matas Date: Wed, 16 Oct 2024 11:38:24 -0400 Subject: [PATCH] misc: upgrade dependencies (#1163) --- .../abdc974c-e5e5-4523-9af0-26653b6c6bdf.json | 5 ++++ .../build.gradle.kts | 1 - .../smithy-kotlin-codegen/build.gradle.kts | 1 - gradle/libs.versions.toml | 28 +++++++++---------- runtime/auth/aws-credentials/build.gradle.kts | 2 +- runtime/crt-util/build.gradle.kts | 2 +- .../telemetry-defaults/build.gradle.kts | 5 +--- .../aws-protocol-core/build.gradle.kts | 4 +-- .../http-client-engine-crt/build.gradle.kts | 3 +- .../runtime/http/test/util/Certificates.kt | 2 +- runtime/protocol/http-client/build.gradle.kts | 2 +- runtime/runtime-core/build.gradle.kts | 2 +- 12 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 .changes/abdc974c-e5e5-4523-9af0-26653b6c6bdf.json diff --git a/.changes/abdc974c-e5e5-4523-9af0-26653b6c6bdf.json b/.changes/abdc974c-e5e5-4523-9af0-26653b6c6bdf.json new file mode 100644 index 000000000..16ff02f99 --- /dev/null +++ b/.changes/abdc974c-e5e5-4523-9af0-26653b6c6bdf.json @@ -0,0 +1,5 @@ +{ + "id": "abdc974c-e5e5-4523-9af0-26653b6c6bdf", + "type": "misc", + "description": "Upgrade to Kotlin 2.0.21" +} \ No newline at end of file diff --git a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts index a9e7aca64..b5c04ada2 100644 --- a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts +++ b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts @@ -21,7 +21,6 @@ group = "software.amazon.smithy.kotlin" version = codegenVersion dependencies { - implementation(kotlin("stdlib-jdk8")) implementation(libs.smithy.aws.traits) implementation(libs.smithy.protocol.traits) api(project(":codegen:smithy-kotlin-codegen")) diff --git a/codegen/smithy-kotlin-codegen/build.gradle.kts b/codegen/smithy-kotlin-codegen/build.gradle.kts index 956418641..00b5f520f 100644 --- a/codegen/smithy-kotlin-codegen/build.gradle.kts +++ b/codegen/smithy-kotlin-codegen/build.gradle.kts @@ -24,7 +24,6 @@ val sdkVersion: String by project val runtimeVersion = sdkVersion dependencies { - implementation(kotlin("stdlib-jdk8")) api(libs.smithy.codegen.core) api(libs.smithy.waiters) implementation(libs.smithy.rules.engine) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6e0d3dcd6..a3a6b2ec9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,35 +1,35 @@ [versions] -kotlin-version = "2.0.10" +kotlin-version = "2.0.21" dokka-version = "1.9.10" -aws-kotlin-repo-tools-version = "0.4.10" +aws-kotlin-repo-tools-version = "0.4.13" # libs coroutines-version = "1.9.0" -atomicfu-version = "0.24.0" +atomicfu-version = "0.25.0" okhttp-version = "5.0.0-alpha.14" okhttp4-version = "4.12.0" -okio-version = "3.9.0" -otel-version = "1.32.0" -slf4j-version = "2.0.9" +okio-version = "3.9.1" +otel-version = "1.43.0" +slf4j-version = "2.0.16" slf4j-v1x-version = "1.7.36" -crt-kotlin-version = "0.8.9" -micrometer-version = "1.13.2" +crt-kotlin-version = "0.8.10" +micrometer-version = "1.13.6" # codegen smithy-version = "1.51.0" smithy-gradle-version = "0.9.0" # testing -junit-version = "5.10.1" -kotest-version = "5.8.0" +junit-version = "5.10.5" +kotest-version = "5.9.1" kotlin-compile-testing-version = "1.6.0" -kotlinx-benchmark-version = "0.4.9" -kotlinx-serialization-version = "1.6.0" -docker-java-version = "3.3.6" +kotlinx-benchmark-version = "0.4.12" +kotlinx-serialization-version = "1.7.3" +docker-java-version = "3.4.0" ktor-version = "2.3.12" kaml-version = "0.55.0" -jsoup-version = "1.16.2" +jsoup-version = "1.18.1" [libraries] aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" } diff --git a/runtime/auth/aws-credentials/build.gradle.kts b/runtime/auth/aws-credentials/build.gradle.kts index ae061a4ec..059032c49 100644 --- a/runtime/auth/aws-credentials/build.gradle.kts +++ b/runtime/auth/aws-credentials/build.gradle.kts @@ -7,7 +7,7 @@ description = "Types for AWS credentials" extra["displayName"] = "Smithy :: Kotlin :: AWS Credentials" extra["moduleName"] = "aws.smithy.kotlin.runtime.auth.awscredentials" -apply(plugin = "kotlinx-atomicfu") +apply(plugin = "org.jetbrains.kotlinx.atomicfu") kotlin { sourceSets { diff --git a/runtime/crt-util/build.gradle.kts b/runtime/crt-util/build.gradle.kts index b04f86a4b..ddc57d11a 100644 --- a/runtime/crt-util/build.gradle.kts +++ b/runtime/crt-util/build.gradle.kts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -apply(plugin = "kotlinx-atomicfu") +apply(plugin = "org.jetbrains.kotlinx.atomicfu") description = "Utilities for working with AWS CRT Kotlin" extra["displayName"] = "Smithy :: Kotlin :: CRT :: Util" diff --git a/runtime/observability/telemetry-defaults/build.gradle.kts b/runtime/observability/telemetry-defaults/build.gradle.kts index 83027708a..e77655c91 100644 --- a/runtime/observability/telemetry-defaults/build.gradle.kts +++ b/runtime/observability/telemetry-defaults/build.gradle.kts @@ -7,10 +7,7 @@ description = "Default telemetry provider" extra["displayName"] = "Smithy :: Kotlin :: Observability :: Telemetry Defaults" extra["moduleName"] = "aws.smithy.kotlin.runtime.telemetry" -val coroutinesVersion: String by project -val slf4jVersion: String by project -val atomicFuVersion: String by project -apply(plugin = "kotlinx-atomicfu") +apply(plugin = "org.jetbrains.kotlinx.atomicfu") kotlin { sourceSets { diff --git a/runtime/protocol/aws-protocol-core/build.gradle.kts b/runtime/protocol/aws-protocol-core/build.gradle.kts index 5c81bf9c3..3c88f1b55 100644 --- a/runtime/protocol/aws-protocol-core/build.gradle.kts +++ b/runtime/protocol/aws-protocol-core/build.gradle.kts @@ -7,9 +7,7 @@ description = "Common AWS protocol support" extra["displayName"] = "AWS :: Smithy :: Kotlin :: AWS Protocols" extra["moduleName"] = "aws.smithy.kotlin.runtime.awsprotocol" -val coroutinesVersion: String by project - -apply(plugin = "kotlinx-atomicfu") +apply(plugin = "org.jetbrains.kotlinx.atomicfu") kotlin { sourceSets { diff --git a/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts b/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts index 9af3415ff..d2f411578 100644 --- a/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts +++ b/runtime/protocol/http-client-engines/http-client-engine-crt/build.gradle.kts @@ -2,12 +2,13 @@ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */ -apply(plugin = "kotlinx-atomicfu") description = "HTTP client engine backed by CRT" extra["displayName"] = "AWS :: SDK :: Kotlin :: HTTP" extra["moduleName"] = "aws.smithy.kotlin.runtime.http.engine.crt" +apply(plugin = "org.jetbrains.kotlinx.atomicfu") + kotlin { sourceSets { jvmMain { diff --git a/runtime/protocol/http-client-engines/test-suite/jvm/src/aws/smithy/kotlin/runtime/http/test/util/Certificates.kt b/runtime/protocol/http-client-engines/test-suite/jvm/src/aws/smithy/kotlin/runtime/http/test/util/Certificates.kt index 770d2eeaf..7025e761d 100644 --- a/runtime/protocol/http-client-engines/test-suite/jvm/src/aws/smithy/kotlin/runtime/http/test/util/Certificates.kt +++ b/runtime/protocol/http-client-engines/test-suite/jvm/src/aws/smithy/kotlin/runtime/http/test/util/Certificates.kt @@ -15,7 +15,7 @@ private const val DEFAULT_CERTIFICATE_PASSWORD = "certificate pass" private val DEFAULT_HOSTS = listOf("localhost", "127.0.0.1") private const val DEFAULT_KEY_STORE_PASSWORD = "key store pass" -internal data class SslConfig private constructor( +internal data class SslConfig( val keyStore: KeyStore, val keyStoreFile: File, val keyStorePassword: String, diff --git a/runtime/protocol/http-client/build.gradle.kts b/runtime/protocol/http-client/build.gradle.kts index 916610638..d55e5ffe4 100644 --- a/runtime/protocol/http-client/build.gradle.kts +++ b/runtime/protocol/http-client/build.gradle.kts @@ -6,7 +6,7 @@ description = "HTTP client abstractions" extra["displayName"] = "Smithy :: Kotlin :: HTTP Client" extra["moduleName"] = "aws.smithy.kotlin.runtime.http" -apply(plugin = "kotlinx-atomicfu") +apply(plugin = "org.jetbrains.kotlinx.atomicfu") kotlin { sourceSets { diff --git a/runtime/runtime-core/build.gradle.kts b/runtime/runtime-core/build.gradle.kts index ea4d68ab9..bbaa9d60e 100644 --- a/runtime/runtime-core/build.gradle.kts +++ b/runtime/runtime-core/build.gradle.kts @@ -11,7 +11,7 @@ description = "Core runtime for Smithy clients and services generated by smithy- extra["displayName"] = "Smithy :: Kotlin :: Runtime" extra["moduleName"] = "aws.smithy.kotlin.runtime" -apply(plugin = "kotlinx-atomicfu") +apply(plugin = "org.jetbrains.kotlinx.atomicfu") kotlin { sourceSets {