feat(phase-1/m4.1): :composeApp in-place → Kotlin Multiplatform (androidTarget + jvm)
Plan §6.1 step 1, the conservative shape: build converts, Android code
moves UNMODIFIED (git shows pure renames; behaviour diff = zero), and
commonMain starts with only the files that compile for both targets
today — theme Color/Type, PasswordPolicy, ReleaseNotes, LinkedShare-
Composer — behind two new expect/actual seams (justification per §9):
* platformDynamicColorScheme — Android actual keeps the pre-M4
Build.VERSION + dynamicColorScheme branch verbatim; JVM actual
returns null (desktop hides dynamic color, per M3's posture).
* relativeTimestamp — Android actual is DateUtils verbatim; JVM
actual is a java.time approximation of the same format (English-
only until M4 follow-up; desktop has no locale switch yet).
New friction found paying itself into §3/§2 (all fixed in-tree):
* kotlinMultiplatform must be registered at the ROOT with apply false
like the other Kotlin markers — sibling modules' markers put KGP on
the buildscript classpath and the subproject request then dies with
the kapt-style 'already on classpath with unknown version' (§2.5).
* KMP source-set dependency handlers: platform(libs.x) returns raw
notation, not a Dependency — use project.dependencies.platform(…);
debugImplementation is not on the handler (moved to a project-level
dependencies block); androidTestImplementation dropped (no tests).
* ColorScheme is androidx.compose.material3.ColorScheme, NOT
ui.graphics — desktop ships it inside material3-desktop, no extra
artifact needed.
* AGP 8.7.2 > KGP 2.0.21's tested max 8.5 — warning only, same as
the kapt modules; assembleDebug green.
Deliberate deferrals (documented in the build file): :core:domain is
still kotlin("jvm") so commonMain can't see it — NoteColors moves
when domain converts (M4.2, per the Phase-0 recommendation); screens,
ViewModels and AppContainer move with the container seam (M4.3).
Verified: ./gradlew :composeApp:compileKotlinJvm + assembleDebug +
:core:data-jvm:smoke (M1a PASS) + :desktopApp:run --self-test
(SELFTEST wrote note, clean exit) + git status clean over
core/**/objectbox-models (ID model file unchanged, invariant 2).
This commit is contained in:
1 parent
6b8db18cdf
commit
fef8f9c2e9
43 files changed
+229
-83
No files matched your search
+105
-52
@@ -1,16 +1,107 @@
|
||||
// composeApp — Android UI module hosting all screens, ViewModels, theme,
|
||||
// navigation, and the manual DI container. Regular Android Compose (not
|
||||
// Compose Multiplatform) is used in v0.1 to keep the build simple; the
|
||||
// migration path to Multiplatform in v0.2 is a module-level refactor.
|
||||
// composeApp — Incido's UI module: all screens, ViewModels, theme,
|
||||
// navigation, and the manual DI container.
|
||||
//
|
||||
// Phase 1 (M4.1): converted in place from `kotlin("android")` to
|
||||
// `kotlin("multiplatform")` with `androidTarget()` + `jvm()`, per the
|
||||
// order of attack in tools/DESKTOP_PHASE_PLAN.md §6.1. The split is
|
||||
// deliberately conservative — the goal of THIS step is the build shape:
|
||||
//
|
||||
// * commonMain — every file that compiles for both targets today
|
||||
// (theme Color/Type, PasswordPolicy, ReleaseNotes,
|
||||
// LinkedShareComposer) plus two expect/actual seams:
|
||||
// `platformDynamicColorScheme` and `relativeTimestamp`.
|
||||
// The Android actuals keep the pre-M4 code verbatim.
|
||||
// * androidMain — everything still touching `android.*` (screens,
|
||||
// ViewModels, AppContainer, security, backup IO, …),
|
||||
// moved UNMODIFIED. Zero behaviour change; the seams
|
||||
// for these move file-by-file in M4.2/M4.3.
|
||||
// * 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.
|
||||
|
||||
plugins {
|
||||
alias(libs.plugins.androidLibrary)
|
||||
alias(libs.plugins.kotlinAndroid)
|
||||
alias(libs.plugins.kotlinMultiplatform)
|
||||
// org.jetbrains.compose provides the `compose.*` dependency accessors
|
||||
// that resolve to the right artifact per target (androidx.compose.*
|
||||
// on androidTarget, *-desktop jars on jvm).
|
||||
alias(libs.plugins.compose)
|
||||
alias(libs.plugins.kotlinCompose)
|
||||
// v0.3.2.0 — Kotlin Serialization for the Backup JSON codec.
|
||||
// v0.3.2.0 — Kotlin Serialization for the Backup JSON codec (used by
|
||||
// CarnetImporter today; the plugin stays target-agnostic).
|
||||
alias(libs.plugins.kotlinSerialization)
|
||||
}
|
||||
|
||||
kotlin {
|
||||
jvmToolchain(17)
|
||||
|
||||
androidTarget()
|
||||
jvm()
|
||||
|
||||
sourceSets {
|
||||
commonMain.dependencies {
|
||||
implementation(compose.runtime)
|
||||
implementation(compose.ui)
|
||||
implementation(compose.foundation)
|
||||
implementation(compose.material3)
|
||||
implementation(libs.kotlinx.coroutines.core)
|
||||
}
|
||||
|
||||
androidMain.dependencies {
|
||||
implementation(project(":core:domain"))
|
||||
implementation(project(":core:data"))
|
||||
// Phase 1 (M2 task 1): backup codecs + bridge now live here; the
|
||||
// org.incido.compose.data.backup package name was kept, so no imports
|
||||
// changed — only this dependency line.
|
||||
implementation(project(":core:backup"))
|
||||
// Phase 1 (M3 task 1): settings repository, same treatment — package
|
||||
// kept, the Context-based construction moved to AndroidSettingsStore.kt.
|
||||
implementation(project(":core:settings"))
|
||||
|
||||
// Core / lifecycle
|
||||
implementation(libs.androidx.core.ktx)
|
||||
implementation(libs.androidx.lifecycle.viewmodel)
|
||||
implementation(libs.androidx.lifecycle.viewmodel.compose)
|
||||
implementation(libs.androidx.lifecycle.runtime)
|
||||
implementation(libs.androidx.lifecycle.process)
|
||||
implementation(libs.kotlinx.coroutines.android)
|
||||
|
||||
// Compose BOM keeps all Compose artefact versions aligned.
|
||||
// (Called inline — the KMP source-set dependency handler's
|
||||
// platform() returns a raw notation, not a Dependency, so the
|
||||
// old `val composeBom = platform(…)` idiom fails here.)
|
||||
implementation(project.dependencies.platform(libs.composeBom))
|
||||
|
||||
implementation(libs.androidx.activity.compose)
|
||||
implementation(libs.androidx.navigation.compose)
|
||||
|
||||
// Compose (same org.jetbrains.compose artifacts as before the
|
||||
// M4.1 conversion — they resolve to the androidx variants on
|
||||
// this target; version alignment unchanged).
|
||||
implementation(libs.compose.ui)
|
||||
implementation(libs.compose.ui.tooling.preview)
|
||||
implementation(libs.compose.foundation)
|
||||
implementation(libs.compose.material3)
|
||||
implementation(libs.compose.material.icons.extended)
|
||||
|
||||
// v0.3.2.0 — Settings (DataStore Preferences), Security (Biometric),
|
||||
// and Backup (Kotlin Serialization JSON) support.
|
||||
implementation(libs.androidx.datastore.preferences)
|
||||
implementation(libs.androidx.biometric)
|
||||
implementation(libs.kotlinx.serialization.json)
|
||||
}
|
||||
|
||||
jvmMain.dependencies {
|
||||
// Nothing yet — the compose artifacts arrive via commonMain;
|
||||
// :core:data-jvm / :core:settings wiring lands with M4.3's
|
||||
// container seam when :desktopApp starts consuming this target.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "org.incido.compose"
|
||||
compileSdk = 35
|
||||
@@ -19,20 +110,15 @@ android {
|
||||
minSdk = 26
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
compose = true
|
||||
buildConfig = true
|
||||
}
|
||||
// M4.1: `buildFeatures.compose` is NOT set — the org.jetbrains.compose
|
||||
// plugin owns Compose wiring on this target (setting it here alongside
|
||||
// the KMP plugin is the classic double-wire; see §3 trap 6's sibling).
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
kotlin {
|
||||
jvmToolchain(17)
|
||||
}
|
||||
|
||||
packaging {
|
||||
resources {
|
||||
excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
||||
@@ -40,44 +126,11 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
// AGP's debug-only configurations are project-level, so the Compose
|
||||
// tooling dependency that was `debugImplementation` before the M4.1
|
||||
// conversion keeps that exact scope here (the KMP `sourceSets { … }`
|
||||
// dependency handlers only expose implementation/api/compileOnly).
|
||||
dependencies {
|
||||
implementation(project(":core:domain"))
|
||||
implementation(project(":core:data"))
|
||||
// Phase 1 (M2 task 1): backup codecs + bridge now live here; the
|
||||
// org.incido.compose.data.backup package name was kept, so no imports
|
||||
// changed — only this dependency line.
|
||||
implementation(project(":core:backup"))
|
||||
// Phase 1 (M3 task 1): settings repository, same treatment — package
|
||||
// kept, the Context-based construction moved to AndroidSettingsStore.kt.
|
||||
implementation(project(":core:settings"))
|
||||
|
||||
// Core / lifecycle
|
||||
implementation(libs.androidx.core.ktx)
|
||||
implementation(libs.androidx.lifecycle.viewmodel)
|
||||
implementation(libs.androidx.lifecycle.viewmodel.compose)
|
||||
implementation(libs.androidx.lifecycle.runtime)
|
||||
implementation(libs.androidx.lifecycle.process)
|
||||
implementation(libs.kotlinx.coroutines.android)
|
||||
|
||||
// Compose BOM keeps all Compose artefact versions aligned
|
||||
val composeBom = platform(libs.composeBom)
|
||||
implementation(composeBom)
|
||||
androidTestImplementation(composeBom)
|
||||
|
||||
implementation(libs.androidx.activity.compose)
|
||||
implementation(libs.androidx.navigation.compose)
|
||||
|
||||
// Compose
|
||||
implementation(libs.compose.ui)
|
||||
implementation(libs.compose.ui.tooling.preview)
|
||||
implementation(libs.compose.foundation)
|
||||
implementation(libs.compose.material3)
|
||||
implementation(libs.compose.material.icons.extended)
|
||||
debugImplementation(libs.compose.ui.tooling)
|
||||
|
||||
// v0.3.2.0 — Settings (DataStore Preferences), Security (Biometric),
|
||||
// and Backup (Kotlin Serialization JSON) support.
|
||||
implementation(libs.androidx.datastore.preferences)
|
||||
implementation(libs.androidx.biometric)
|
||||
implementation(libs.kotlinx.serialization.json)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user