Merge pull request #393 from thisisthepy/feat/compose-kn-desktop-targets

Compose host: add macosArm64 and linuxX64 Kotlin/Native desktop targets (#191 Phase B)

Author: b-re-w

.github/workflows/desktop.yml

@@ -76,6 +76,11 @@ jobs:
       - name: Run Linux x86_64 Kotlin/Native Tests
         run: ./gradlew :python-multiplatform:linuxX64Test --rerun --console=plain
 
+      # The Compose host's linuxX64 target (#386): compiled here, since only the fork publishes the
+      # Compose UI klibs for linuxX64.
+      - name: Compile the Compose host for Linux x86_64 Kotlin/Native
+        run: ./gradlew :python-multiplatform-compose:compileKotlinLinuxX64 --rerun --console=plain
+
   # The dev agent's protocol on the other desktop OSes (#238). Its socket options differ per platform
   # (SO_EXCLUSIVEADDRUSE on Windows, SO_REUSEADDR on POSIX), and the port-takeover and restart tests are
   # what check them. Stdlib only: no JDK, no Gradle.

docs/SPEC.md

@@ -542,7 +542,10 @@ All in `PM/commonTest`, so they run wherever the interpreter loads.
   the next frame with no host call; Python callables a root passed into composables are released when
   that root is replaced or the composition is disposed. The entry point names no library.
   `Status: implemented` on desktop, `python-multiplatform-compose/fixtures/compose/.../PythonAppViewRenderTest.kt`; the module
-  compiles for Android, nothing runs there yet.
+  compiles for Android, nothing runs there yet. It also compiles for the Kotlin/Native desktop targets
+  `macosArm64` and `linuxX64` (#386, `commonMain -> desktopNativeMain -> {macosArm64Main, linuxX64Main}`;
+  `linuxX64` exists only on the fork, upstream Compose publishes no `ui` klib for it); nothing runs there yet
+  (#191 Phase B: the klib walker and a K/N app).
 - **B-9** A Python root keeps state across the recreation of its composition with
   `python.multiplatform.compose.rememberSaveableWrapper(initial)` (the pycomposeui function of that name),
   callable from Python inside a composition. A Python `int` (32 bit) becomes `rememberSaveable { mutableIntStateOf }`,

gradle.properties

@@ -21,6 +21,8 @@ kotlin.native.binary.sourceInfoType=libbacktrace
 #Compose
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.jetbrains.compose.experimental.uikit.enabled=true
+# Compose gates its macosArm64 target behind this flag; :python-multiplatform-compose has it since #386.
+org.jetbrains.compose.experimental.macos.enabled=true
 # org.thisisthepy.compose:compose-gradle-plugin:1.11.1-ext.3's Maven Central POM marks
 # hot-reload-gradle-plugin as optional (shadow configuration), so Gradle does not place it on the
 # plugin classpath unless disabled or declared separately.

python-multiplatform-compose/build.gradle.kts

@@ -7,8 +7,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
  * composable.
  *
  * A separate module so that `:python-multiplatform` itself never depends on Compose (same naming as
- * `-ksp` and `-gradle-plugin`). JVM targets first -- desktop and Android share the code, which is all
- * in `commonMain`; iOS and wasm come later.
+ * `-ksp` and `-gradle-plugin`). Desktop JVM, Android and Kotlin/Native desktop (macosArm64, linuxX64)
+ * share the code, which is all in `commonMain`; iOS and wasm come later.
  */
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -35,13 +35,26 @@ kotlin {
         }
     }
 
+    // Kotlin/Native desktop (#191 Phase B, #386), the targets `:python-multiplatform` has since #370.
+    // Upstream JetBrains Compose publishes no `ui` klib for linuxX64; the fork this repository builds
+    // on publishes `runtime`, `runtime-saveable` and `ui` for both targets.
+    macosArm64()
+    linuxX64()
+
     sourceSets {
         commonMain.dependencies {
             api(projects.pythonMultiplatform)
             api(compose.runtime)
             api(compose.ui)
             api(compose.runtimeSaveable)
         }
+        // Same shape as the library's: commonMain -> desktopNativeMain -> {macosArm64Main, linuxX64Main}.
+        // Empty today (the host is all commonMain); it is where K/N-desktop-only host code goes.
+        val desktopNativeMain by creating {
+            dependsOn(commonMain.get())
+        }
+        getByName("macosArm64Main").dependsOn(desktopNativeMain)
+        getByName("linuxX64Main").dependsOn(desktopNativeMain)
     }
 }