misc: use commonized ksp config for ddb mapper (#1820)

Author: 0marperez

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ ksp-version = "2.3.4"
 
 dokka-version = "2.0.0"
 
-aws-kotlin-repo-tools-version = "0.5.6"
+aws-kotlin-repo-tools-version = "0.5.7"
 
 # libs
 coroutines-version = "1.10.2"

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

@@ -3,12 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import aws.sdk.kotlin.gradle.hll.configureKspCodegen
 import com.amazonaws.services.dynamodbv2.local.main.ServerRunner
 import com.amazonaws.services.dynamodbv2.local.server.DynamoDBProxyServer
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 import java.net.ServerSocket
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
 import kotlin.properties.Delegates
 
 description = "High level DynamoDbMapper client"
@@ -65,63 +63,7 @@ ksp {
     )
     arg("op-allowlist", allowlist.joinToString(";"))
 }
-// FIXME dynamodb-mapper native compilation never worked?
-// if (project.NATIVE_ENABLED) {
-//    // Configure KSP for multiplatform: https://kotlinlang.org/docs/ksp-multiplatform.html
-//    // https://github.com/google/ksp/issues/963#issuecomment-1894144639
-//    // https://github.com/google/ksp/issues/965
-//    dependencies.kspCommonMainMetadata(project(":hll:dynamodb-mapper:dynamodb-mapper-ops-codegen"))
-//
-//    kotlin.sourceSets.commonMain {
-//        // Wire up the generated source to the commonMain source set
-//        kotlin.srcDir("build/generated/ksp/metadata/commonMain/kotlin")
-//    }
-// }
-
-// 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.
-
-// Start by invoking the JVM-only KSP configuration
-dependencies.kspJvm(project(":hll:dynamodb-mapper:dynamodb-mapper-ops-codegen"))
-
-// Then we need to move the generated source from jvm to common
-val moveGenSrc by tasks.registering {
-    // Can't move src until the src is generated
-    dependsOn(tasks.named("kspKotlinJvm"))
-
-    // Detecting these paths programmatically is complex; just hardcode them
-    val srcDir = file("build/generated/ksp/jvm/jvmMain")
-    val destDir = file("build/generated/ksp/common/commonMain")
-
-    inputs.dir(srcDir)
-    outputs.dirs(srcDir, destDir)
-
-    doLast {
-        if (destDir.exists()) {
-            // Clean out the existing destination, otherwise move fails
-            require(destDir.deleteRecursively()) { "Failed to delete $destDir before moving from $srcDir" }
-        } else {
-            // Create the destination directories, otherwise move fails
-            require(destDir.mkdirs()) { "Failed to create path $destDir" }
-        }
-
-        Files.move(srcDir.toPath(), destDir.toPath(), StandardCopyOption.REPLACE_EXISTING)
-    }
-}
-
-// Ensure all source jar tasks depend on the generated source move
-tasks.matching { it.name.endsWith("SourcesJar", ignoreCase = true) || it.name == "jvmProcessResources" }.configureEach {
-    dependsOn(moveGenSrc)
-}
-
-tasks.withType<KotlinCompilationTask<*>> {
-    dependsOn(moveGenSrc)
-}
-
-// Finally, wire up the generated source to the commonMain source set
-kotlin.sourceSets.commonMain {
-    kotlin.srcDir("build/generated/ksp/common/commonMain/kotlin")
-}
+configureKspCodegen(listOf(":hll:dynamodb-mapper:dynamodb-mapper-ops-codegen"))
 
 open class DynamoDbLocalInstance : DefaultTask() {
     private var port: Int by Delegates.notNull()