# HG changeset patch # User Da Risk # Date 1745780443 14400 # Node ID 0310a4e8f810da98d25f539aa1ff92d0dfbfb08e # Parent 3377ea7d1f03f92fc86bb08af9c0fa7df13ec043 build: update compose multiplatform diff -r 3377ea7d1f03 -r 0310a4e8f810 gradle/libs.versions.toml --- a/gradle/libs.versions.toml Thu Apr 24 18:15:22 2025 -0400 +++ b/gradle/libs.versions.toml Sun Apr 27 15:00:43 2025 -0400 @@ -21,7 +21,7 @@ [versions] android-gradle-plugin = "8.9.2" org-jetbrains-kotlin = "2.1.20" -org-jetbrains-compose-multiplatform = "1.7.3" +org-jetbrains-compose-multiplatform = "1.8.0-rc01" # rc for adaptive junit = "4.13.2" androidx-test-ext-junit = "1.2.1" espresso-core = "3.6.1" @@ -31,11 +31,14 @@ kotlinx-serialization = "1.8.1" androidx-activity = "1.10.1" androidx-navigation = "2.8.9" -androidx-compose-bom = "2025.04.00" +androidx-compose-bom = "2025.04.01" androidx-lifecycle = "2.8.7" -org-jetbrains-androidx-lifecycle = "2.8.4" -org-jetbrains-androidx-navigation = "2.8.0-alpha11" +org-jetbrains-androidx-lifecycle = "2.9.0-alpha07" +org-jetbrains-androidx-core-uri = "1.1.0-alpha03" +org-jetbrains-androidx-navigation = "2.9.0-alpha17" +org-jetbrains-androidx-compose-material3-adaptive-navigation = "1.1.0-rc01" org-jetbrains-compose-material-icons-core = "1.7.3" +org-jetbrains-compose-ui = "1.8.0-rc01" geekdroid = "geekttrss-1.6.7" @@ -52,6 +55,7 @@ androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref="androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } +org-jetbrains-androidx-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "org-jetbrains-androidx-lifecycle" } org-jetbrains-androidx-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "org-jetbrains-androidx-lifecycle" } org-jetbrains-androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "org-jetbrains-androidx-lifecycle" } androidx-activity = { module = "androidx.activity:activity-ktx", version.ref="androidx-activity" } @@ -65,6 +69,9 @@ androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core" } org-jetbrains-compose-material-icons-core = { module = "org.jetbrains.compose.material:material-icons-core", version.ref = "org-jetbrains-compose-material-icons-core" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } +org-jetbrains-androidx-compose-material3-adaptive-navigation = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation", version.ref = "org-jetbrains-androidx-compose-material3-adaptive-navigation" } +org-jetbrains-compose-ui-backhandler = { module = "org.jetbrains.compose.ui:ui-backhandler", version.ref = "org-jetbrains-compose-ui"} + androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" } androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } @@ -74,6 +81,8 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } +org-jetbrains-androidx-core-uri = { module = "org.jetbrains.androidx.core:core-uri", version.ref = "org-jetbrains-androidx-core-uri" } + [plugins] com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } diff -r 3377ea7d1f03 -r 0310a4e8f810 ui/common/build.gradle.kts --- a/ui/common/build.gradle.kts Thu Apr 24 18:15:22 2025 -0400 +++ b/ui/common/build.gradle.kts Sun Apr 27 15:00:43 2025 -0400 @@ -56,6 +56,7 @@ sourceSets { commonMain.dependencies { implementation(project(":core")) + api(libs.org.jetbrains.androidx.lifecycle.runtime.compose) api(libs.org.jetbrains.androidx.lifecycle.viewmodel) api(compose.components.resources) implementation(compose.runtime) diff -r 3377ea7d1f03 -r 0310a4e8f810 ui/material2/build.gradle.kts --- a/ui/material2/build.gradle.kts Thu Apr 24 18:15:22 2025 -0400 +++ b/ui/material2/build.gradle.kts Sun Apr 27 15:00:43 2025 -0400 @@ -61,6 +61,7 @@ implementation(compose.components.resources) implementation(libs.org.jetbrains.compose.material.icons.core) implementation(libs.org.jetbrains.androidx.navigation.compose) + implementation(libs.org.jetbrains.androidx.core.uri) } androidMain.dependencies { diff -r 3377ea7d1f03 -r 0310a4e8f810 ui/material3/build.gradle.kts --- a/ui/material3/build.gradle.kts Thu Apr 24 18:15:22 2025 -0400 +++ b/ui/material3/build.gradle.kts Sun Apr 27 15:00:43 2025 -0400 @@ -60,13 +60,18 @@ implementation(compose.material3) implementation(libs.org.jetbrains.compose.material.icons.core) implementation(compose.components.resources) + implementation(compose.components.uiToolingPreview) implementation(libs.org.jetbrains.androidx.navigation.compose) + implementation(libs.org.jetbrains.androidx.core.uri) + implementation(libs.org.jetbrains.androidx.compose.material3.adaptive.navigation) + implementation(libs.org.jetbrains.compose.ui.backhandler) } androidMain.dependencies { api(libs.androidx.activity) implementation(dependencies.platform(libs.androidx.compose.bom)) implementation(libs.androidx.activity.compose) + implementation(libs.androidx.compose.ui.tooling) } } }