and common linux source set, remove duplications

ktorio · May 12, 2023 · 70651e4 · 70651e4
1 parent 2e0895e
commit 70651e4
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 114 deletions.
diff --git a/buildSrc/src/main/kotlin/TargetsConfig.kt b/buildSrc/src/main/kotlin/TargetsConfig.kt
@@ -15,11 +15,12 @@ val Project.hasJvmAndNix: Boolean get() = hasCommon || files.any { it.name == "j
 val Project.hasPosix: Boolean get() = hasCommon || files.any { it.name == "posix" }
 val Project.hasDesktop: Boolean get() = hasPosix || files.any { it.name == "desktop" }
 val Project.hasNix: Boolean get() = hasPosix || hasJvmAndNix || files.any { it.name == "nix" }
+val Project.hasLinux: Boolean get() = hasNix || files.any { it.name == "linux" }
 val Project.hasDarwin: Boolean get() = hasNix || files.any { it.name == "darwin" }
 val Project.hasWindows: Boolean get() = hasPosix || files.any { it.name == "windows" }
 val Project.hasJs: Boolean get() = hasCommon || files.any { it.name == "js" }
 val Project.hasJvm: Boolean get() = hasCommon || hasJvmAndNix || files.any { it.name == "jvm" }
-val Project.hasNative: Boolean get() = hasCommon || hasNix || hasPosix || hasDarwin || hasDesktop || hasWindows
+val Project.hasNative: Boolean get() = hasCommon || hasNix || hasPosix || hasLinux || hasDarwin || hasDesktop || hasWindows
 
 fun Project.configureTargets() {
     configureCommon()
@@ -37,7 +38,7 @@ fun Project.configureTargets() {
             configureJs()
         }
 
-        if (hasPosix || hasDarwin || hasWindows) extra.set("hasNative", true)
+        if (hasPosix || hasLinux || hasDarwin || hasWindows) extra.set("hasNative", true)
 
         sourceSets {
             if (hasPosix) {
@@ -80,6 +81,11 @@ fun Project.configureTargets() {
                 }
             }
 
+            if (hasLinux) {
+                val linuxMain by creating
+                val linuxTest by creating
+            }
+
             if (hasWindows) {
                 val windowsMain by creating
                 val windowsTest by creating
@@ -186,6 +192,25 @@ fun Project.configureTargets() {
                 }
             }
 
+            if (hasLinux) {
+                val linuxMain by getting {
+                    findByName("nixMain")?.let { dependsOn(it) }
+                }
+
+                val linuxTest by getting {
+                    findByName("nixTest")?.let { dependsOn(it) }
+
+                    dependencies {
+                        implementation(kotlin("test"))
+                    }
+                }
+
+                linuxTargets().forEach {
+                    getByName("${it}Main").dependsOn(linuxMain)
+                    getByName("${it}Test").dependsOn(linuxTest)
+                }
+            }
+
             if (hasDesktop) {
                 val desktopMain by getting {
                     findByName("posixMain")?.let { dependsOn(it) }

diff --git a/...ktor/network/selector/SelectUtilsLinux.kt → ...ktor/network/selector/SelectUtilsLinux.kt b/...ktor/network/selector/SelectUtilsLinux.kt → ...ktor/network/selector/SelectUtilsLinux.kt
diff --git a/.../io/ktor/network/util/SocketUtilsLinux.kt → .../io/ktor/network/util/SocketUtilsLinux.kt b/.../io/ktor/network/util/SocketUtilsLinux.kt → .../io/ktor/network/util/SocketUtilsLinux.kt
diff --git a/...r/network/sockets/tests/TestUtilsLinux.kt → ...r/network/sockets/tests/TestUtilsLinux.kt b/...r/network/sockets/tests/TestUtilsLinux.kt → ...r/network/sockets/tests/TestUtilsLinux.kt
diff --git a/ktor-network/linuxX64/src/io/ktor/network/selector/SelectUtilsLinux.kt b/ktor-network/linuxX64/src/io/ktor/network/selector/SelectUtilsLinux.kt
diff --git a/ktor-network/linuxX64/src/io/ktor/network/util/SocketUtilsLinux.kt b/ktor-network/linuxX64/src/io/ktor/network/util/SocketUtilsLinux.kt
diff --git a/ktor-network/linuxX64/test/io/ktor/network/sockets/tests/TestUtilsLinux.kt b/ktor-network/linuxX64/test/io/ktor/network/sockets/tests/TestUtilsLinux.kt
diff --git a/...t-dispatcher/linuxX64/src/TestLinuxX64.kt → ktor-test-dispatcher/linux/src/TestLinux.kt b/...t-dispatcher/linuxX64/src/TestLinuxX64.kt → ktor-test-dispatcher/linux/src/TestLinux.kt
@@ -1,7 +1,6 @@
 package io.ktor.test.dispatcher
 
 import kotlinx.coroutines.*
-import platform.posix.*
 import kotlin.coroutines.*
 
 /**

diff --git a/ktor-test-dispatcher/linuxArm64/src/TestLinuxArm64.kt b/ktor-test-dispatcher/linuxArm64/src/TestLinuxArm64.kt
diff --git a/...Arm64/src/io/ktor/util/ThreadInfoLinux.kt → ...linux/src/io/ktor/util/ThreadInfoLinux.kt b/...Arm64/src/io/ktor/util/ThreadInfoLinux.kt → ...linux/src/io/ktor/util/ThreadInfoLinux.kt
diff --git a/ktor-utils/linuxX64/src/io/ktor/util/ThreadInfoLinux.kt b/ktor-utils/linuxX64/src/io/ktor/util/ThreadInfoLinux.kt