diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 8312348..b1144aa 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -18,9 +18,8 @@ // * jvmMain — the JVM actuals. Nothing else yet: :desktopApp keeps // its own stand-in UI until M4.5 consumes this target. // -// Note: :core:domain is still a plain kotlin("jvm") module, so -// commonMain cannot reference it yet — that is why NoteColors.kt stays -// in androidMain until :core:domain is converted in M4.2. +// Note: :core:domain converted to multiplatform in M4.2, so commonMain +// sees it — NoteColors.kt moved up with that commit. plugins { alias(libs.plugins.androidLibrary) diff --git a/tools/DESKTOP_FEASIBILITY.md b/tools/DESKTOP_FEASIBILITY.md index 9eb9193..5b0bab9 100644 --- a/tools/DESKTOP_FEASIBILITY.md +++ b/tools/DESKTOP_FEASIBILITY.md @@ -643,9 +643,33 @@ PASS` in separate processes). One leg-A teardown wedge reproduced `exitApplication` never arrived; killed, leg B verified the encrypted library intact and passed anyway. -**Next up: M4.2** — convert `:core:domain` to multiplatform (Phase-0 -recommendation #1, "convert first"), then `NoteColors.kt` joins -`commonMain`; continue expect/actual seams (§6.3 order). +**M4.2 — `:core:domain` → multiplatform: DONE.** Phase-0 +recommendation #1 ("convert it first; zero code changes") — the plain +`kotlin("jvm")` deploy was the gate blocking `commonMain` access. +`androidTarget()` + `jvm()`, sources moved untouched (pure renames), +coroutines `implementation → api` (Flow is in the public interfaces), +AGP plugin + namespace added, no manifest needed. Consumers unchanged +by design — plain-JVM (`:core:data-jvm`, `:desktopApp`) and AGP +(`:core:data`, `:app`) both resolve through variant metadata. +`NoteColors.kt` then became the first shared UI-layer file with a +domain dependency (`api(project(":core:domain"))` in composeApp +commonMain). + +``` +./gradlew assembleDebug :composeApp:compileKotlinJvm :core:data-jvm:smoke + BUILD SUCCESSFUL — RESULT: M1a PASS (one run, all consumers) +./gradlew :desktopApp:run … --self-test SELFTEST wrote note id=1 +``` + +**Next up: M4.3** — the container seam: an `AppGraph` interface in +`commonMain` (noteRepository, settings, cipher services, security +state) so the four ViewModels leave `IncidoApplication`/ +`AndroidViewModelFactory` behind (multiplatform lifecycle artifacts — +verify the set against Compose 1.7.3 first, §6.4), and +`DesktopContainer` can implement the same face. Clipboard +(`LocalClipboard` + `ClipEntry`) and image-decode +(`skia.Image.makeFromEncoded`) migrations ride along with the screens +that need them (§6.3).