Fix duplicatge symbols with gradle instead of manual copy-pasting (#226)

ajalt · Sep 3, 2024 · 9b7197c · 9b7197c
1 parent 32bcf0e
commit 9b7197c
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 324 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,13 @@ jobs:
           - os: ubuntu-latest
             EXTRA_GRADLE_ARGS: apiCheck :test:proguard:r8jar
           - os: macos-latest
-            EXTRA_GRADLE_ARGS: :mordant:compileKotlinMetadata
+            EXTRA_GRADLE_ARGS: >-
+              :mordant:compileNativeMainKotlinMetadata
+              :mordant:compilePosixMainKotlinMetadata
+              :mordant:compileAppleMainKotlinMetadata
+              :mordant:compileMacosMainKotlinMetadata
+              :mordant:compileWatchosMainKotlinMetadata
+              :mordant:compileTvosMainKotlinMetadata
     runs-on: ${{matrix.os}}
     steps:
       - uses: actions/checkout@v4

diff --git a/buildSrc/src/main/kotlin/mordant-native-conventions.gradle.kts b/buildSrc/src/main/kotlin/mordant-native-conventions.gradle.kts
@@ -8,6 +8,17 @@ kotlin {
     tvosX64()
     tvosArm64()
     tvosSimulatorArm64()
+    watchosArm32()
     watchosArm64()
     watchosX64()
+    watchosSimulatorArm64()
+
+    sourceSets {
+        for (target in listOf(
+            "tvosX64", "tvosArm64", "tvosSimulatorArm64",
+            "watchosArm32", "watchosArm64", "watchosX64", "watchosSimulatorArm64",
+        )) {
+            sourceSets.getByName(target + "Main").kotlin.srcDirs("src/posixSharedMain/kotlin")
+        }
+    }
 }
diff --git a/buildSrc/src/main/kotlin/mordant-native-core-conventions.gradle.kts b/buildSrc/src/main/kotlin/mordant-native-core-conventions.gradle.kts
@@ -15,12 +15,12 @@ kotlin {
 // Not all targets are supported by the markdown library
 //    tvosX64()
 //    tvosArm64()
-    tvosSimulatorArm64()
+//    tvosSimulatorArm64()
 //    watchosArm32()
 //    watchosArm64()
 //    watchosDeviceArm64()
 //    watchosX64()
-    watchosSimulatorArm64()
+//    watchosSimulatorArm64()
 
     applyDefaultHierarchyTemplate()
 
@@ -33,5 +33,15 @@ kotlin {
         for (target in listOf(iosMain, tvosMain, watchosMain)) {
             target.get().dependsOn(appleNonDesktopMain)
         }
+        // Kotlin 2.0 changed the way MPP is compiled, so instead of copying shared sources to each
+        // target, it compiles intermediate sources separately. That means that code that previously
+        // compiled is broken due to errors like "declaration is using numbers with different bit
+        // widths". So we copy the shared sources to each target manually.
+        for (target in listOf(
+            "linuxX64", "linuxArm64",
+            "macosX64", "macosArm64",
+        )) {
+            sourceSets.getByName(target + "Main").kotlin.srcDirs("src/posixSharedMain/kotlin")
+        }
     }
 }
diff --git a/mordant/src/linuxMain/kotlin/com/github/ajalt/mordant/internal/MppInternal.linux.kt b/mordant/src/linuxMain/kotlin/com/github/ajalt/mordant/internal/MppInternal.linux.kt
@@ -1,9 +1,3 @@
 package com.github.ajalt.mordant.internal
 
-import com.github.ajalt.mordant.terminal.TerminalInterface
-import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeCopyPasted
-
 internal actual fun testsHaveFileSystem(): Boolean = true
-internal actual fun getStandardTerminalInterface(): TerminalInterface {
-    return TerminalInterfaceNativeCopyPasted()
-}
diff --git a/...ant/src/macosArm64Main/kotlin/com/github/ajalt/mordant/internal/MppInternal.macosArm64.kt b/...ant/src/macosArm64Main/kotlin/com/github/ajalt/mordant/internal/MppInternal.macosArm64.kt
diff --git a/...om/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.native.macosArm64.kt b/...om/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.native.macosArm64.kt
diff --git a/mordant/src/macosX64Main/kotlin/com/github/ajalt/mordant/internal/MppInternal.macosX64.kt b/mordant/src/macosX64Main/kotlin/com/github/ajalt/mordant/internal/MppInternal.macosX64.kt
diff --git a/.../com/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.native.macosX64.kt b/.../com/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.native.macosX64.kt
diff --git a/...jalt/mordant/internal/MppInternal.tvos.kt → ...nternal/MppInternal.native.posixshared.kt b/...jalt/mordant/internal/MppInternal.tvos.kt → ...nternal/MppInternal.native.posixshared.kt
@@ -1,8 +1,8 @@
 package com.github.ajalt.mordant.internal
 
 import com.github.ajalt.mordant.terminal.TerminalInterface
-import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeCopyPasted
+import com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeShared
 
 internal actual fun getStandardTerminalInterface(): TerminalInterface {
-    return TerminalInterfaceNativeCopyPasted()
+    return TerminalInterfaceNativeShared()
 }
diff --git a/...terface/TerminalInterface.native.linux.kt → ...erface/TerminalInterface.native.shared.kt b/...terface/TerminalInterface.native.linux.kt → ...erface/TerminalInterface.native.shared.kt
@@ -8,7 +8,7 @@ import platform.posix.*
 // they have different bit widths for some fields, so the compileMetadata task fails if we don't use
 // separate files. Hopefully some day there will be solution that doesn't require copy-pasting.
 
-internal class TerminalInterfaceNativeCopyPasted : TerminalInterfaceNativePosix() {
+internal class TerminalInterfaceNativeShared : TerminalInterfaceNativePosix() {
     override val termiosConstants: TermiosConstants = TermiosConstants(
         VTIME = VTIME,
         VMIN = VMIN,

diff --git a/...tlin/com/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.native.tvos.kt b/...tlin/com/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.native.tvos.kt
diff --git a/mordant/src/watchosMain/kotlin/com/github/ajalt/mordant/internal/MppInternal.watchos.kt b/mordant/src/watchosMain/kotlin/com/github/ajalt/mordant/internal/MppInternal.watchos.kt