From d3bc03cf28520c18ab6efea254a22d64d8ce7de0 Mon Sep 17 00:00:00 2001 From: Raph Date: Mon, 12 Aug 2024 18:16:01 +0200 Subject: [PATCH] feature: Clean gradle --- composeApp/build.gradle.kts | 5 +++-- gradle/libs.versions.toml | 9 ++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 018a8b4..45ee67d 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -91,9 +91,10 @@ kotlin { implementation(libs.ktor.contentnegociation) implementation(libs.ktor.logging) - implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.0") - implementation("org.jetbrains.androidx.navigation:navigation-compose:2.7.0-alpha07") + implementation(libs.kotlin.lifecycle.viewmodel) + implementation(libs.kotlin.navigation.compose) } + iosMain.dependencies { implementation(libs.ktor.darwin) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cb58b17..beedc31 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,14 +7,16 @@ compose-compiler = "1.5.4" compose-material3 = "1.2.1" connectivity = "1.1.0" androidx-activityCompose = "1.9.0" +lifecycleViewmodel = "2.8.0" lorraine = "0.0.1" android-compileSdk = "34" android-minSdk = "24" android-targetSdk = "34" +navigationCompose = "2.7.0-alpha07" [libraries] -kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" } + compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } @@ -25,6 +27,8 @@ connectivity-core = { module = "dev.jordond.connectivity:connectivity-core", ver connectivity-device = { module = "dev.jordond.connectivity:connectivity-device", version.ref = "connectivity" } connectivity-apple = { module = "dev.jordond.connectivity:connectivity-apple", version.ref = "connectivity" } +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } + ktor-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" } ktor-serializarion = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor"} ktor-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" } @@ -32,6 +36,9 @@ ktor-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "k ktor-darwin = { group = "io.ktor", name = "ktor-client-darwin", version.ref = "ktor" } ktor-contentnegociation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor"} +kotlin-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycleViewmodel" } +kotlin-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigationCompose" } + lorraine = { module = "fr.dot.lorraine:lorraine", version.ref = "lorraine" } [plugins]