Fix KMP builds

Author: lauzadis

hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts

@@ -6,8 +6,8 @@
 import aws.sdk.kotlin.gradle.kmp.NATIVE_ENABLED
 import com.amazonaws.services.dynamodbv2.local.main.ServerRunner
 import com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer
+import com.google.devtools.ksp.gradle.KspAATask
 import com.google.devtools.ksp.gradle.KspTaskJvm
-import com.google.devtools.ksp.gradle.KspTaskMetadata
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
@@ -67,16 +67,39 @@ ksp {
 }
 
 if (project.NATIVE_ENABLED) {
-    // Configure KSP for commonMain source generation; https://github.com/google/ksp/issues/963#issuecomment-1894144639
+    // Configure KSP for multiplatform: https://kotlinlang.org/docs/ksp-multiplatform.html
+    // https://github.com/google/ksp/issues/963#issuecomment-1894144639
+    dependencies {
+        add("kspCommonMainMetadata", project(":hll:dynamodb-mapper:dynamodb-mapper-ops-codegen"))
+    }
 
-    dependencies.kspCommonMainMetadata(project(":hll:dynamodb-mapper:dynamodb-mapper-ops-codegen"))
+    tasks.withType<KotlinCompilationTask<*>>().all {
+        if(name != "kspCommonMainKotlinMetadata") {
+            dependsOn("kspCommonMainKotlinMetadata")
+        }
+    }
 
-    kotlin.sourceSets.commonMain {
-        tasks.withType<KspTaskMetadata> {
-            // Wire up the generated source to the commonMain source set
-            kotlin.srcDir(destinationDirectory)
+    tasks.withType<KspAATask>().configureEach {
+        if(name != "kspCommonMainKotlinMetadata") {
+            dependsOn("kspCommonMainKotlinMetadata")
         }
     }
+
+    tasks.named("sourcesJar") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+
+    tasks.named("linuxX64SourcesJar") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+
+    tasks.named("jvmSourcesJar") {
+        dependsOn("kspCommonMainKotlinMetadata")
+    }
+
+    kotlin.sourceSets.commonMain {
+        kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
+    }
 } else {
     // FIXME This is a dirty hack for JVM-only builds which KSP doesn't consider to be "multiplatform". Explanation of
     //  hack follows in narrative, minimally-opinionated comments.

hll/dynamodb-mapper/dynamodb-mapper/common/src/aws/sdk/kotlin/hll/dynamodbmapper/values/scalars/TextConverters.kt

@@ -18,7 +18,7 @@ public object TextConverters {
     /**
      * Converts between [CharArray] and [String]
      */
-    public val CharArrayToStringConverter: Converter<CharArray, String> = Converter(::String, String::toCharArray)
+    public val CharArrayToStringConverter: Converter<CharArray, String> = Converter(CharArray::concatToString, String::toCharArray)
 
     /**
      * Converts between [Char] and [String]

hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/expressions/KeyFilterTest.kt

@@ -10,9 +10,9 @@ import aws.sdk.kotlin.hll.dynamodbmapper.items.ItemConverter
 import aws.sdk.kotlin.hll.dynamodbmapper.items.ItemSchema
 import aws.sdk.kotlin.hll.dynamodbmapper.items.KeySpec
 import aws.sdk.kotlin.hll.dynamodbmapper.model.Item
-import org.junit.jupiter.api.assertThrows
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 
 class KeyFilterTest {
     private val singleKeySchema = ItemSchema(DummyConverter, KeySpec.String("primary"))
@@ -31,7 +31,7 @@ class KeyFilterTest {
     fun testSingleKeySchemaWithErroneousSortKey() {
         val kf = KeyFilter("foo") { sortKey eq 2 }
 
-        assertThrows<IllegalArgumentException> {
+        assertFailsWith<IllegalArgumentException> {
             kf.toExpression(singleKeySchema)
         }
     }

hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/values/ValueConvertersTest.kt

@@ -7,6 +7,7 @@ package aws.sdk.kotlin.hll.dynamodbmapper.values
 import aws.sdk.kotlin.hll.dynamodbmapper.util.attr
 import aws.sdk.kotlin.hll.dynamodbmapper.util.dynamicAttr
 import aws.sdk.kotlin.services.dynamodb.model.AttributeValue
+import kotlin.jvm.JvmName
 import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue

hll/dynamodb-mapper/dynamodb-mapper/common/test/aws/sdk/kotlin/hll/dynamodbmapper/values/scalars/ScalarConvertersTest.kt

@@ -18,7 +18,7 @@ class ScalarConvertersTest : ValueConvertersTest() {
     @Test
     fun testByteArrayConverter() = given(ByteArrayConverter) {
         byteArrayOf() inDdbIs theSame
-        "Foo".toByteArray() inDdbIs theSame
+        "Foo".encodeToByteArray() inDdbIs theSame
         ByteArray(1024) { it.toByte() } inDdbIs theSame
     }