misc: Upgrade to Kotlin 2.0.0 (#107)

lauzadis · web-flow · commit a960459344e7 · 2024-07-25T15:38:14.000-04:00
diff --git a/.brazil.json b/.brazil.json
@@ -1,14 +1,18 @@
 {
   "dependencies": {
+    "org.jetbrains.kotlin:kotlin-stdlib-common:2.0.*": "KotlinStdlibCommon-2.x",
+    "org.jetbrains.kotlin:kotlin-stdlib:2.0.*": "KotlinStdlib-2.x",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.*": "KotlinxCoroutinesCoreJvm-1.8.x",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.*": "KotlinxCoroutinesCore-1.8.x",
+    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.*": "KotlinxCoroutinesJdk8-1.8.x",
+    "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x",
+
     "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.*": "KotlinStdlibCommon-1.9.x",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.*": "KotlinStdlibJdk8-1.9.x",
     "org.jetbrains.kotlin:kotlin-stdlib:1.9.*": "KotlinStdlib-1.9.x",
-    "org.jetbrains.kotlinx:atomicfu-jvm:0.23.1": "AtomicfuJvm-0.23.1",
-    "org.jetbrains.kotlinx:atomicfu:0.23.1": "Atomicfu-0.23.1",
     "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.*": "KotlinxCoroutinesCoreJvm-1.7.x",
     "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.*": "KotlinxCoroutinesCore-1.7.x",
-    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": "KotlinxCoroutinesJdk8-1.7.x",
-    "software.amazon.awssdk.crt:aws-crt:0.*": "Aws-crt-java-1.0.x"
+    "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.*": "KotlinxCoroutinesJdk8-1.7.x"
   },
   "packageHandlingRules": {
     "versioning": {
diff --git a/.changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json b/.changes/9f0978c5-7652-4cef-9d03-6aab441c1d8d.json
@@ -0,0 +1,5 @@
+{
+    "id": "9f0978c5-7652-4cef-9d03-6aab441c1d8d",
+    "type": "misc",
+    "description": "Upgrade to Kotlin 2.0.0"
+}
diff --git a/aws-crt-kotlin/api/aws-crt-kotlin.api b/aws-crt-kotlin/api/aws-crt-kotlin.api
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProvider.kt
@@ -18,7 +18,11 @@ package aws.sdk.kotlin.crt.auth.credentials
  * @return the newly-constructed credentials provider
  */
 public expect class CachedCredentialsProvider internal constructor(builder: CachedCredentialsProviderBuilder) : CredentialsProvider {
-    public companion object
+    public companion object { }
+
+    override fun close()
+    override suspend fun getCredentials(): Credentials
+    override suspend fun waitForShutdown()
 }
 
 public class CachedCredentialsProviderBuilder {
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProvider.kt
@@ -24,7 +24,11 @@ import aws.sdk.kotlin.crt.io.ClientBootstrap
  */
 public expect class DefaultChainCredentialsProvider internal constructor(builder: DefaultChainCredentialsProviderBuilder) : CredentialsProvider {
 
-    public companion object
+    public companion object { }
+
+    override fun close()
+    override suspend fun getCredentials(): Credentials
+    override suspend fun waitForShutdown()
 }
 
 public class DefaultChainCredentialsProviderBuilder {
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProvider.kt
@@ -15,7 +15,11 @@ public expect class EcsCredentialsProvider
 internal constructor(
     builder: EcsCredentialsProviderBuilder,
 ) : CredentialsProvider {
-    public companion object
+    public companion object { }
+
+    override fun close()
+    override suspend fun getCredentials(): Credentials
+    override suspend fun waitForShutdown()
 }
 
 public class EcsCredentialsProviderBuilder {
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProvider.kt
@@ -15,7 +15,11 @@ public expect class ProfileCredentialsProvider
 internal constructor(
     builder: ProfileCredentialsProviderBuilder,
 ) : CredentialsProvider {
-    public companion object
+    public companion object { }
+
+    override fun close()
+    override suspend fun getCredentials(): Credentials
+    override suspend fun waitForShutdown()
 }
 
 public class ProfileCredentialsProviderBuilder {
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProvider.kt
@@ -9,7 +9,11 @@ package aws.sdk.kotlin.crt.auth.credentials
  * A credentials provider for a fixed set of credentials
  */
 public expect class StaticCredentialsProvider internal constructor(builder: StaticCredentialsProviderBuilder) : CredentialsProvider {
-    public companion object
+    public companion object { }
+
+    override fun close()
+    override suspend fun getCredentials(): Credentials
+    override suspend fun waitForShutdown()
 }
 
 public class StaticCredentialsProviderBuilder {
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProvider.kt
@@ -15,7 +15,11 @@ public expect class StsAssumeRoleCredentialsProvider
 internal constructor(
     builder: StsAssumeRoleCredentialsProviderBuilder,
 ) : CredentialsProvider {
-    public companion object
+    public companion object { }
+
+    override fun close()
+    override suspend fun getCredentials(): Credentials
+    override suspend fun waitForShutdown()
 }
 
 public class StsAssumeRoleCredentialsProviderBuilder {
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProvider.kt
@@ -16,7 +16,11 @@ public expect class StsWebIdentityCredentialsProvider
 internal constructor(
     builder: StsWebIdentityCredentialsProviderBuilder,
 ) : CredentialsProvider {
-    public companion object
+    public companion object { }
+
+    override fun close()
+    override suspend fun getCredentials(): Credentials
+    override suspend fun waitForShutdown()
 }
 
 public class StsWebIdentityCredentialsProviderBuilder {
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProvider.kt
@@ -15,7 +15,11 @@ import aws.sdk.kotlin.crt.io.TlsContext
  * @return the newly-constructed credentials provider
  */
 public expect class X509CredentialsProvider internal constructor(builder: X509CredentialsProviderBuilder) : CredentialsProvider {
-    public companion object
+    public companion object { }
+
+    override fun close()
+    override suspend fun getCredentials(): Credentials
+    override suspend fun waitForShutdown()
 }
 
 public class X509CredentialsProviderBuilder {
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManager.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManager.kt
@@ -34,4 +34,7 @@ public expect class HttpClientConnectionManager(options: HttpClientConnectionMan
      * @param conn Connection to release
      */
     public fun releaseConnection(conn: HttpClientConnection)
+
+    override fun close()
+    override suspend fun waitForShutdown()
 }
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/ClientBootstrap.kt
@@ -14,4 +14,7 @@ import aws.sdk.kotlin.crt.Closeable
  */
 public expect class ClientBootstrap(elg: EventLoopGroup, hr: HostResolver) :
     Closeable,
-    AsyncShutdown
+    AsyncShutdown {
+    override suspend fun waitForShutdown()
+    override fun close()
+}
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/EventLoopGroup.kt
@@ -18,4 +18,7 @@ import aws.sdk.kotlin.crt.Closeable
 */
 public expect class EventLoopGroup(maxThreads: Int = 1) :
     Closeable,
-    AsyncShutdown
+    AsyncShutdown {
+    override fun close()
+    override suspend fun waitForShutdown()
+}
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/HostResolver.kt
@@ -14,4 +14,6 @@ public expect class HostResolver(elg: EventLoopGroup, maxEntries: Int) :
     Closeable,
     AsyncShutdown {
     public constructor(elg: EventLoopGroup)
+    override fun close()
+    override suspend fun waitForShutdown()
 }
diff --git a/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsContext.kt b/aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsContext.kt
@@ -13,6 +13,7 @@ import aws.sdk.kotlin.crt.Closeable
  */
 public expect class TlsContext(options: TlsContextOptions? = null) : Closeable {
     public companion object {}
+    override fun close()
 }
 
 /**
diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerJVM.kt
@@ -53,11 +53,11 @@ public actual class HttpClientConnectionManager actual constructor(
         jniManager.releaseConnection(ktConn.jniConn)
     }
 
-    override fun close() {
+    actual override fun close() {
         jniManager.close()
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         jniManager.shutdownCompleteFuture.await()
     }
 }
diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/ClientBootstrapJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/ClientBootstrapJVM.kt
@@ -15,11 +15,11 @@ public actual class ClientBootstrap actual constructor(elg: EventLoopGroup, hr:
     AsyncShutdown {
     internal val jniBootstrap = ClientBootstrapJni(elg.jniElg, hr.jniHr)
 
-    override fun close() {
+    actual override fun close() {
         jniBootstrap.close()
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         jniBootstrap.shutdownCompleteFuture.await()
     }
 }
diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/EventLoopGroupJVM.kt
@@ -26,11 +26,11 @@ public actual class EventLoopGroup actual constructor(maxThreads: Int) :
     /**
      * Close this ELG
      */
-    override fun close() {
+    actual override fun close() {
         jniElg.close()
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         jniElg.shutdownCompleteFuture.await()
     }
 }
diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/HostResolverJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/HostResolverJVM.kt
@@ -16,11 +16,11 @@ public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntr
 
     public actual constructor(elg: EventLoopGroup) : this(elg, DEFAULT_MAX_ENTRIES)
 
-    override fun close() {
+    actual override fun close() {
         jniHr.close()
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         // TODO jni HostResolver is missing a shutdown complete future...
     }
 }
diff --git a/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/TlsContextJVM.kt b/aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/TlsContextJVM.kt
@@ -17,7 +17,7 @@ public actual class TlsContext actual constructor(options: TlsContextOptions?) :
     public actual companion object {
     }
 
-    override fun close() {
+    actual override fun close() {
         jniCtx.close()
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/CachedCredentialsProviderNative.kt
@@ -8,15 +8,15 @@ package aws.sdk.kotlin.crt.auth.credentials
 public actual class CachedCredentialsProvider internal actual constructor(builder: CachedCredentialsProviderBuilder) : CredentialsProvider {
     public actual companion object {}
 
-    override suspend fun getCredentials(): Credentials {
+    actual override suspend fun getCredentials(): Credentials {
         TODO("Not yet implemented")
     }
 
-    override fun close() {
+    actual override fun close() {
         TODO("Not yet implemented")
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         TODO("Not yet implemented")
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/DefaultChainCredentialsProviderNative.kt
@@ -8,15 +8,15 @@ package aws.sdk.kotlin.crt.auth.credentials
 public actual class DefaultChainCredentialsProvider internal actual constructor(builder: DefaultChainCredentialsProviderBuilder) : CredentialsProvider {
     public actual companion object {}
 
-    override suspend fun getCredentials(): Credentials {
+    actual override suspend fun getCredentials(): Credentials {
         TODO("Not yet implemented")
     }
 
-    override fun close() {
+    actual override fun close() {
         TODO("Not yet implemented")
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         TODO("Not yet implemented")
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/EcsCredentialsProviderNative.kt
@@ -11,15 +11,15 @@ internal actual constructor(
 ) : CredentialsProvider {
     public actual companion object {}
 
-    override suspend fun getCredentials(): Credentials {
+    actual override suspend fun getCredentials(): Credentials {
         TODO("Not yet implemented")
     }
 
-    override fun close() {
+    actual override fun close() {
         TODO("Not yet implemented")
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         TODO("Not yet implemented")
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/ProfileCredentialsProviderNative.kt
@@ -11,15 +11,15 @@ internal actual constructor(
 ) : CredentialsProvider {
     public actual companion object {}
 
-    override suspend fun getCredentials(): Credentials {
+    actual override suspend fun getCredentials(): Credentials {
         TODO("Not yet implemented")
     }
 
-    override fun close() {
+    actual override fun close() {
         TODO("Not yet implemented")
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         TODO("Not yet implemented")
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt
@@ -11,15 +11,15 @@ package aws.sdk.kotlin.crt.auth.credentials
 public actual class StaticCredentialsProvider internal actual constructor(builder: StaticCredentialsProviderBuilder) : CredentialsProvider {
     public actual companion object {}
 
-    override suspend fun getCredentials(): Credentials {
+    actual override suspend fun getCredentials(): Credentials {
         TODO("Not yet implemented")
     }
 
-    override fun close() {
+    actual override fun close() {
         TODO("Not yet implemented")
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         TODO("Not yet implemented")
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsAssumeRoleCredentialsProviderNative.kt
@@ -11,15 +11,15 @@ internal actual constructor(
 ) : CredentialsProvider {
     public actual companion object {}
 
-    override suspend fun getCredentials(): Credentials {
+    actual override suspend fun getCredentials(): Credentials {
         TODO("Not yet implemented")
     }
 
-    override fun close() {
+    actual override fun close() {
         TODO("Not yet implemented")
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         TODO("Not yet implemented")
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StsWebIdentityCredentialsProviderNative.kt
@@ -11,15 +11,15 @@ internal actual constructor(
 ) : CredentialsProvider {
     public actual companion object {}
 
-    override suspend fun getCredentials(): Credentials {
+    actual override suspend fun getCredentials(): Credentials {
         TODO("Not yet implemented")
     }
 
-    override fun close() {
+    actual override fun close() {
         TODO("Not yet implemented")
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         TODO("Not yet implemented")
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/X509CredentialsProviderNative.kt
@@ -9,15 +9,15 @@ public actual class X509CredentialsProvider internal actual constructor(builder:
 
     public actual companion object {}
 
-    override suspend fun getCredentials(): Credentials {
+    actual override suspend fun getCredentials(): Credentials {
         TODO("Not yet implemented")
     }
 
-    override fun close() {
+    actual override fun close() {
         TODO("Not yet implemented")
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         TODO("Not yet implemented")
     }
 }
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt
diff --git a/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt b/aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
