Use linux code for linux/macos/mingw targets

oshai · Sep 11, 2020 · f27469e · f27469e
1 parent d51e868
commit f27469e
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 0 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -60,6 +60,8 @@ kotlin {
         //nodejs()
     }
     linuxX64("linuxX64")
+    macosX64("macosX64")
+    mingwX64("mingwX64")
     sourceSets {
         val commonMain by getting {}
         val commonTest by getting  {
@@ -90,6 +92,18 @@ kotlin {
                 implementation(kotlin("test-js"))
             }
         }
+        val nativeMain by creating {
+            dependsOn(commonMain)
+        }
+        val linuxX64Main by getting {
+            dependsOn(nativeMain)
+        }
+        val mingwX64Main by getting {
+            dependsOn(nativeMain)
+        }
+        val macosX64Main by getting {
+            dependsOn(nativeMain)
+        }
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+kotlin.mpp.enableGranularSourceSetsMetadata=true
diff --git a/src/linuxX64Main/kotlin/mu/Appender.kt → src/nativeMain/kotlin/mu/Appender.kt b/src/linuxX64Main/kotlin/mu/Appender.kt → src/nativeMain/kotlin/mu/Appender.kt
diff --git a/...64Main/kotlin/mu/ConsoleOutputAppender.kt → ...veMain/kotlin/mu/ConsoleOutputAppender.kt b/...64Main/kotlin/mu/ConsoleOutputAppender.kt → ...veMain/kotlin/mu/ConsoleOutputAppender.kt
diff --git a/...Main/kotlin/mu/DefaultMessageFormatter.kt → ...Main/kotlin/mu/DefaultMessageFormatter.kt b/...Main/kotlin/mu/DefaultMessageFormatter.kt → ...Main/kotlin/mu/DefaultMessageFormatter.kt
diff --git a/src/linuxX64Main/kotlin/mu/Formatter.kt → src/nativeMain/kotlin/mu/Formatter.kt b/src/linuxX64Main/kotlin/mu/Formatter.kt → src/nativeMain/kotlin/mu/Formatter.kt
diff --git a/src/linuxX64Main/kotlin/mu/KLogger.kt → src/nativeMain/kotlin/mu/KLogger.kt b/src/linuxX64Main/kotlin/mu/KLogger.kt → src/nativeMain/kotlin/mu/KLogger.kt
diff --git a/src/linuxX64Main/kotlin/mu/KMarkerFactory.kt → src/nativeMain/kotlin/mu/KMarkerFactory.kt b/src/linuxX64Main/kotlin/mu/KMarkerFactory.kt → src/nativeMain/kotlin/mu/KMarkerFactory.kt
diff --git a/src/linuxX64Main/kotlin/mu/KotlinLogging.kt → src/nativeMain/kotlin/mu/KotlinLogging.kt b/src/linuxX64Main/kotlin/mu/KotlinLogging.kt → src/nativeMain/kotlin/mu/KotlinLogging.kt
diff --git a/...n/kotlin/mu/KotlinLoggingConfiguration.kt → ...n/kotlin/mu/KotlinLoggingConfiguration.kt b/...n/kotlin/mu/KotlinLoggingConfiguration.kt → ...n/kotlin/mu/KotlinLoggingConfiguration.kt
diff --git a/...uxX64Main/kotlin/mu/KotlinLoggingLevel.kt → ...ativeMain/kotlin/mu/KotlinLoggingLevel.kt b/...uxX64Main/kotlin/mu/KotlinLoggingLevel.kt → ...ativeMain/kotlin/mu/KotlinLoggingLevel.kt
diff --git a/src/linuxX64Main/kotlin/mu/Marker.kt → src/nativeMain/kotlin/mu/Marker.kt b/src/linuxX64Main/kotlin/mu/Marker.kt → src/nativeMain/kotlin/mu/Marker.kt
diff --git a/...64Main/kotlin/mu/internal/KLoggerLinux.kt → ...veMain/kotlin/mu/internal/KLoggerLinux.kt b/...64Main/kotlin/mu/internal/KLoggerLinux.kt → ...veMain/kotlin/mu/internal/KLoggerLinux.kt
diff --git a/...X64Main/kotlin/mu/internal/MarkerLinux.kt → ...iveMain/kotlin/mu/internal/MarkerLinux.kt b/...X64Main/kotlin/mu/internal/MarkerLinux.kt → ...iveMain/kotlin/mu/internal/MarkerLinux.kt