new project structure

.claude/settings.local.json

@@ -32,7 +32,8 @@
       "Bash(git checkout *)",
       "Bash(cd *)",
       "Bash(./gradlew buildAll -PdepCheck=false --console=plain)",
-      "Bash(awk '{printf \"  %-34s %s\\\\n\",$NF,$5}')"
+      "Bash(awk '{printf \"  %-34s %s\\\\n\",$NF,$5}')",
+      "WebFetch(domain:blog.jetbrains.com)"
     ]
   }
 }

.run/android.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="mjdev-desktop.composeApp" />
+    <module name="mjdev-desktop.androidApp" />
     <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />

.run/desktop.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="desktop" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$/composeApp" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/desktopApp" />
       <option name="externalSystemIdString" value="GRADLE" />
       <option name="scriptParameters" value="-DmainClass=org.mjdev.desktop.main.MainKt --quiet" />
       <option name="taskDescriptions">
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="desktopRun" />
+          <option value="run" />
         </list>
       </option>
       <option name="vmOptions" />

androidApp/androidApp.gradle.kts

@@ -0,0 +1,69 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
+}
+
+android {
+    namespace = "org.mjdev.desktop"
+    compileSdk = libs.versions.android.compile.sdk.get().toInt()
+    // shared resources packaged into the APK (lost when composeApp was split):
+    //  - assets  <- commonMain/resources (icon fonts, translations, widgets, …)
+    //  - resources <- commonMain/composeResources
+    sourceSets["main"].assets.srcDirs(rootDir.resolve("shared/src/commonMain/resources"))
+    sourceSets["main"].resources.srcDirs(rootDir.resolve("shared/src/commonMain/composeResources"))
+    defaultConfig {
+        applicationId = "org.mjdev.desktop"
+        minSdk = libs.versions.android.min.sdk.get().toInt()
+        targetSdk = libs.versions.android.target.sdk.get().toInt()
+        versionCode = libs.versions.app.pkg.version.get().replace(".", "").toInt()
+        versionName = libs.versions.app.pkg.version.get()
+        resValue("string", "app_name", libs.versions.app.name.get())
+    }
+    packaging {
+        resources {
+            excludes += "META-INF/{AL2.0,LGPL2.1}"
+            excludes += "META-INF/INDEX.LIST"
+            excludes += "META-INF/DEPENDENCIES"
+            excludes += "META-INF/io.netty.versions.properties"
+            pickFirsts += "META-INF/native-image/**"
+        }
+    }
+    buildTypes {
+        getByName("release") {
+            isDebuggable = true
+            isJniDebuggable = true
+            isMinifyEnabled = false
+            isShrinkResources = false
+            isPseudoLocalesEnabled = true
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
+}
+
+dependencies {
+    implementation(projects.shared)
+    implementation(compose.runtime)
+    implementation(compose.foundation)
+    implementation(compose.material3)
+    implementation(compose.materialIconsExtended)
+    implementation(compose.ui)
+    implementation(compose.components.resources)
+    implementation(compose.components.uiToolingPreview)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.core.splashscreen)
+    implementation(libs.accompanist.permissions)
+    implementation(libs.coil.compose)
+    implementation(libs.napier)
+    debugImplementation(libs.androidx.ui.tooling)
+}

build.gradle.kts

@@ -86,8 +86,8 @@ val postBuildCodeCheck by tasks.registering {
     description = "Auto-formats code (ktlintFormat) and runs the gated dependency-update report into /reports"
     // Auto-format on build. Safe because .editorconfig disables no-unused-imports — the one
     // rule that stripped receiver/extension-member imports and broke compilation.
-    dependsOn(":composeApp:ktlintFormat")
-    if (depCheckEnabled) dependsOn(":composeApp:dependencyUpdates")
+    dependsOn(":shared:ktlintFormat")
+    if (depCheckEnabled) dependsOn(":shared:dependencyUpdates")
     finalizedBy(collectKtlintReports)
 }
 
@@ -152,7 +152,7 @@ val ensureAppImageTool = tasks.register<EnsureAppImageToolTask>("ensureAppImageT
 val packageAppImageFile = tasks.register<PackageAppImageTask>("packageAppImageFile") {
     group = "mjdev"
     description = "Builds a single-file .AppImage from the jpackage app-image (skips if appimagetool unavailable)."
-    dependsOn(ensureAppImageTool, ":composeApp:packageReleaseAppImage")
+    dependsOn(ensureAppImageTool, ":desktopApp:packageReleaseAppImage")
     appName.set(appNameV)
     appImagePath.set(pkgDirV.resolve("app/$appNameV").absolutePath)
     outputPath.set(pkgDirV.resolve("appimage/$appNameV.AppImage").absolutePath)
@@ -165,8 +165,8 @@ val collectReleases = tasks.register<Copy>("collectReleases") {
     group = "mjdev"
     description = "Copies the built distributables into releases/ (versioned filenames)."
     dependsOn(
-        ":composeApp:packageReleaseDistributionForCurrentOS",
-        ":composeApp:assembleRelease",
+        ":desktopApp:packageReleaseDistributionForCurrentOS",
+        ":androidApp:assembleRelease",
         packageAppImageFile,
     )
     // local copies so the rename closures capture plain Strings (configuration-cache safe)
@@ -176,7 +176,7 @@ val collectReleases = tasks.register<Copy>("collectReleases") {
     from(pkgDirV.resolve("rpm")) { include("*.rpm"); rename { "$base.rpm" } }
     from(pkgDirV.resolve("exe")) { include("*.exe"); rename { "$base.exe" } } // present only on a Windows host
     from(pkgDirV.resolve("appimage")) { include("*.AppImage"); rename { "$base.AppImage" } }
-    from(rootDir.resolve("composeApp/build/outputs/apk/release")) {
+    from(rootDir.resolve("androidApp/build/outputs/apk/release")) {
         include("*.apk"); rename { "$base.apk" }
     }
 }
@@ -189,7 +189,7 @@ val buildAll = tasks.register("buildAll") {
 
 // Attach iOS framework build only when an iOS target actually exists in composeApp
 // (it never does on a Linux/Windows host — Kotlin/Native iOS requires macOS + Xcode).
-project(":composeApp").afterEvaluate {
+project(":shared").afterEvaluate {
     val iosTask = tasks.names.firstOrNull {
         it.startsWith("linkReleaseFrameworkIos") || it == "embedAndSignAppleFrameworkForXcode"
     }

buildSrc/build.gradle.kts

@@ -45,12 +45,6 @@ dependencies {
 
 gradlePlugin {
     plugins {
-        register("MultiPlatformPlugin") {
-            id = "MultiPlatformPlugin"
-            displayName = "MultiPlatformPlugin"
-            description = "Common library plugin to handle all stuffs needed."
-            implementationClass = "MultiPlatformPlugin"
-        }
         register("AiAgentPlugin") {
             id = "AiAgentPlugin"
             displayName = "AiAgentPlugin"

desktopApp/desktopApp.gradle.kts

@@ -0,0 +1,56 @@
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+
+plugins {
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.compose.compiler)
+}
+
+kotlin {
+    jvmToolchain(libs.versions.java.language.version.get().toInt())
+}
+
+dependencies {
+    implementation(projects.shared)
+    implementation(compose.desktop.currentOs)
+}
+
+// IDE run-config compatibility: the old KMP module exposed `desktopRun`; a plain JVM
+// Compose Desktop module exposes `run`. Keep `desktopRun` working as an alias.
+tasks.register("desktopRun") {
+    group = "compose desktop"
+    description = "Alias for :desktopApp:run (IDE run configuration compatibility)."
+    dependsOn("run")
+}
+
+compose.desktop {
+    application {
+        jvmArgs("-Dprism.order=sw")
+        mainClass = "org.mjdev.desktop.main.MainKt"
+        nativeDistributions {
+            packageName = libs.versions.app.name.get()
+            packageVersion = libs.versions.app.pkg.version.get()
+            description = libs.versions.app.description.get()
+            copyright = libs.versions.app.copyright.get()
+            outputBaseDir.set(rootProject.rootDir.resolve("packages"))
+            linux {
+                appCategory = libs.versions.app.category.get()
+                debMaintainer = libs.versions.app.maintainer.get()
+                menuGroup = libs.versions.app.menu.group.get()
+                vendor = libs.versions.app.vendor.get()
+            }
+            targetFormats(
+                TargetFormat.Deb,
+                TargetFormat.Exe, // Windows installer — only built on a Windows host
+                TargetFormat.AppImage,
+                TargetFormat.Rpm,
+            )
+            buildTypes.release.proguard {
+                configurationFiles.from("desktopApp.pro")
+                // optional transitive deps (netty -> log4j2) defeat the optimizer's class
+                // hierarchy analysis (IncompleteClassHierarchyException); shrink+obfuscate stay on
+                optimize.set(false)
+            }
+        }
+    }
+}

gradle.properties

@@ -47,6 +47,8 @@ android.uniquePackageNames=false
 android.dependency.useConstraints=true
 android.r8.strictFullModeForKeepRules=false
 android.r8.optimizedResourceShrinking=false
-android.builtInKotlin=false
+# android.builtInKotlin must be enabled (AGP 9 default) so androidApp's own Kotlin
+# (App, MainActivity) compiles — with it false the entry classes were missing from the APK.
+# android.builtInKotlin=false
 android.newDsl=false
 ####################################################################################################

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ android-min-sdk = "26"
 android-target-sdk = "36"
 ### custom versions ################################################################################
 vlc-version = "3.0.21-2"
-vlc-dir = "composeApp/src/commonMain/resources/vlc/"
+vlc-dir = "shared/src/commonMain/resources/vlc/"
 ### lib versions ###################################################################################
 gradle = "9.0.1"
 #gradle-kotlinter = "4.3.0"
@@ -26,7 +26,7 @@ androidx-lifecycle = "2.9.1"
 androidx-ui-tooling = "1.8.3"
 app-icon = "1.2.6"
 coil = "3.2.0"
-compose-plugin = "1.8.2"
+compose-plugin = "1.10.0"
 core-splash-screen = "1.0.1"
 generative-ai = "0.9.0-1.1.0"
 gettext-lib = "1.11.0"
@@ -178,6 +178,7 @@ cryptography-provider-optimal = { module = "dev.whyoleg.cryptography:cryptograph
 ####################################################################################################
 android-application = { id = "com.android.application", version.ref = "gradle" }
 android-library = { id = "com.android.library", version.ref = "gradle" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "gradle" }
 app-icon-generator = { id = "io.github.qamarelsafadi.kmp.app.icon.generator", version.ref = "app-icon" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

settings.gradle.kts

@@ -78,7 +78,9 @@ dependencyResolutionManagement {
 //</editor-fold>------------------------------------------------------------------------------------
 
 //<editor-fold desc="includes">---------------------------------------------------------------------
-include(":composeApp")
+include(":shared")
+include(":androidApp")
+include(":desktopApp")
 //</editor-fold>------------------------------------------------------------------------------------
 
 //<editor-fold desc="rename gradle build files">----------------------------------------------------

composeApp/composeApp.gradle.kts → shared/shared.gradle.kts

@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.android.application)
+    id("com.android.kotlin.multiplatform.library")
     alias(libs.plugins.compose)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.vlc.setup)
@@ -101,7 +101,17 @@ targets {
     desktopTarget {
     }
 
-    androidTarget {
+    androidLibrary {
+        namespace = "org.mjdev.desktop.shared"
+        compileSdk =
+            libs.versions.android.compile.sdk
+                .get()
+                .toInt()
+        minSdk =
+            libs.versions.android.min.sdk
+                .get()
+                .toInt()
+        androidResources { enable = true }
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
         }
@@ -322,150 +332,7 @@ kotlin {
 
 // <editor-fold desc="platforms">--------------------------------------------------------------------
 
-// android app config
-android {
-    namespace = "org.mjdev.desktop"
-    compileSdk =
-        libs.versions.android.compile.sdk
-            .get()
-            .toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    sourceSets["main"].res.srcDirs("src/androidMain/res")
-    sourceSets["main"].resources.srcDirs("src/commonMain/composeResources")
-    sourceSets["main"].assets.srcDirs("src/commonMain/resources")
-    defaultConfig {
-        applicationId = "org.mjdev.desktop"
-        minSdk =
-            libs.versions.android.min.sdk
-                .get()
-                .toInt()
-        targetSdk =
-            libs.versions.android.target.sdk
-                .get()
-                .toInt()
-        versionCode =
-            libs.versions.app.pkg.version
-                .get()
-                .replace(".", "")
-                .toInt()
-        versionName =
-            libs.versions.app.pkg.version
-                .get()
-        resValue(
-            "string",
-            "app_name",
-            libs.versions.app.name
-                .get(),
-        )
-    }
-    packaging {
-        resources {
-            excludes += "META-INF/{AL2.0,LGPL2.1}"
-            excludes += "META-INF/INDEX.LIST"
-            excludes += "META-INF/DEPENDENCIES"
-            excludes += "META-INF/io.netty.versions.properties"
-            pickFirsts += "META-INF/native-image/**"
-        }
-    }
-    buildTypes {
-        getByName("release") {
-            isDebuggable = true
-            isJniDebuggable = true
-            isMinifyEnabled = false
-            isShrinkResources = false
-//            isRenderscriptDebuggable = true
-            isPseudoLocalesEnabled = true
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-    dependencies {
-        debugImplementation(libs.androidx.ui.tooling)
-    }
-}
-
-// desktop app config
-desktop {
-    group =
-        libs.versions.app.pkg.name
-            .get()
-    version =
-        libs.versions.app.pkg.version
-            .get()
-    application {
-        jvmArgs("-Dprism.order=sw")
-        mainClass = "org.mjdev.desktop.main.MainKt"
-        nativeDistributions {
-            packageName =
-                libs.versions.app.name
-                    .get()
-            packageVersion =
-                libs.versions.app.pkg.version
-                    .get()
-            description =
-                libs.versions.app.description
-                    .get()
-            copyright =
-                libs.versions.app.copyright
-                    .get()
-            outputBaseDir.set(project.rootDir.resolve("packages"))
-//                macOS {
-//                    iconFile.set(project.rootDir.resolve("icons").resolve("icon.icns"))
-//                }
-//                windows {
-//                    iconFile.set(project.rootDir.resolve("icons").resolve("icon.ico"))
-//                    exePackageVersion = "1.0.0"
-//                    msiPackageVersion = "1.0.0"
-//                }
-            linux {
-//                    iconFile.set(
-//                        project.rootDir
-//                            .resolve("composeApp")
-//                            .resolve("src")
-//                            .resolve("commonMain")
-//                            .resolve("resources")
-//                            .resolve("drawable")
-//                            .resolve("icon.png")
-//                    )
-//                    licenseFile.set(project.rootDir.resolve("LICENSE.txt"))
-                appCategory =
-                    libs.versions.app.category
-                        .get()
-                debMaintainer =
-                    libs.versions.app.maintainer
-                        .get()
-                menuGroup =
-                    libs.versions.app.menu.group
-                        .get()
-                vendor =
-                    libs.versions.app.vendor
-                        .get()
-            }
-            targetFormats(
-//                TargetFormat.Dmg,
-//                TargetFormat.Msi,
-                TargetFormat.Deb,
-                TargetFormat.Exe, // Windows installer — only built when running on a Windows host
-                TargetFormat.AppImage,
-//                TargetFormat.Pkg,
-                TargetFormat.Rpm,
-            )
-            buildTypes.release.proguard {
-                configurationFiles.from("composeApp.pro")
-                // The optimization pass can't resolve the class hierarchy of optional
-                // transitive deps (e.g. netty's Log4J2Logger -> log4j2, absent at runtime),
-                // throwing IncompleteClassHierarchyException. Shrinking + obfuscation stay on.
-                optimize.set(false)
-            }
-//            appResourcesRootDir.set(project.rootDir.resolve("resources"))
-        }
-    }
-}
+// android app config -> moved to :androidApp module
+// desktop app config -> moved to :desktopApp module
 
 // </editor-fold>------------------------------------------------------------------------------------