feat(phase-1/m4.3a): :core:settings → multiplatform (androidTarget + jvm)

Verbatim M4.2 (:core:domain) playbook — both source files moved UNMODIFIED
into commonMain (git records the rename; UserSettings.kt is a pure rename).
This is the visibility gate for M4.3's AppGraph: a KMP commonMain cannot see
plain kotlin("jvm") modules, and M4.3's container seam needs
SettingsRepository/UserSettings from composeApp commonMain.

One new seam, justified per §9 (never widen silently): kotlinx.coroutines
`runBlocking` has no commonMain declaration, so SettingsRepository.snapshot()
now goes through an internal expect/actual `blockingFirst(Flow<T>): T`.
Both actuals are the identical two-liner because both targets are JVM.
Same startup-safety contract (block off the UI thread at startup only).

Consumers unchanged by design: :desktopApp (plain jvm) and :composeApp's
androidMain resolve through variant metadata — zero import changes.

Verification (both green):
  ./gradlew assembleDebug :composeApp:compileKotlinJvm :core:data-jvm:smoke
      → BUILD SUCCESSFUL — RESULT: M1a PASS (one run, all consumers)
  ./gradlew :desktopApp:run --args="--data-dir /tmp/incido-desktop-smoke --self-test --exit-after 6"
      → SELFTEST wrote note id=1 → RENDER notes=1 selected=1
  git diff core/data/objectbox-models → empty (ID model file unchanged)
This commit is contained in:
Incido Developer committed 2026-10-06 16:27:10 +13:00
1 parent b774a1feb6
commit 5bce1934c1
6 files changed
+74 -23

No files matched your search

+41 -16
View File
@@ -2,32 +2,57 @@
// :composeApp so the desktop build reads and writes the SAME preferences // :composeApp so the desktop build reads and writes the SAME preferences
// file format the phone uses (`.preferences_pb`, identical keys). // file format the phone uses (`.preferences_pb`, identical keys).
// //
// Shape follows :core:backup: plain kotlin("jvm"), package names kept at // Phase 1 (M4.3a): converted kotlin("jvm") → kotlin("multiplatform") with
// org.incido.compose.data.settings so the Android diff is file moves only. // androidTarget() + jvm(), the exact M4.2 (:core:domain) playbook. This is
// The one API change: SettingsRepository takes an injected // what makes SettingsRepository/UserSettings visible to a KMP commonMain —
// the gate M4.3's AppGraph needs (plain kotlin("jvm") modules are invisible
// to commonMain). Sources moved UNMODIFIED into commonMain except one two-
// line seam: runBlocking has no commonMain declaration, so snapshot() goes
// through expect/actual `blockingFirst` (both actuals identical — both our
// targets are JVM). Consumers unchanged by design: :desktopApp (plain jvm)
// and :composeApp (AGP + KMP) resolve through variant metadata.
//
// The one M3 API shape stands: SettingsRepository takes an injected
// DataStore<Preferences> instead of a Context — Android supplies the // DataStore<Preferences> instead of a Context — Android supplies the
// `preferencesDataStore(name = …)` Context-extension store, desktop builds // `preferencesDataStore(name = …)` Context-extension store, desktop builds
// one with PreferenceDataStoreFactory.create(produceFile = …) (the spike // one with PreferenceDataStoreFactory.create(produceFile = …) (the spike
// finding: the multiplatform core artifact has no Context extension). // finding: the multiplatform core artifact has no Context extension).
plugins { plugins {
alias(libs.plugins.kotlinJvm) alias(libs.plugins.androidLibrary)
} alias(libs.plugins.kotlinMultiplatform)
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
} }
kotlin { kotlin {
jvmToolchain(17) jvmToolchain(17)
androidTarget()
jvm()
sourceSets {
commonMain.dependencies {
// Public API (constructor + flow types) exposes DataStore<Preferences> —
// api, not impl. On the Android classpath this resolves to the same
// android variant :composeApp's datastore-preferences already pulls, so
// there is no duplicate-class situation. The 1.1.1 artifact is itself
// multiplatform (its jvm variant is what the plain-JVM desktop build
// has been resolving all along).
api(libs.androidx.datastore.preferences.core)
implementation(libs.kotlinx.coroutines.core)
}
}
} }
dependencies { android {
// Public API (constructor + flow types) exposes DataStore<Preferences> — namespace = "org.incido.compose.data.settings"
// api, not impl. On the Android classpath this resolves to the same compileSdk = 35
// android variant :composeApp's datastore-preferences already pulls, so
// there is no duplicate-class situation. defaultConfig {
api(libs.androidx.datastore.preferences.core) minSdk = 26
implementation(libs.kotlinx.coroutines.core) }
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
} }
@@ -0,0 +1,7 @@
package org.incido.compose.data.settings
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
internal actual fun <T> blockingFirst(flow: Flow<T>): T = runBlocking { flow.first() }
@@ -0,0 +1,14 @@
package org.incido.compose.data.settings
import kotlinx.coroutines.flow.Flow
/**
* Take the first emission of [flow], blocking the calling thread.
*
* Phase 1 (M4.3a): the only platform seam :core:settings needed to become
* multiplatform — `kotlinx.coroutines.runBlocking` has no commonMain
* declaration. Both actuals are the identical two-liner because both our
* targets (androidTarget, jvm) are JVM. Same startup-safety contract as
* before: call off the UI thread (see SettingsRepository.snapshot KDoc).
*/
internal expect fun <T> blockingFirst(flow: Flow<T>): T
@@ -7,9 +7,7 @@ import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.intPreferencesKey import androidx.datastore.preferences.core.intPreferencesKey
import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.runBlocking
/** /**
* DataStore-backed persistence for [UserSettings]. * DataStore-backed persistence for [UserSettings].
@@ -27,8 +25,10 @@ import kotlinx.coroutines.runBlocking
* *
* Read-once access (used by [org.incido.compose.IncidoApplication] to * Read-once access (used by [org.incido.compose.IncidoApplication] to
* bootstrap the encryption key before the BoxStore is constructed) goes * bootstrap the encryption key before the BoxStore is constructed) goes
* through [snapshot] which uses a `runBlocking { first() }` — safe at * through [snapshot] which uses a `blockingFirst` — the M4.3a expect/actual
* Application.onCreate time, where there's no UI thread to deadlock. * around `runBlocking { first() }` (`runBlocking` has no commonMain
* declaration; both our targets are JVM so both actuals are identical).
* Safe at Application.onCreate time, where there's no UI thread to deadlock.
*/ */
class SettingsRepository(private val dataStore: DataStore<Preferences>) { class SettingsRepository(private val dataStore: DataStore<Preferences>) {
@@ -38,9 +38,7 @@ class SettingsRepository(private val dataStore: DataStore<Preferences>) {
/** Read-once snapshot of the current settings. Blocking — call only /** Read-once snapshot of the current settings. Blocking — call only
* at startup, not from the UI thread. */ * at startup, not from the UI thread. */
fun snapshot(): UserSettings = runBlocking { fun snapshot(): UserSettings = blockingFirst(dataStore.data).toUserSettings()
dataStore.data.first().toUserSettings()
}
// ---- setters ---- // ---- setters ----
// Each setter does a single .edit { } so we don't trigger spurious // Each setter does a single .edit { } so we don't trigger spurious
@@ -0,0 +1,7 @@
package org.incido.compose.data.settings
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
internal actual fun <T> blockingFirst(flow: Flow<T>): T = runBlocking { flow.first() }