From 0c6e620c3f091cb8d276e36c05f750170b0933f2 Mon Sep 17 00:00:00 2001 From: Antoine Jaury Date: Thu, 11 Jun 2026 17:56:11 +0200 Subject: [PATCH] config: clean-up dependencies --- gradle/libs.versions.toml | 37 +++++++++++++------------------------ shared/build.gradle.kts | 7 +++++-- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5e8374e..330c628 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,47 +4,36 @@ androidCompileSdk = "36" androidMinSdk = "24" androidTargetSdk = "36" androidxActivity = "1.13.0" -androidxAppcompat = "1.7.1" -androidxCore = "1.18.0" -androidxEspresso = "3.7.0" +androidxCore = "1.19.0" androidxLifecycle = "2.11.0-beta01" -androidxTestExt = "1.3.0" navigation3 = "1.1.1" -composeMultiplatform = "1.11.0" -junit = "4.13.2" -kotlin = "2.3.21" -kotlinWrappers = "2026.5.5" +composeMultiplatform = "1.11.1" +kotlin = "2.4.0" +kotlinWrappers = "2026.6.3" kotlinxCoroutines = "1.11.0" kotlinSerialization = "2.4.0" material3 = "1.11.0-alpha07" koin = "4.2.1" [libraries] -kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } -kotlin-testJunit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } -junit = { module = "junit:junit", version.ref = "junit" } -androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxCore" } -androidx-testExt-junit = { module = "androidx.test.ext:junit", version.ref = "androidxTestExt" } -androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidxEspresso" } -androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppcompat" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" } -compose-uiTooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "composeMultiplatform" } -androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" } -androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" } -androidx-lifecycle-viewmodelNavigation3 = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidxLifecycle" } -compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" } +compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" } compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" } compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "material3" } +compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" } compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" } -compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "composeMultiplatform" } +compose-uiTooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "composeMultiplatform" } compose-uiToolingPreview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "composeMultiplatform" } koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin" } -koin-core = { module = "io.insert-koin:koin-core" } -koin-core-viewmodel = { module = "io.insert-koin:koin-core-viewmodel" } koin-compose = { module = "io.insert-koin:koin-compose" } koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel" } -koin-android = { module = "io.insert-koin:koin-android" } +koin-core = { module = "io.insert-koin:koin-core" } +koin-core-viewmodel = { module = "io.insert-koin:koin-core-viewmodel" } +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } kotlinx-coroutinesSwing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinxCoroutines" } +lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" } +lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" } +lifecycle-viewmodelNavigation3 = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidxLifecycle" } navigation3 = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "navigation3" } wrappers-browser = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser", version.ref = "kotlinWrappers" } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 404853b..732c2b4 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -64,8 +64,11 @@ kotlin { implementation(libs.compose.ui) implementation(libs.compose.components.resources) implementation(libs.compose.uiToolingPreview) - implementation(libs.androidx.lifecycle.viewmodelCompose) - implementation(libs.androidx.lifecycle.runtimeCompose) + + // Lifecycle + implementation(libs.lifecycle.viewmodelCompose) + implementation(libs.lifecycle.runtimeCompose) + implementation(libs.lifecycle.viewmodelNavigation3) // Navigation implementation(libs.navigation3)