Skip to content

Commit 9deaf54

Browse files
committed
chore(deps): replace deprecated Compose imports with JetBrains Compose dependencies
1 parent 89ae386 commit 9deaf54

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

build-plugin/plugin/src/main/kotlin/net/thunderbird/gradle/plugin/app/kmp/compose/AppKmpComposePlugin.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ class AppKmpComposePlugin : Plugin<Project> {
7777
implementation(libs.bundles.shared.kmp.common)
7878
implementation(libs.bundles.shared.kmp.compose)
7979

80-
implementation(compose.runtime)
81-
implementation(compose.foundation)
82-
implementation(compose.ui)
83-
implementation(compose.components.resources)
84-
implementation(compose.components.uiToolingPreview)
80+
implementation(libs.jetbrains.compose.runtime)
81+
implementation(libs.jetbrains.compose.foundation)
82+
implementation(libs.jetbrains.compose.ui)
83+
implementation(libs.jetbrains.compose.components.resources)
84+
implementation(libs.jetbrains.compose.components.ui.preview)
8585
}
8686

8787
commonTest.dependencies {

build-plugin/plugin/src/main/kotlin/net/thunderbird/gradle/plugin/library/kmp/compose/LibraryKmpComposePlugin.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ class LibraryKmpComposePlugin : Plugin<Project> {
6666
implementation(libs.bundles.shared.kmp.common)
6767
implementation(libs.bundles.shared.kmp.compose)
6868

69-
implementation(compose.runtime)
70-
implementation(compose.foundation)
71-
implementation(compose.ui)
72-
implementation(compose.components.resources)
73-
implementation(compose.components.uiToolingPreview)
69+
implementation(libs.jetbrains.compose.runtime)
70+
implementation(libs.jetbrains.compose.foundation)
71+
implementation(libs.jetbrains.compose.ui)
72+
implementation(libs.jetbrains.compose.components.resources)
73+
implementation(libs.jetbrains.compose.components.ui.preview)
7474
}
7575

7676
commonTest.dependencies {

gradle/libs.versions.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ tb-versioning = { id = "net.thunderbird.gradle.plugin.versioning" }
6262
[libraries]
6363
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidXActivity" }
6464
detekt-plugin-compose = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektPluginCompose" }
65+
jetbrains-compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" }
66+
jetbrains-compose-components-ui-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "composeMultiplatform" }
67+
jetbrains-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" }
6568
jetbrains-compose-lifecycle-runtime = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "jetbrainsComposeLifecycle" }
6669
jetbrains-compose-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "jetbrainsComposeLifecycle" }
6770
jetbrains-compose-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "jetbrainsComposeLifecycle" }
6871
jetbrains-compose-lifecycle-viewmodel-savedstate = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "jetbrainsComposeLifecycle" }
72+
jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" }
73+
jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" }
6974
konsist = { module = "com.lemonappdev:konsist", version.ref = "konsist" }
7075
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlinBom" }
7176
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }

0 commit comments

Comments
 (0)