From 064f3a632868c3dc228b5320b0de469056093ac7 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Tue, 3 Oct 2023 09:17:01 -0400 Subject: [PATCH] Upgrade to Kotlin 1.9.10, Dokka 1.9.0 --- aws-runtime/aws-config/api/aws-config.api | 1 + aws-runtime/build.gradle.kts | 3 +-- build.gradle.kts | 6 ++++-- .../main/kotlin/aws/sdk/kotlin/dokka/AwsDokkaPlugin.kt | 5 +++++ examples/build.gradle.kts | 2 +- gradle.properties | 9 +++++---- .../ecs-credentials/app/build.gradle.kts | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/aws-runtime/aws-config/api/aws-config.api b/aws-runtime/aws-config/api/aws-config.api index 0f62a04a1ea..5ac5200ac4e 100644 --- a/aws-runtime/aws-config/api/aws-config.api +++ b/aws-runtime/aws-config/api/aws-config.api @@ -262,6 +262,7 @@ public final class aws/sdk/kotlin/runtime/config/imds/EndpointMode : java/lang/E public static final field Companion Laws/sdk/kotlin/runtime/config/imds/EndpointMode$Companion; public static final field IPv4 Laws/sdk/kotlin/runtime/config/imds/EndpointMode; public static final field IPv6 Laws/sdk/kotlin/runtime/config/imds/EndpointMode; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Laws/sdk/kotlin/runtime/config/imds/EndpointMode; public static fun values ()[Laws/sdk/kotlin/runtime/config/imds/EndpointMode; } diff --git a/aws-runtime/build.gradle.kts b/aws-runtime/build.gradle.kts index 9b913a45338..d8e5e362374 100644 --- a/aws-runtime/build.gradle.kts +++ b/aws-runtime/build.gradle.kts @@ -9,12 +9,11 @@ description = "AWS client runtime support for generated service clients" plugins { id("org.jetbrains.dokka") - id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.12.1" + id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2" jacoco } val sdkVersion: String by project - val kotestVersion: String by project val slf4jVersion: String by project diff --git a/build.gradle.kts b/build.gradle.kts index 76acb35c701..0442e60c3ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ buildscript { } plugins { - kotlin("jvm") version "1.8.22" apply false + kotlin("jvm") version "1.9.10" apply false id("org.jetbrains.dokka") } @@ -108,7 +108,9 @@ project.afterEvaluate { // This is especially important for inter-repo linking (e.g., via externalDocumentationLink) because the // package-list doesn't contain enough project path information to indicate where modules' documentation are // located. - fileLayout.set { parent, child -> parent.outputDirectory.get().resolve(child.project.name) } + fileLayout.set { parent, child -> + parent.outputDirectory.dir(child.moduleName) + } includes.from( // NOTE: these get concatenated diff --git a/dokka-aws/src/main/kotlin/aws/sdk/kotlin/dokka/AwsDokkaPlugin.kt b/dokka-aws/src/main/kotlin/aws/sdk/kotlin/dokka/AwsDokkaPlugin.kt index b80787bd090..33bf11f403b 100644 --- a/dokka-aws/src/main/kotlin/aws/sdk/kotlin/dokka/AwsDokkaPlugin.kt +++ b/dokka-aws/src/main/kotlin/aws/sdk/kotlin/dokka/AwsDokkaPlugin.kt @@ -8,6 +8,8 @@ package aws.sdk.kotlin.dokka import aws.sdk.kotlin.dokka.transformers.FilterInternalApis import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.plugability.DokkaPlugin +import org.jetbrains.dokka.plugability.DokkaPluginApiPreview +import org.jetbrains.dokka.plugability.PluginApiPreviewAcknowledgement /** * Dokka plugin for customizing the AWS Kotlin SDK generated API docs @@ -22,4 +24,7 @@ class AwsDokkaPlugin : DokkaPlugin() { val filterInternalApis by extending { dokkaBase.preMergeDocumentableTransformer providing ::FilterInternalApis } + + @DokkaPluginApiPreview + override fun pluginApiPreviewAcknowledgement() = PluginApiPreviewAcknowledgement } diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 00327bb2c87..a922097bc2b 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ plugins { - kotlin("jvm") version "1.8.22" + kotlin("jvm") version "1.9.10" } val awsSdkKotlinVersion: String by project diff --git a/gradle.properties b/gradle.properties index 42813273ebb..ce6a39656bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,16 +15,17 @@ smithyGradleVersion=0.6.0 smithyKotlinVersion=0.27.5 # kotlin -kotlinVersion=1.8.22 -dokkaVersion=1.7.10 +kotlinVersion=1.9.10 +dokkaVersion=1.9.0 # kotlin JVM kotlinJVMTargetVersion=1.8 # kotlin libraries coroutinesVersion=1.7.3 -atomicFuVersion=0.19.0 -kotlinxSerializationVersion=1.4.1 +atomicFuVersion=0.22.0 +kotlinx.atomicfu.enableJvmIrTransformation=true +kotlinxSerializationVersion=1.6.0 ktorVersion=2.3.3 # testing/utility diff --git a/tests/integration-tests/ecs-credentials/app/build.gradle.kts b/tests/integration-tests/ecs-credentials/app/build.gradle.kts index aa52181151f..f32ea601d9c 100644 --- a/tests/integration-tests/ecs-credentials/app/build.gradle.kts +++ b/tests/integration-tests/ecs-credentials/app/build.gradle.kts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ plugins { - kotlin("jvm") version "1.8.22" + kotlin("jvm") version "1.9.10" application id("com.github.johnrengelman.shadow") version "7.0.0" }