WIP: Update to Compose Multiplatform 1.10.0

build-logic/convention/build.gradle.kts

@@ -11,6 +11,7 @@ dependencies {
     compileOnly(libs.android.tools.common)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.compose.gradlePlugin)
+    compileOnly(libs.jetbrains.compose.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
     compileOnly(libs.androidx.room.gradle.plugin)
     implementation(libs.buildkonfig.gradlePlugin)

build-logic/convention/src/main/kotlin/CmpApplicationConventionPlugin.kt

@@ -38,8 +38,18 @@ class CmpApplicationConventionPlugin: Plugin<Project> {
             }
 
             dependencies {
+                // Core Compose dependencies
+                "commonMainImplementation"(libs.findLibrary("jetbrains-compose-runtime").get())
+                "commonMainImplementation"(libs.findLibrary("jetbrains-compose-foundation").get())
+                "commonMainImplementation"(libs.findLibrary("jetbrains-compose-material3").get())
+                "commonMainImplementation"(libs.findLibrary("jetbrains-compose-ui").get())
+
+                // CMP 1.10.0+: Resources and preview tooling are now separate modules
+                "commonMainImplementation"(libs.findLibrary("jetbrains-compose-resources").get())
+                "commonMainImplementation"(libs.findLibrary("jetbrains-compose-ui-tooling-preview").get())
+
                 // Single-variant model: use androidMainImplementation instead of debugImplementation
-                "androidMainImplementation"(libs.findLibrary("androidx-compose-ui-tooling").get())
+                "androidMainImplementation"(libs.findLibrary("jetbrains-compose-ui-tooling").get())
             }
         }
     }

build-logic/convention/src/main/kotlin/CmpLibraryConventionPlugin.kt

@@ -14,13 +14,18 @@ class CmpLibraryConventionPlugin: Plugin<Project> {
             }
 
             dependencies {
+                // Core Compose dependencies
                 "commonMainImplementation"(libs.findLibrary("jetbrains-compose-ui").get())
                 "commonMainImplementation"(libs.findLibrary("jetbrains-compose-foundation").get())
                 "commonMainImplementation"(libs.findLibrary("jetbrains-compose-material3").get())
                 "commonMainImplementation"(libs.findLibrary("jetbrains-compose-material-icons-core").get())
 
+                // CMP 1.10.0+: Resources and preview tooling are now separate modules
+                "commonMainImplementation"(libs.findLibrary("jetbrains-compose-resources").get())
+                "commonMainImplementation"(libs.findLibrary("jetbrains-compose-ui-tooling-preview").get())
+
                 // Single-variant model: use androidMainImplementation instead of debugImplementation
-                "androidMainImplementation"(libs.findLibrary("androidx-compose-ui-tooling").get())
+                "androidMainImplementation"(libs.findLibrary("jetbrains-compose-ui-tooling").get())
             }
         }
     }

build.gradle.kts

@@ -3,7 +3,6 @@ plugins {
     // in each subproject's classloader
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.compose.hot.reload) apply false
     alias(libs.plugins.compose.multiplatform) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kotlin.multiplatform) apply false

composeApp/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.convention.cmp.application)
-    alias(libs.plugins.compose.hot.reload)
     alias(libs.plugins.conveyor)
 }
 
