Upgrade to Kotlin 1.9.10, Dokka 1.9.0

awslabs · Oct 3, 2023 · 064f3a6 · 064f3a6
1 parent cd64b82
commit 064f3a6
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 }