diff --git a/tools/DESKTOP_FEASIBILITY.md b/tools/DESKTOP_FEASIBILITY.md index 5944e4b..9eb9193 100644 --- a/tools/DESKTOP_FEASIBILITY.md +++ b/tools/DESKTOP_FEASIBILITY.md @@ -601,7 +601,52 @@ files — it cannot gate app opening (no desktop lock is wired; PIN gating is deferred); (c) the PBKDF2 recovery path costs ~55 ms per unlock here, so desktop may skip Android's async key handling for good. -**Next up: M4** — `composeApp` → Compose Multiplatform (plan §6). +**M4.1 — `:composeApp` in-place → Kotlin Multiplatform: DONE (build +shape).** Plan §6.1 step 1 attempted — and it holds: no `:ui-shared` +fallback needed so far. `kotlin("multiplatform")` with +`androidTarget()` + `jvm()`; every still-Android file moved +UNMODIFIED into `androidMain` (git recorded pure renames — the +Android behaviour diff is zero by construction), and `commonMain` +starts with only what compiles for both targets today (theme +Color/Type, PasswordPolicy, ReleaseNotes, LinkedShareComposer) behind +two expect/actual seams — `platformDynamicColorScheme` (Android +actual = the verbatim API-31 branch, JVM actual = null) and +`relativeTimestamp` (Android actual = `DateUtils` verbatim, JVM +actual = `java.time` approximation, English-only until follow-up). +Deferred with reasons in the build file: `:core:domain` converts +first in M4.2 (it is still `kotlin("jvm")`, so `NoteColors.kt` can't +be common yet); screens/ViewModels/`AppContainer` move with the M4.3 +container seam. + +New friction paid into §2/§3 on the way (all fixed in-tree): +`kotlinMultiplatform` must be registered at the ROOT `apply false` +like the other markers (sibling markers put KGP on the classpath — +the §2.5 kapt error again); KMP handlers need +`project.dependencies.platform(…)` for BOMs and no +`debugImplementation` accessor; `ColorScheme` is +`androidx.compose.material3.ColorScheme` (ships inside +material3-desktop — no extra artifact); AGP 8.7.2 > KGP-tested 8.5 +is warning-only. + +``` +./gradlew :composeApp:compileKotlinJvm BUILD SUCCESSFUL +./gradlew assembleDebug BUILD SUCCESSFUL (106 tasks) +./gradlew :core:data-jvm:smoke RESULT: M1a PASS +./gradlew :desktopApp:run … --self-test SELFTEST wrote note id=1 +git status core/**/objectbox-models clean — ID model file unchanged +``` + +Also this session: the full §1 verification gate re-ran green before +M4 began — including both M3 crypto legs (`leg-A ALL-OK`, `LEG-B +PASS` in separate processes). One leg-A teardown wedge reproduced +(documented environmental behaviour): every PASS line had flushed, +`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). +