Skip to content

Commit

Permalink
misc: upgrade dependencies (#1163)
Browse files Browse the repository at this point in the history
  • Loading branch information
lauzadis authored Oct 16, 2024
1 parent 15cde2a commit a13c187
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 29 deletions.
5 changes: 5 additions & 0 deletions .changes/abdc974c-e5e5-4523-9af0-26653b6c6bdf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "abdc974c-e5e5-4523-9af0-26653b6c6bdf",
"type": "misc",
"description": "Upgrade to Kotlin 2.0.21"
}
1 change: 0 additions & 1 deletion codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
1 change: 0 additions & 1 deletion codegen/smithy-kotlin-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
28 changes: 14 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion runtime/auth/aws-credentials/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion runtime/crt-util/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 1 addition & 4 deletions runtime/observability/telemetry-defaults/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 1 addition & 3 deletions runtime/protocol/aws-protocol-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion runtime/protocol/http-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion runtime/runtime-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit a13c187

Please sign in to comment.