temp: try fixing circular dependency

Author: lauzadis

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

@@ -69,69 +69,55 @@ ksp {
     arg("op-allowlist", allowlist.joinToString(";"))
 }
 
-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 {
-        tasks.withType<KspTaskMetadata> {
-            // Wire up the generated source to the commonMain source set
-            kotlin.srcDir(destinationDirectory)
-        }
-    }
-} 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.
-
-    // 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" }
-            }
+// 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.
 
-            Files.move(srcDir.toPath(), destDir.toPath(), StandardCopyOption.REPLACE_EXISTING)
-        }
-    }
+// 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)
 
-    listOf("jvmSourcesJar", "metadataSourcesJar", "jvmProcessResources").forEach {
-        tasks.named(it) {
-            dependsOn(moveGenSrc)
+    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)
     }
+}
 
-    tasks.withType<KotlinCompilationTask<*>> {
-        if (this !is KspTaskJvm) {
-            // Ensure that any **non-KSP** compile tasks depend on the generated src move
-            dependsOn(moveGenSrc)
-        }
+listOf("jvmSourcesJar", "metadataSourcesJar", "jvmProcessResources").forEach {
+    tasks.named(it) {
+        dependsOn(moveGenSrc)
     }
+}
 
-    // Finally, wire up the generated source to the commonMain source set
-    kotlin.sourceSets.commonMain {
-        kotlin.srcDir("build/generated/ksp/common/commonMain/kotlin")
+tasks.withType<KotlinCompilationTask<*>> {
+    if (this !is KspTaskJvm) {
+        // Ensure that any **non-KSP** compile tasks depend on the generated src move
+        dependsOn(moveGenSrc)
     }
 }
 
+// Finally, wire up the generated source to the commonMain source set
+kotlin.sourceSets.commonMain {
+    kotlin.srcDir("build/generated/ksp/common/commonMain/kotlin")
+}
+
 open class DynamoDbLocalInstance : DefaultTask() {
     private var port: Int by Delegates.notNull()