Fix merge

Author: lauzadis

aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/credentials/StaticCredentialsProviderNative.kt

@@ -12,7 +12,7 @@ public actual class StaticCredentialsProvider internal actual constructor(builde
     private val credentials = Credentials(builder.accessKeyId!!, builder.secretAccessKey!!, builder.sessionToken)
 
     public actual companion object {}
-    override suspend fun getCredentials(): Credentials = credentials
-    override fun close() { }
-    override suspend fun waitForShutdown() { }
+    actual override suspend fun getCredentials(): Credentials = credentials
+    actual override fun close() { }
+    actual override suspend fun waitForShutdown() { }
 }

aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/auth/signing/AwsSignerNative.kt

@@ -166,6 +166,7 @@ private fun CPointer<aws_signing_result>.getSignature(): ByteArray {
 private fun AwsSigningAlgorithm.toNativeSigningAlgorithm(): aws_signing_algorithm = when (this) {
     AwsSigningAlgorithm.SIGV4 -> aws_signing_algorithm.AWS_SIGNING_ALGORITHM_V4
     AwsSigningAlgorithm.SIGV4_ASYMMETRIC -> aws_signing_algorithm.AWS_SIGNING_ALGORITHM_V4_ASYMMETRIC
+    AwsSigningAlgorithm.SIGV4_S3EXPRESS -> aws_signing_algorithm.AWS_SIGNING_ALGORITHM_V4_S3EXPRESS
 }
 
 private fun AwsSignatureType.toNativeSignatureType(): aws_signature_type = when (this) {

aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/http/HttpClientConnectionManagerNative.kt

@@ -146,11 +146,11 @@ public actual class HttpClientConnectionManager actual constructor(
         ) { "aws_http_connection_manager_release_connection()" }
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         shutdownComplete.receiveCatching().getOrNull()
     }
 
-    override fun close() {
+    actual override fun close() {
         aws_http_connection_manager_release(manager)
     }
 }

aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/ClientBootstrapNative.kt

@@ -37,11 +37,11 @@ public actual class ClientBootstrap actual constructor(
         }
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         shutdownCompleteChannel.receive()
     }
 
-    override fun close() {
+    actual override fun close() {
         aws_client_bootstrap_release(ptr)
     }
 }

aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/EventLoopGroupNative.kt

@@ -39,11 +39,11 @@ public actual class EventLoopGroup actual constructor(maxThreads: Int) : NativeH
         }
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         shutdownCompleteChannel.receive()
     }
 
-    override fun close() {
+    actual override fun close() {
         aws_event_loop_group_release(ptr)
     }
 }

aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/HostResolverNative.kt

@@ -40,11 +40,11 @@ public actual class HostResolver actual constructor(elg: EventLoopGroup, maxEntr
         }
     }
 
-    override suspend fun waitForShutdown() {
+    actual override suspend fun waitForShutdown() {
         shutdownCompleteChannel.receive()
     }
 
-    override fun close() {
+    actual override fun close() {
         aws_host_resolver_release(ptr)
     }
 }

aws-crt-kotlin/native/src/aws/sdk/kotlin/crt/io/TlsContextNative.kt

@@ -105,7 +105,7 @@ public actual class TlsContext actual constructor(options: TlsContextOptions?) :
         }
     }
 
-    override fun close() {
+    actual override fun close() {
         aws_tls_ctx_release(ptr)
         aws_tls_ctx_options_clean_up(tlsCtxOpts.ptr)
         Allocator.Default.free(tlsCtxOpts.rawPtr)

gradle/libs.versions.toml

@@ -13,9 +13,11 @@ kotest-version = "5.8.0"
 mock-server-version = "5.15.0"
 # fixme - remove in favor of clikt
 kotlinx-cli-version = "0.3.6"
+kotlinx-io-version = "0.3.1"
 
 
 [libraries]
+aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }
 crt-java = { module = "software.amazon.awssdk.crt:aws-crt", version.ref = "crt-java-version" }
 
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"}
@@ -29,6 +31,7 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-version" }
 kotlinx-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines-version" }
 kotlinx-cli = { module = "org.jetbrains.kotlinx:kotlinx-cli", version.ref = "kotlinx-cli-version" }
+kotlinx-io = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io-version"}
 
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-version" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-version" }