From e4afe68baa3212ba86f7e442c8e98581549caacb Mon Sep 17 00:00:00 2001 From: Abdourahamane Boinaidi Date: Fri, 20 Sep 2024 09:53:50 +0200 Subject: [PATCH 1/2] Update libs --- gradle/libs.versions.toml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 229e2ca7e..75f87ca6f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -activityCompose = "1.9.1" -adaptiveLayout = "1.0.0-rc01" -agp = "8.5.2" -composeBom = "2024.08.00" +activityCompose = "1.9.2" +adaptiveLayout = "1.0.0" +agp = "8.6.1" +composeBom = "2024.09.02" constraintlayoutCompose = "1.0.1" coreKtx = "1.13.1" hilt = "2.52" @@ -10,9 +10,8 @@ hiltNavigationCompose = "1.2.0" junit = "4.13.2" junitVersion = "1.2.1" kotlin = "2.0.20" -lifecycleRuntimeKtx = "2.8.4" -material3Beta = "1.3.0-rc01" -navigation = "2.8.0-rc01" +lifecycleRuntimeKtx = "2.8.6" +navigation = "2.8.1" serialization = "1.7.1" swisstransfer = "0.1.1" @@ -22,12 +21,11 @@ androidx-adaptive = { module = "androidx.compose.material3.adaptive:adaptive", v androidx-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "adaptiveLayout" } androidx-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version.ref = "adaptiveLayout" } androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayoutCompose" } -swisstransfer-core = { module = "com.github.Infomaniak.multiplatform-SwissTransfer:STCore", version.ref = "swisstransfer" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } compose-material3 = { group = "androidx.compose.material3", name = "material3" } -compose-material3-adaptative-navigation = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite", version.ref = "material3Beta" } +compose-material3-adaptative-navigation = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite" } compose-ui = { group = "androidx.compose.ui", name = "ui" } compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } @@ -37,6 +35,7 @@ hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", ve hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationCompose" } kotlinx-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" } +swisstransfer-core = { module = "com.github.Infomaniak.multiplatform-SwissTransfer:STCore", version.ref = "swisstransfer" } # Tests androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } junit = { group = "junit", name = "junit", version.ref = "junit" } From 24535e00b69c2727bddb75309ff6a5c7b70de4c6 Mon Sep 17 00:00:00 2001 From: Abdourahamane Boinaidi Date: Fri, 20 Sep 2024 10:58:07 +0200 Subject: [PATCH 2/2] Add temporary compose alpha --- app/build.gradle.kts | 1 + gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a4c75305b..19b93c19e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -72,6 +72,7 @@ dependencies { // Compose implementation(libs.androidx.activity.compose) implementation(platform(libs.compose.bom)) + implementation(libs.compose.foundation) //TODO: To be removed when compose 1.8.0 is stable implementation(libs.compose.ui) implementation(libs.compose.ui.graphics) implementation(libs.compose.material3) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75f87ca6f..5c95d1969 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,6 +2,7 @@ activityCompose = "1.9.2" adaptiveLayout = "1.0.0" agp = "8.6.1" +composeAlpha = "1.8.0-alpha02" composeBom = "2024.09.02" constraintlayoutCompose = "1.0.1" coreKtx = "1.13.1" @@ -24,6 +25,7 @@ androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constr androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeAlpha" } #TODO: To be removed when compose 1.8.0 is stable compose-material3 = { group = "androidx.compose.material3", name = "material3" } compose-material3-adaptative-navigation = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite" } compose-ui = { group = "androidx.compose.ui", name = "ui" }