From 9ad7c605372a7196aac259f16bf843403decc54a Mon Sep 17 00:00:00 2001 From: Incido Developer Date: Tue, 6 Oct 2026 12:20:05 +1300 Subject: [PATCH] =?UTF-8?q?feat(phase-1/m4.2):=20:core:domain=20=E2=86=92?= =?UTF-8?q?=20multiplatform=20(androidTarget=20+=20jvm);=20NoteColors=20to?= =?UTF-8?q?=20commonMain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phase-0 recommendation #1 ("core:domain is already JVM-clean — convert it first; zero code changes"), now unlocked by M4.1: common source sets cannot see plain kotlin("jvm") projects, so the domain deploy was the gate for making composeApp's commonMain depend on Note/NoteColor/NoteRepository. Sources move untouched (pure renames); Flow moves implementation → api (it is in the public repository interfaces — was already leaking, now stated). androidTarget() drags in the AGP plugin + a namespace — the module is now a library-for-Android too, but emits no Android-specific code and needed no manifest (AGP 8 + namespace). Plain-JVM consumers (:core:data-jvm, :core:backup, :core:settings, :desktopApp) and AGP consumers (:core:data, :app) resolve through variant metadata with ZERO import or build-line changes — verified below. Then composeApp: api(project(":core:domain")) in commonMain (up from androidMain), NoteColors.kt moves to commonMain — first real shared UI-layer file with a domain dependency. Verified: ./gradlew assembleDebug + :composeApp:compileKotlinJvm + :core:data-jvm:smoke (M1a PASS) in one run, and :desktopApp:run --args="--data-dir /tmp/incido-desktop-smoke3 --self-test --exit-after 6" (SELFTEST wrote note id=1). --- composeApp/build.gradle.kts | 6 ++- .../org/incido/compose/ui/theme/NoteColors.kt | 0 core/domain/build.gradle.kts | 42 +++++++++++++++---- .../org/incido/domain/model/ChecklistItem.kt | 0 .../kotlin/org/incido/domain/model/Hashtag.kt | 0 .../org/incido/domain/model/HashtagUsage.kt | 0 .../kotlin/org/incido/domain/model/Note.kt | 0 .../org/incido/domain/model/NoteAttachment.kt | 0 .../org/incido/domain/model/NoteColor.kt | 0 .../org/incido/domain/model/NoteFilter.kt | 0 .../org/incido/domain/model/NoteType.kt | 0 .../domain/repository/NoteRepository.kt | 0 12 files changed, 39 insertions(+), 9 deletions(-) rename composeApp/src/{androidMain => commonMain}/kotlin/org/incido/compose/ui/theme/NoteColors.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/model/ChecklistItem.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/model/Hashtag.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/model/HashtagUsage.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/model/Note.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/model/NoteAttachment.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/model/NoteColor.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/model/NoteFilter.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/model/NoteType.kt (100%) rename core/domain/src/{main => commonMain}/kotlin/org/incido/domain/repository/NoteRepository.kt (100%) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 42aec89..8312348 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -48,10 +48,14 @@ kotlin { implementation(compose.foundation) implementation(compose.material3) implementation(libs.kotlinx.coroutines.core) + // Phase 1 (M4.2): :core:domain is multiplatform now (M4.2's own + // conversion), so commonMain can see it — this is what let + // NoteColors.kt move up. api: screens/ViewModels across all + // targets consume Note/NoteColor/NoteRepository from it. + api(project(":core:domain")) } 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 diff --git a/composeApp/src/androidMain/kotlin/org/incido/compose/ui/theme/NoteColors.kt b/composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/NoteColors.kt similarity index 100% rename from composeApp/src/androidMain/kotlin/org/incido/compose/ui/theme/NoteColors.kt rename to composeApp/src/commonMain/kotlin/org/incido/compose/ui/theme/NoteColors.kt diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts index c09a8ef..3019750 100644 --- a/core/domain/build.gradle.kts +++ b/core/domain/build.gradle.kts @@ -1,19 +1,45 @@ // core/domain — pure-Kotlin domain module (no Android dependencies). // Contains business types and repository interfaces only. // Implementation lives in :core:data. +// +// Phase 1 (M4.2): converted kotlin("jvm") → kotlin("multiplatform") with +// androidTarget() + jvm(), per the Phase-0 recommendation ("core:domain is +// already JVM-clean — convert it first. Zero code changes"). This is what +// lets a KMP module's commonMain (composeApp) depend on it — plain +// kotlin("jvm") modules are invisible to commonMain. Existing plain-JVM +// (:core:data-jvm, :desktopApp) and AGP (:core:data, :app, :composeApp) +// consumers keep working through the variant metadata — zero import +// changes anywhere. plugins { - alias(libs.plugins.kotlinJvm) -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinMultiplatform) } kotlin { jvmToolchain(17) + + androidTarget() + jvm() + + sourceSets { + commonMain.dependencies { + // Flow/StateFlow appear in the public repository interfaces. + api(libs.kotlinx.coroutines.core) + } + } } -dependencies { - implementation(libs.kotlinx.coroutines.core) +android { + namespace = "org.incido.domain" + compileSdk = 35 + + defaultConfig { + minSdk = 26 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } } + diff --git a/core/domain/src/main/kotlin/org/incido/domain/model/ChecklistItem.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/model/ChecklistItem.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/model/ChecklistItem.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/model/ChecklistItem.kt diff --git a/core/domain/src/main/kotlin/org/incido/domain/model/Hashtag.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/model/Hashtag.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/model/Hashtag.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/model/Hashtag.kt diff --git a/core/domain/src/main/kotlin/org/incido/domain/model/HashtagUsage.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/model/HashtagUsage.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/model/HashtagUsage.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/model/HashtagUsage.kt diff --git a/core/domain/src/main/kotlin/org/incido/domain/model/Note.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/model/Note.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/model/Note.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/model/Note.kt diff --git a/core/domain/src/main/kotlin/org/incido/domain/model/NoteAttachment.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/model/NoteAttachment.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/model/NoteAttachment.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/model/NoteAttachment.kt diff --git a/core/domain/src/main/kotlin/org/incido/domain/model/NoteColor.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/model/NoteColor.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/model/NoteColor.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/model/NoteColor.kt diff --git a/core/domain/src/main/kotlin/org/incido/domain/model/NoteFilter.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/model/NoteFilter.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/model/NoteFilter.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/model/NoteFilter.kt diff --git a/core/domain/src/main/kotlin/org/incido/domain/model/NoteType.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/model/NoteType.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/model/NoteType.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/model/NoteType.kt diff --git a/core/domain/src/main/kotlin/org/incido/domain/repository/NoteRepository.kt b/core/domain/src/commonMain/kotlin/org/incido/domain/repository/NoteRepository.kt similarity index 100% rename from core/domain/src/main/kotlin/org/incido/domain/repository/NoteRepository.kt rename to core/domain/src/commonMain/kotlin/org/incido/domain/repository/NoteRepository.kt