Actually build voice on Windows and fix KLib dump

kordlib · Apr 17, 2024 · 0796312 · 0796312
1 parent 3500c53
commit 0796312
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 44 deletions.
diff --git a/buildSrc/src/main/kotlin/Targets.kt b/buildSrc/src/main/kotlin/Targets.kt
@@ -1,24 +1,10 @@
+import org.gradle.api.tasks.TaskContainer
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
-import org.jetbrains.kotlin.gradle.kpm.external.project
 import org.jetbrains.kotlin.konan.target.HostManager
 
-@OptIn(ExternalVariantApi::class)
 fun KotlinMultiplatformExtension.targets() {
-    // There are issues with compiling the linux variant on windows
-    // Please use WSL if you need to work on the linux port
-    if (!HostManager.hostIsMingw) {
-        linuxX64()
-        linuxArm64()
-    }
-
     jvm()
 
-    if (project.name != "voice" && project.name != "core-voice") {
-        // https://youtrack.jetbrains.com/issue/KTOR-4080
-        mingwX64()
-    }
-
     js {
         nodejs {
             testTask {
@@ -32,6 +18,11 @@ fun KotlinMultiplatformExtension.targets() {
         useCommonJs()
     }
 
+    linuxX64()
+    linuxArm64()
+
+    mingwX64()
+
     macosArm64()
     macosX64()
 
@@ -52,3 +43,16 @@ fun KotlinMultiplatformExtension.targets() {
         }
     }
 }
+
+// There are issues with linking the linux variant on windows.
+// Please use WSL if you need to work on the linux port.
+fun TaskContainer.disableLinuxLinkTestTasksOnWindows() {
+    if (HostManager.hostIsMingw) {
+        val linuxLinkTestTasks = listOf("linkDebugTestLinuxX64", "linkDebugTestLinuxArm64")
+        for (task in linuxLinkTestTasks) {
+            named(task) {
+                enabled = false
+            }
+        }
+    }
+}
diff --git a/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/kord-multiplatform-module.gradle.kts
@@ -97,4 +97,6 @@ tasks {
         applyKordDokkaOptions()
         dependsOn("kspCommonMainKotlinMetadata")
     }
+
+    disableLinuxLinkTestTasksOnWindows()
 }
diff --git a/common/api/common.klib.api b/common/api/common.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true

diff --git a/core-voice/api/core-voice.klib.api b/core-voice/api/core-voice.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true

diff --git a/core/api/core.klib.api b/core/api/core.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true

diff --git a/core/live-tests/build.gradle.kts b/core/live-tests/build.gradle.kts
@@ -24,4 +24,5 @@ tasks {
     withType<Test>().configureEach {
         useJUnitPlatform()
     }
+    disableLinuxLinkTestTasksOnWindows()
 }
diff --git a/gateway/api/gateway.klib.api b/gateway/api/gateway.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true

diff --git a/rest/api/rest.klib.api b/rest/api/rest.klib.api
@@ -1,5 +1,5 @@
 // Klib ABI Dump
-// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
+// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64]
 // Rendering settings:
 // - Signature version: 2
 // - Show manifest properties: true

diff --git a/samples/build.gradle.kts b/samples/build.gradle.kts
@@ -1,6 +1,7 @@
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.konan.target.Family
+import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
     org.jetbrains.kotlin.multiplatform
@@ -59,3 +60,22 @@ kotlin {
         }
     }
 }
+
+tasks {
+    // There are issues with linking the linux variant on windows.
+    // Please use WSL if you need to work on the linux port.
+    /** see [disableLinuxLinkTestTasksOnWindows] */
+    if (HostManager.hostIsMingw) {
+        val linuxLinkExecutableTasks = listOf(
+            "linkDebugExecutableLinuxX64",
+            "linkDebugExecutableLinuxArm64",
+            "linkReleaseExecutableLinuxX64",
+            "linkReleaseExecutableLinuxArm64",
+        )
+        for (task in linuxLinkExecutableTasks) {
+            named(task) {
+                enabled = false
+            }
+        }
+    }
+}