@@ -11,11 +10,14 @@ kotlin {
         namespace = "com.plcoding.chirp.shared"
         compileSdk = 36
         minSdk = 26
+
+        androidResources {
+            enable = true
+        }
     }
 
     sourceSets {
         androidMain.dependencies {
-            implementation(compose.preview)
             implementation(libs.androidx.activity.compose)
         }
         commonMain.dependencies {
@@ -34,13 +36,6 @@ kotlin {
 
             implementation(libs.jetbrains.compose.navigation)
             implementation(libs.bundles.koin.common)
-
-            implementation(compose.runtime)
-            implementation(compose.foundation)
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
-            implementation(compose.components.uiToolingPreview)
             implementation(libs.jetbrains.compose.viewmodel)
             implementation(libs.jetbrains.lifecycle.compose)
         }
@@ -65,6 +60,10 @@ kotlin {
     }
 }
 
+compose.resources {
+    packageOfResClass = "com.plcoding.chirp"
+}
+
 compose.desktop {
     application {
         mainClass = "com.plcoding.chirp.MainKt"

composeApp/src/commonMain/kotlin/com/plcoding/chirp/App.kt

@@ -12,7 +12,7 @@ import com.plcoding.chirp.navigation.DeepLinkListener
 import com.plcoding.chirp.navigation.NavigationRoot
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.presentation.util.ObserveAsEvents
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 import org.koin.compose.viewmodel.koinViewModel
 
 @Composable

composeApp/src/desktopMain/kotlin/com/plcoding/chirp/ChirpTrayMenu.kt

@@ -7,9 +7,9 @@ import androidx.compose.ui.window.Tray
 import androidx.compose.ui.window.TrayState
 import com.plcoding.core.domain.preferences.ThemePreference
 import org.jetbrains.compose.resources.painterResource
-import chirp.composeapp.generated.resources.Res
-import chirp.composeapp.generated.resources.app_theme
-import chirp.composeapp.generated.resources.logo
+import com.plcoding.chirp.Res
+import com.plcoding.chirp.app_theme
+import com.plcoding.chirp.logo
 import org.jetbrains.compose.resources.stringResource
 
 @Composable

composeApp/src/desktopMain/kotlin/com/plcoding/chirp/windows/ChirpWindow.kt

@@ -8,11 +8,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.MenuBar
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.rememberWindowState
-import chirp.composeapp.generated.resources.Res
-import chirp.composeapp.generated.resources.file
-import chirp.composeapp.generated.resources.logo
-import chirp.composeapp.generated.resources.new_window
-import chirp.core.designsystem.generated.resources.logo_chirp
+import com.plcoding.chirp.Res
+import com.plcoding.chirp.file
+import com.plcoding.chirp.logo
+import com.plcoding.chirp.new_window
+import com.plcoding.core.designsystem.logo_chirp
 import com.plcoding.chirp.App
 import com.plcoding.chirp.theme.AppTheme
 import org.jetbrains.compose.resources.painterResource

core/designsystem/build.gradle.kts

@@ -7,6 +7,10 @@ kotlin {
         namespace = "com.plcoding.core.designsystem"
         compileSdk = 36
         minSdk = 26
+
+        androidResources {
+            enable = true
+        }
     }
 
     // Source set declarations.
@@ -24,9 +28,6 @@ kotlin {
 
                 implementation(libs.coil.compose)
                 implementation(libs.coil.network.ktor)
-
-                implementation(compose.components.resources)
-                implementation(compose.components.uiToolingPreview)
             }
         }
 
@@ -53,4 +54,5 @@ kotlin {
 
 compose.resources {
     publicResClass = true
+    packageOfResClass = "com.plcoding.core.designsystem"
 }

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/avatar/ChirpAvatarPhoto.kt

@@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 enum class AvatarSize(val dp: Dp) {
     SMALL(40.dp), LARGE(60.dp)

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/avatar/ChirpStackedAvatars.kt

@@ -7,7 +7,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import com.plcoding.core.designsystem.theme.ChirpTheme
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpStackedAvatars(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/brand/ChirpBrandLogo.kt

@@ -6,8 +6,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import chirp.core.designsystem.generated.resources.Res
-import chirp.core.designsystem.generated.resources.logo_chirp
+import com.plcoding.core.designsystem.Res
+import com.plcoding.core.designsystem.logo_chirp
 import org.jetbrains.compose.resources.vectorResource
 
 @Composable

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/brand/ChirpFailureIcon.kt

@@ -6,10 +6,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import chirp.core.designsystem.generated.resources.Res
-import chirp.core.designsystem.generated.resources.success_checkmark
-import com.plcoding.core.designsystem.theme.extended
-import org.jetbrains.compose.resources.vectorResource
 
 @Composable
 fun ChirpFailureIcon(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/brand/ChirpSuccessIcon.kt

@@ -4,8 +4,8 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import chirp.core.designsystem.generated.resources.Res
-import chirp.core.designsystem.generated.resources.success_checkmark
+import com.plcoding.core.designsystem.Res
+import com.plcoding.core.designsystem.success_checkmark
 import com.plcoding.core.designsystem.theme.extended
 import org.jetbrains.compose.resources.vectorResource
 

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/buttons/ChirpButton.kt

@@ -22,7 +22,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 enum class ChirpButtonStyle {
     PRIMARY,

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/buttons/ChirpFloatingActionButton.kt

@@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.plcoding.core.designsystem.theme.ChirpTheme
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpFloatingActionButton(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/buttons/ChirpIconButton.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpIconButton(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/chat/ChirpChatBubble.kt

@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpChatBubble(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/dialogs/DestructiveConfirmationDialog.kt

@@ -23,14 +23,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import chirp.core.designsystem.generated.resources.Res
-import chirp.core.designsystem.generated.resources.dismiss_dialog
+import com.plcoding.core.designsystem.Res
+import com.plcoding.core.designsystem.dismiss_dialog
 import com.plcoding.core.designsystem.components.buttons.ChirpButton
 import com.plcoding.core.designsystem.components.buttons.ChirpButtonStyle
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
 import org.jetbrains.compose.resources.stringResource
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun DestructiveConfirmationDialog(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/layouts/ChirpAdaptiveFormLayout.kt

@@ -32,7 +32,7 @@ import com.plcoding.core.designsystem.theme.extended
 import com.plcoding.core.presentation.util.DeviceConfiguration
 import com.plcoding.core.presentation.util.clearFocusOnTap
 import com.plcoding.core.presentation.util.currentDeviceConfiguration
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpAdaptiveFormLayout(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/layouts/ChirpAdaptiveResultLayout.kt

@@ -25,7 +25,7 @@ import com.plcoding.core.designsystem.components.brand.ChirpBrandLogo
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.presentation.util.DeviceConfiguration
 import com.plcoding.core.presentation.util.currentDeviceConfiguration
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpAdaptiveResultLayout(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/layouts/ChirpSimpleResultLayout.kt

@@ -19,7 +19,7 @@ import com.plcoding.core.designsystem.components.buttons.ChirpButton
 import com.plcoding.core.designsystem.components.buttons.ChirpButtonStyle
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpSimpleResultLayout(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/layouts/ChirpSurface.kt

@@ -19,11 +19,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import chirp.core.designsystem.generated.resources.Res
-import chirp.core.designsystem.generated.resources.logo_chirp
+import com.plcoding.core.designsystem.Res
+import com.plcoding.core.designsystem.logo_chirp
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import org.jetbrains.compose.resources.vectorResource
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpSurface(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/textfields/ChirpMultiLineTextField.kt

@@ -32,7 +32,7 @@ import androidx.compose.ui.unit.dp
 import com.plcoding.core.designsystem.components.buttons.ChirpButton
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpMultiLineTextField(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/textfields/ChirpPasswordTextField.kt

@@ -23,16 +23,16 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
-import chirp.core.designsystem.generated.resources.Res
-import chirp.core.designsystem.generated.resources.eye_icon
-import chirp.core.designsystem.generated.resources.eye_off_icon
-import chirp.core.designsystem.generated.resources.hide_password
-import chirp.core.designsystem.generated.resources.show_password
+import com.plcoding.core.designsystem.Res
+import com.plcoding.core.designsystem.eye_icon
+import com.plcoding.core.designsystem.eye_off_icon
+import com.plcoding.core.designsystem.hide_password
+import com.plcoding.core.designsystem.show_password
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
 import org.jetbrains.compose.resources.stringResource
 import org.jetbrains.compose.resources.vectorResource
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpPasswordTextField(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/components/textfields/ChirpTextField.kt

@@ -31,7 +31,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.plcoding.core.designsystem.theme.ChirpTheme
 import com.plcoding.core.designsystem.theme.extended
-import org.jetbrains.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun ChirpTextField(

core/designsystem/src/commonMain/kotlin/com/plcoding/core/designsystem/theme/Type.kt

@@ -6,12 +6,12 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import chirp.core.designsystem.generated.resources.Res
-import chirp.core.designsystem.generated.resources.plusjakartasans_bold
-import chirp.core.designsystem.generated.resources.plusjakartasans_light
-import chirp.core.designsystem.generated.resources.plusjakartasans_medium
-import chirp.core.designsystem.generated.resources.plusjakartasans_regular
-import chirp.core.designsystem.generated.resources.plusjakartasans_semibold
+import com.plcoding.core.designsystem.Res
+import com.plcoding.core.designsystem.plusjakartasans_bold
+import com.plcoding.core.designsystem.plusjakartasans_light
+import com.plcoding.core.designsystem.plusjakartasans_medium
+import com.plcoding.core.designsystem.plusjakartasans_regular
+import com.plcoding.core.designsystem.plusjakartasans_semibold
 import org.jetbrains.compose.resources.Font
 
 val PlusJakartaSans @Composable get() = FontFamily(