Bump dependencies

androidApp/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   alias(libs.plugins.androidmakers.android.application)
   alias(libs.plugins.androidmakers.android.signing)
-  alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.jetbrains.compose)
   alias(libs.plugins.compose.compiler)
 }
 
@@ -49,9 +49,9 @@ dependencies {
   implementation(project(":shared:data"))
   testImplementation(libs.junit)
 
-  implementation(compose.material3)
-  implementation(compose.materialIconsExtended)
-  implementation(compose.uiTooling)
+  implementation(libs.jetbrains.compose.material3)
+  implementation(libs.jetbrains.compose.material.icons.extended)
+  implementation(libs.jetbrains.compose.ui.tooling)
   coreLibraryDesugaring(libs.desugar.jdk.libs)
 
   // Kotlin

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
   alias(libs.plugins.google.services) apply false
   alias(libs.plugins.kmp) apply false
   alias(libs.plugins.crashlytics) apply false
-  alias(libs.plugins.jetbrainsCompose) apply false
+  alias(libs.plugins.jetbrains.compose) apply false
   alias(libs.plugins.compose.compiler) apply false
   alias(libs.plugins.kotlin.serialization) apply false
   alias(libs.plugins.detekt)

desktopApp/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
   alias(libs.plugins.kmp)
-  alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.jetbrains.compose)
   alias(libs.plugins.compose.compiler)
 }
 

gradle.properties

@@ -1,8 +1,3 @@
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4g
-kotlin.mpp.androidSourceSetLayoutVersion=2
-#org.gradle.configuration-cache=true
 org.gradle.caching=true
-# See https://youtrack.jetbrains.com/issue/KT-75807/CMP-caching-fails-for-iOS-with-Kotlin-2.1.20-RC2
-kotlin.native.cacheKind=none
-compose.kotlin.native.manageCacheKind=false

gradle/libs.versions.toml

@@ -4,39 +4,39 @@ sdk-compile = "36"
 sdk-min = "24"
 androidDesugarJdkLibs = "2.1.5"
 detekt = "1.23.8"
-androidGradlePlugin = "9.0.1"
-androidx-activity = "1.12.4"
-androidx-core = "1.17.0"
+androidGradlePlugin = "9.1.0"
+androidx-activity = "1.13.0"
+androidx-core = "1.18.0"
 androidx-core-splashscreen = "1.2.0"
 androidx-credentials = "1.5.0"
-androidx-datastore = "1.2.0"
-androidx-lifecycle = "2.8.7"    # Used by the Wear OS app only
-androidx-wear-compose = "1.4.1"
+androidx-datastore = "1.2.1"
+androidx-lifecycle = "2.10.0"    # Used by the Wear OS app only
+androidx-wear-compose = "1.5.6"
 apollo = "4.4.2"
 apollo-adapters = "0.7.0"
 apollo-cache = "1.0.0"
-coil = "3.1.0"
-compose = "1.7.8"                # Used by the Wear OS app only
+coil = "3.4.0"
+compose = "1.10.5"                # Used by the Wear OS app only
+compose-material-icons-extended = "1.7.8"
 crashlytics-plugin = "3.0.6"
 firebase-auth = "2.4.0"
 firebase-bom = "34.10.0"
 google-services-plugin = "4.4.4"
 googleid = "1.2.0"
 horologist = "0.7.15"
-jetbrainsCompose = "1.11.0-alpha03"
-jetbrainsLifecycle = "2.10.0-alpha08"
-# if you update this, you probably need to update all other compose dependencies
-# see https://youtrack.jetbrains.com/issue/CMP-7571
-material3-adaptive-nav3 = "1.3.0-alpha05"
-nav3-ui = "1.1.0-alpha03"
+jetbrains-compose = "1.11.0-alpha04"
+jetbrains-lifecycle = "2.10.0-beta01"
+jetbrains-material3-adaptive-nav3 = "1.3.0-alpha06"
+jetbrains-compose-material-icons-extended = "1.7.3"
+nav3-ui = "1.1.0-alpha04"
 junit = "4.13.2"
 koin = "4.1.1"
-kotlin = "2.3.10"
+kotlin = "2.3.20"
 kotlinx-coroutines = "1.10.2"
 kotlinx-datetime = "0.7.1"
 ktor = "3.4.1"
 okhttp = "5.3.2"
-okio = "3.16.4"
+okio = "3.17.0"
 openfeedback = "1.0.0-alpha.6"
 playServices-auth = "21.5.1"
 playServices-wearable = "19.0.0"
@@ -56,17 +56,24 @@ apollo-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.r
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
 coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 coil-network-ktor3 = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" }
-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "compose" }
-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 firebase-auth = { module = "dev.gitlive:firebase-auth", version.ref = "firebase-auth" }
 firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebase-bom" }
 firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
 firebase-messaging = { module = "com.google.firebase:firebase-messaging" }
+
 googleid = { group = "com.google.android.libraries.identity.googleid", name = "googleid", version.ref = "googleid" }
