Add multi-compile support to test dependencies.

touchlab · Aug 6, 2024 · 81725fa · 81725fa
1 parent 07b4435
commit 81725fa
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/MultiCompileTarget.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/MultiCompileTarget.kt
@@ -169,24 +169,35 @@ data class MultiCompileTarget(
             },
         )
 
-        val allDarwin = listOf(
+        val allIos = listOf(
             iosArm32,
             iosArm64,
             iosX64,
             iosSimulatorArm64,
+        )
+
+        val allWatchos = listOf(
             watchosArm32,
             watchosArm64,
             watchosX86,
             watchosX64,
             watchosSimulatorArm64,
             watchosDeviceArm64,
+        )
+
+        val allTvos = listOf(
             tvosArm64,
             tvosX64,
             tvosSimulatorArm64,
+        )
+
+        val allMacos = listOf(
             macosX64,
             macosArm64,
         )
 
+        val allDarwin = allIos + allWatchos + allTvos + allMacos
+
         val all = allDarwin + listOf(
             jvm,
             js,

diff --git a/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieMultiCompileRuntime.kt b/build-setup/src/main/kotlin/co/touchlab/skie/buildsetup/plugins/SkieMultiCompileRuntime.kt
@@ -1,5 +1,6 @@
 package co.touchlab.skie.buildsetup.plugins
 
+import co.touchlab.skie.buildsetup.plugins.MultiCompileTarget.Companion.kotlin_1_9_0
 import co.touchlab.skie.buildsetup.tasks.BuildNestedGradle
 import co.touchlab.skie.gradle.KotlinCompilerVersion
 import co.touchlab.skie.gradle.KotlinToolingVersion
@@ -55,6 +56,7 @@ class SkieMultiCompileRuntime: Plugin<Project> {
                 val buildTask = registerBuildTask(
                     name = kotlinToolingVersion.primaryVersion.toString(),
                     supportedTargetsWithDeclarations = supportedTargetsWithDeclarations,
+                    kotlinVersion = kotlinToolingVersion.primaryVersion,
                     copyTask = copyTask,
                 )
 
@@ -176,6 +178,7 @@ class SkieMultiCompileRuntime: Plugin<Project> {
 
     private fun Project.registerBuildTask(
         name: String,
+        kotlinVersion: KotlinToolingVersion,
         supportedTargetsWithDeclarations: SupportedTargetsWithDeclarations,
         copyTask: TaskProvider<Copy>,
     ): TaskProvider<BuildNestedGradle> {
@@ -188,14 +191,20 @@ class SkieMultiCompileRuntime: Plugin<Project> {
 
             tasks.set(
                 supportedTargetsWithDeclarations.flatMap { (target, _) ->
-                    listOf(
-                        "generateMetadataFileFor${target.capitalizedName}Publication",
-                        "generatePomFileFor${target.capitalizedName}Publication",
-                    )
-                } + listOf(
-                    "generateMetadataFileForKotlinMultiplatformPublication",
-                    "generatePomFileForKotlinMultiplatformPublication",
-                )
+                    when (target.platformType) {
+                        KotlinPlatformType.common -> listOf("metadataMainClasses")
+                        KotlinPlatformType.jvm, KotlinPlatformType.androidJvm -> listOf("${target.name}Jar")
+                        KotlinPlatformType.js -> if (kotlinVersion >= kotlin_1_9_0) {
+                            listOf("${target.name}Jar")
+                        } else {
+                            listOf(
+                                "${target.name}IrJar",
+                                "${target.name}LegacyJar",
+                            )
+                        }
+                        KotlinPlatformType.native, KotlinPlatformType.wasm -> listOf("${target.name}MainKlibrary")
+                    }
+                }
             )
         }
     }