Upgrade to Kotlin 1.9.10, Dokka 1.9.0

smithy-lang · Oct 3, 2023 · 0f1eba3 · 0f1eba3
1 parent 773f558
commit 0f1eba3
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -79,7 +79,9 @@ tasks.dokkaHtmlMultiModule.configure {
     // 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/...in-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt b/...in-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/core/KotlinDependency.kt
@@ -34,7 +34,7 @@ private fun getDefaultRuntimeVersion(): String {
 // publishing info
 const val RUNTIME_GROUP: String = "aws.smithy.kotlin"
 val RUNTIME_VERSION: String = System.getProperty("smithy.kotlin.codegen.clientRuntimeVersion", getDefaultRuntimeVersion())
-val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "1.8.22")
+val KOTLIN_COMPILER_VERSION: String = System.getProperty("smithy.kotlin.codegen.kotlinCompilerVersion", "1.9.10")
 
 enum class SourceSet {
     CommonMain,

diff --git a/dokka-smithy/src/main/kotlin/aws/smithy/kotlin/dokka/SmithyDokkaPlugin.kt b/dokka-smithy/src/main/kotlin/aws/smithy/kotlin/dokka/SmithyDokkaPlugin.kt
@@ -7,6 +7,8 @@ package aws.smithy.kotlin.dokka
 
 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 Smithy Kotlin SDK generated API docs
@@ -21,4 +23,7 @@ class SmithyDokkaPlugin : DokkaPlugin() {
     val filterInternalApis by extending {
         dokkaBase.preMergeDocumentableTransformer providing ::FilterInternalApis
     }
+
+    @OptIn(DokkaPluginApiPreview::class)
+    override fun pluginApiPreviewAcknowledgement() = PluginApiPreviewAcknowledgement
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,8 +4,11 @@ kotlin.incremental.multiplatform=true
 kotlin.mpp.stability.nowarn=true
 kotlin.native.ignoreDisabledTargets=true
 
+# gradle
+org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
+
 # SDK
 sdkVersion=0.27.6-SNAPSHOT
 
 # kotlin
-kotlinVersion=1.8.22
+kotlinVersion=1.9.10
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-kotlin-version = "1.8.22"
-dokka-version = "1.7.10"
+kotlin-version = "1.9.10"
+dokka-version = "1.9.0"
 
 # libs
 coroutines-version = "1.7.3"
-atomicfu-version = "0.19.0"
+atomicfu-version = "0.22.0"
 okhttp-version = "5.0.0-alpha.11"
 okio-version = "3.3.0"
 otel-version = "1.27.0"
@@ -18,10 +18,10 @@ smithy-gradle-version = "0.6.0"
 
 # testing
 junit-version = "5.9.2"
-kotest-version = "5.5.4"
-kotlin-compile-testing-version = "1.4.9"
-kotlinx-benchmark-version = "0.4.7"
-kotlinx-serialization-version = "1.4.1"
+kotest-version = "5.7.2"
+kotlin-compile-testing-version = "1.5.0"
+kotlinx-benchmark-version = "0.4.9"
+kotlinx-serialization-version = "1.6.0"
 testcontainers-version = "1.17.6"
 ktor-version = "2.3.3"
 kaml-version = "0.49.0"
@@ -88,6 +88,6 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup-version" }
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka-version"}
 kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark-version" }
-kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.12.1" }
+kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version"}
 smithy-gradle = { id = "software.amazon.smithy", version.ref = "smithy-gradle-version" }
diff --git a/runtime/auth/aws-signing-common/api/aws-signing-common.api b/runtime/auth/aws-signing-common/api/aws-signing-common.api
@@ -4,13 +4,15 @@ public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsSignatureType :
 	public static final field HTTP_REQUEST_TRAILING_HEADERS Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignatureType;
 	public static final field HTTP_REQUEST_VIA_HEADERS Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignatureType;
 	public static final field HTTP_REQUEST_VIA_QUERY_PARAMS Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignatureType;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignatureType;
 	public static fun values ()[Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignatureType;
 }
 
 public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsSignedBodyHeader : java/lang/Enum {
 	public static final field NONE Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignedBodyHeader;
 	public static final field X_AMZ_CONTENT_SHA256 Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignedBodyHeader;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignedBodyHeader;
 	public static fun values ()[Laws/smithy/kotlin/runtime/auth/awssigning/AwsSignedBodyHeader;
 }
@@ -24,6 +26,7 @@ public abstract interface class aws/smithy/kotlin/runtime/auth/awssigning/AwsSig
 public final class aws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm : java/lang/Enum {
 	public static final field SIGV4 Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
 	public static final field SIGV4_ASYMMETRIC Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
 	public static fun values ()[Laws/smithy/kotlin/runtime/auth/awssigning/AwsSigningAlgorithm;
 }

diff --git a/runtime/observability/telemetry-api/api/telemetry-api.api b/runtime/observability/telemetry-api/api/telemetry-api.api
@@ -61,6 +61,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/logging/LogLevel : java/l
 	public static final field Info Laws/smithy/kotlin/runtime/telemetry/logging/LogLevel;
 	public static final field Trace Laws/smithy/kotlin/runtime/telemetry/logging/LogLevel;
 	public static final field Warning Laws/smithy/kotlin/runtime/telemetry/logging/LogLevel;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/logging/LogLevel;
 	public static fun values ()[Laws/smithy/kotlin/runtime/telemetry/logging/LogLevel;
 }
@@ -194,6 +195,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/trace/SpanKind : java/lan
 	public static final field CLIENT Laws/smithy/kotlin/runtime/telemetry/trace/SpanKind;
 	public static final field INTERNAL Laws/smithy/kotlin/runtime/telemetry/trace/SpanKind;
 	public static final field SERVER Laws/smithy/kotlin/runtime/telemetry/trace/SpanKind;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/trace/SpanKind;
 	public static fun values ()[Laws/smithy/kotlin/runtime/telemetry/trace/SpanKind;
 }
@@ -202,6 +204,7 @@ public final class aws/smithy/kotlin/runtime/telemetry/trace/SpanStatus : java/l
 	public static final field ERROR Laws/smithy/kotlin/runtime/telemetry/trace/SpanStatus;
 	public static final field OK Laws/smithy/kotlin/runtime/telemetry/trace/SpanStatus;
 	public static final field UNSET Laws/smithy/kotlin/runtime/telemetry/trace/SpanStatus;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/telemetry/trace/SpanStatus;
 	public static fun values ()[Laws/smithy/kotlin/runtime/telemetry/trace/SpanStatus;
 }

diff --git a/runtime/protocol/http-client/api/http-client.api b/runtime/protocol/http-client/api/http-client.api
@@ -44,6 +44,7 @@ public final class aws/smithy/kotlin/runtime/http/engine/AlpnId : java/lang/Enum
 	public static final field HTTP1_1 Laws/smithy/kotlin/runtime/http/engine/AlpnId;
 	public static final field HTTP2 Laws/smithy/kotlin/runtime/http/engine/AlpnId;
 	public static final field HTTP3 Laws/smithy/kotlin/runtime/http/engine/AlpnId;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public final fun getProtocolId ()Ljava/lang/String;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/http/engine/AlpnId;
 	public static fun values ()[Laws/smithy/kotlin/runtime/http/engine/AlpnId;

diff --git a/runtime/protocol/http/api/http.api b/runtime/protocol/http/api/http.api
@@ -111,6 +111,7 @@ public final class aws/smithy/kotlin/runtime/http/HttpErrorCode : java/lang/Enum
 	public static final field SOCKET_TIMEOUT Laws/smithy/kotlin/runtime/http/HttpErrorCode;
 	public static final field TLS_NEGOTIATION_ERROR Laws/smithy/kotlin/runtime/http/HttpErrorCode;
 	public static final field TLS_NEGOTIATION_TIMEOUT Laws/smithy/kotlin/runtime/http/HttpErrorCode;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/http/HttpErrorCode;
 	public static fun values ()[Laws/smithy/kotlin/runtime/http/HttpErrorCode;
 }
@@ -135,6 +136,7 @@ public final class aws/smithy/kotlin/runtime/http/HttpMethod : java/lang/Enum {
 	public static final field PATCH Laws/smithy/kotlin/runtime/http/HttpMethod;
 	public static final field POST Laws/smithy/kotlin/runtime/http/HttpMethod;
 	public static final field PUT Laws/smithy/kotlin/runtime/http/HttpMethod;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/http/HttpMethod;
 	public static fun values ()[Laws/smithy/kotlin/runtime/http/HttpMethod;
 }
@@ -168,6 +170,7 @@ public final class aws/smithy/kotlin/runtime/http/HttpStatusCode$Category : java
 	public synthetic fun contains (Ljava/lang/Comparable;)Z
 	public synthetic fun getEndInclusive ()Ljava/lang/Comparable;
 	public fun getEndInclusive ()Ljava/lang/Integer;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public synthetic fun getStart ()Ljava/lang/Comparable;
 	public fun getStart ()Ljava/lang/Integer;
 	public fun isEmpty ()Z

diff --git a/runtime/runtime-core/api/runtime-core.api b/runtime/runtime-core/api/runtime-core.api
@@ -65,6 +65,7 @@ public final class aws/smithy/kotlin/runtime/ServiceException$ErrorType : java/l
 	public static final field Client Laws/smithy/kotlin/runtime/ServiceException$ErrorType;
 	public static final field Server Laws/smithy/kotlin/runtime/ServiceException$ErrorType;
 	public static final field Unknown Laws/smithy/kotlin/runtime/ServiceException$ErrorType;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/ServiceException$ErrorType;
 	public static fun values ()[Laws/smithy/kotlin/runtime/ServiceException$ErrorType;
 }
@@ -77,6 +78,7 @@ public final class aws/smithy/kotlin/runtime/config/TlsVersion : java/lang/Enum
 	public static final field TLS_1_1 Laws/smithy/kotlin/runtime/config/TlsVersion;
 	public static final field TLS_1_2 Laws/smithy/kotlin/runtime/config/TlsVersion;
 	public static final field TLS_1_3 Laws/smithy/kotlin/runtime/config/TlsVersion;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/config/TlsVersion;
 	public static fun values ()[Laws/smithy/kotlin/runtime/config/TlsVersion;
 }
@@ -1195,6 +1197,7 @@ public final class aws/smithy/kotlin/runtime/retries/policy/RetryErrorType : jav
 	public static final field ServerSide Laws/smithy/kotlin/runtime/retries/policy/RetryErrorType;
 	public static final field Throttling Laws/smithy/kotlin/runtime/retries/policy/RetryErrorType;
 	public static final field Transient Laws/smithy/kotlin/runtime/retries/policy/RetryErrorType;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/retries/policy/RetryErrorType;
 	public static fun values ()[Laws/smithy/kotlin/runtime/retries/policy/RetryErrorType;
 }
@@ -1274,6 +1277,7 @@ public final class aws/smithy/kotlin/runtime/time/TimestampFormat : java/lang/En
 	public static final field ISO_8601_CONDENSED Laws/smithy/kotlin/runtime/time/TimestampFormat;
 	public static final field ISO_8601_CONDENSED_DATE Laws/smithy/kotlin/runtime/time/TimestampFormat;
 	public static final field RFC_5322 Laws/smithy/kotlin/runtime/time/TimestampFormat;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/time/TimestampFormat;
 	public static fun values ()[Laws/smithy/kotlin/runtime/time/TimestampFormat;
 }
@@ -1394,6 +1398,7 @@ public final class aws/smithy/kotlin/runtime/util/OsFamily : java/lang/Enum {
 	public static final field MacOs Laws/smithy/kotlin/runtime/util/OsFamily;
 	public static final field Unknown Laws/smithy/kotlin/runtime/util/OsFamily;
 	public static final field Windows Laws/smithy/kotlin/runtime/util/OsFamily;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public fun toString ()Ljava/lang/String;
 	public static fun valueOf (Ljava/lang/String;)Laws/smithy/kotlin/runtime/util/OsFamily;
 	public static fun values ()[Laws/smithy/kotlin/runtime/util/OsFamily;