-jetbrains-lifecycle-runtime = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime", version.ref = "jetbrainsLifecycle" }
-jetbrains-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "jetbrainsLifecycle" }
-jetbrains-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "jetbrainsLifecycle" }
-jetbrains-material3-adaptive-navigation3 = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation3", version.ref = "material3-adaptive-nav3" }
+jetbrains-lifecycle-runtime = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime", version.ref = "jetbrains-lifecycle" }
+jetbrains-lifecycle-runtime-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "jetbrains-lifecycle" }
+jetbrains-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "jetbrains-lifecycle" }
+jetbrains-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "jetbrains-compose" }
+jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "jetbrains-compose" }
+jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "jetbrains-compose" }
+jetbrains-compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "jetbrains-compose" }
+jetbrains-compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "jetbrains-compose" }
+jetbrains-compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "jetbrains-compose" }
+jetbrains-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jetbrains-compose" }
+jetbrains-compose-material3-adaptive-navigation3 = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation3", version.ref = "jetbrains-material3-adaptive-nav3" }
+jetbrains-compose-material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version.ref = "jetbrains-compose-material-icons-extended" }
 jetbrains-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "nav3-ui" }
 junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -102,6 +109,8 @@ wear-compose-material = { module = "androidx.wear.compose:compose-material", ver
 wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" }
 wear-compose-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "androidx-wear-compose" }
 wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "androidx-wear-compose" }
+compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "compose-material-icons-extended" }
+compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" }
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
 horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" }
@@ -115,9 +124,8 @@ apollo = { id = "com.apollographql.apollo", version.ref = "apollo" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics-plugin" }
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services-plugin" }
-jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "jetbrainsCompose" }
+jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
 kmp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

shared/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   alias(libs.plugins.androidmakers.kmp.library)
-  alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.jetbrains.compose)
   alias(libs.plugins.compose.compiler)
 }
 
@@ -38,7 +38,7 @@ kotlin {
       api(project(":shared:ui"))
       api(project(":shared:domain"))
       api(project(":shared:di"))
-      implementation(compose.runtime)
+      implementation(libs.jetbrains.compose.runtime)
     }
   }
 }

shared/ui/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   alias(libs.plugins.androidmakers.kmp.library)
-  alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.jetbrains.compose)
   alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlin.serialization)
 }
@@ -13,15 +13,15 @@ kotlin {
 
   sourceSets {
     commonMain.dependencies {
-      implementation(compose.runtime)
-      implementation(compose.foundation)
-      implementation(compose.ui)
-      implementation("org.jetbrains.compose.material3:material3:1.11.0-alpha03")
-      implementation(compose.materialIconsExtended)
-      implementation(compose.components.resources)
-      implementation(compose.components.uiToolingPreview)
+      implementation(libs.jetbrains.compose.runtime)
+      implementation(libs.jetbrains.compose.foundation)
+      implementation(libs.jetbrains.compose.ui)
+      implementation(libs.jetbrains.compose.material3)
+      implementation(libs.jetbrains.compose.material.icons.extended)
+      implementation(libs.jetbrains.compose.components.resources)
+      implementation(libs.jetbrains.compose.ui.tooling.preview)
       implementation(libs.coil.compose)
-      implementation(libs.jetbrains.material3.adaptive.navigation3)
+      implementation(libs.jetbrains.compose.material3.adaptive.navigation3)
       implementation(libs.jetbrains.navigation3.ui)
       implementation(libs.jetbrains.lifecycle.runtime.compose)
       implementation(libs.jetbrains.lifecycle.viewmodel.compose)

shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaColumn.kt

@@ -17,9 +17,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.androidmakers.ui.model.UISession
-import org.jetbrains.compose.ui.tooling.preview.Preview
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable

shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaLayout.kt

@@ -26,6 +26,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.androidmakers.ui.common.EmojiUtils
@@ -47,7 +48,6 @@ import fr.paug.androidmakers.ui.rooms
 import fr.paug.androidmakers.ui.tags
 import kotlinx.datetime.todayIn
 import org.jetbrains.compose.resources.stringResource
-import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.koin.compose.viewmodel.koinViewModel
 import kotlin.time.Clock
 

shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaRow.kt

@@ -25,6 +25,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.androidmakers.ui.common.EmojiUtils
 import com.androidmakers.ui.model.UISession
@@ -35,7 +36,6 @@ import fr.paug.androidmakers.ui.Res
 import fr.paug.androidmakers.ui.session_app_clinic_apply
 import kotlinx.datetime.Instant
 import org.jetbrains.compose.resources.stringResource
-import org.jetbrains.compose.ui.tooling.preview.Preview
 import kotlin.time.Duration.Companion.hours
 
 @Composable

shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/SessionDetailLayout.kt

@@ -64,6 +64,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.Hyphens
 import androidx.compose.ui.text.style.LineBreak
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -103,7 +104,6 @@ import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.pluralStringResource
 import org.jetbrains.compose.resources.stringResource
-import org.jetbrains.compose.ui.tooling.preview.Preview
 import kotlin.time.Clock
 import kotlin.time.Duration
 

shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/AVALayout.kt

@@ -360,7 +360,7 @@ private fun AVANavDisplay(
 
     NavDisplay(
       entries = navigationState.toDecoratedEntries(entryProvider),
-      sceneStrategy = listDetailStrategy,
+      sceneStrategies = listOf(listDetailStrategy),
       onBack = { navigator.goBack() }
     )
   }

wearApp/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
   alias(libs.plugins.android.application)
   alias(libs.plugins.google.services)
   alias(libs.plugins.androidmakers.android.signing)
-  alias(libs.plugins.jetbrainsCompose)
+  alias(libs.plugins.jetbrains.compose)
   alias(libs.plugins.compose.compiler)
 }