From 7b597e37c1abf8f9f28b607b9280c9b33d035e77 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 16:11:24 -0600 Subject: [PATCH] chore(deps): update org.jetbrains.compose.runtime:runtime to v1.10.1 (#4514) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: James Rich <2199651+jamesarich@users.noreply.github.com> --- .../main/kotlin/AndroidApplicationComposeConventionPlugin.kt | 1 + .../src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt | 1 + .../main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt | 3 +++ gradle/libs.versions.toml | 5 ++--- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt index bb39b4e6f..276cb8c8f 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt @@ -28,6 +28,7 @@ class AndroidApplicationComposeConventionPlugin : Plugin { override fun apply(target: Project) { with(target) { apply(plugin = libs.plugin("compose-compiler").get().pluginId) + apply(plugin = libs.plugin("compose-multiplatform").get().pluginId) extensions.configure { configureAndroidCompose(this) } diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt index 051f6b13b..53526e734 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt @@ -28,6 +28,7 @@ class AndroidLibraryComposeConventionPlugin : Plugin { override fun apply(target: Project) { with(target) { apply(plugin = libs.plugin("compose-compiler").get().pluginId) + apply(plugin = libs.plugin("compose-multiplatform").get().pluginId) extensions.configure { configureAndroidCompose(this) } diff --git a/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt index cb8c13fc4..20944be9b 100644 --- a/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/org/meshtastic/buildlogic/AndroidCompose.kt @@ -40,6 +40,9 @@ internal fun Project.configureAndroidCompose( "runtimeOnly"(libs.library("androidx-compose-runtime-tracing")) "debugImplementation"(libs.library("androidx-compose-ui-tooling")) + "implementation"(libs.library("compose-multiplatform-runtime")) + "implementation"(libs.library("compose-multiplatform-resources")) + // Add Espresso explicitly to avoid version mismatch issues on newer Android versions "androidTestImplementation"(libs.library("androidx-test-espresso-core")) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24189798b..b412ee14c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,7 @@ mockk = "1.14.9" testRetry = "1.6.4" # Compose Multiplatform -compose-multiplatform = "1.10.0" +compose-multiplatform = "1.10.1" # Google hilt = "2.59.1" @@ -89,7 +89,6 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-compose androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "navigation" } androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" } androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" } -androidx-navigation3-viewmodel = { module = "androidx.navigation3:navigation3-viewmodel", version.ref = "navigation3" } androidx-paging-common = { module = "androidx.paging:paging-common", version.ref = "paging" } androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } @@ -232,7 +231,7 @@ android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform. # Jetbrains compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } -compose-multiplatform = { id = "org.jetbrains.compose", version = "1.10.0" } +compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }