From c63ca8c1da20bb8d749842deb61753191757b73d Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Sun, 8 Sep 2024 21:23:38 +0300 Subject: [PATCH] deps: Update --- gradle/libs.versions.toml | 50 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 24c4e36..2a43bda 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,28 +1,26 @@ [versions] acraHttp = "5.11.3" -agp = "8.3.1" -coilCompose = "2.6.0" -compose = "2.5.0" +agp = "8.5.2" +calendar = "2.5.4" +coilCompose = "2.7.0" +compose = "1.6.4" # Updating this will cause an error! coreSplashscreen = "1.0.1" -datastorePreferences = "1.0.0" -desugar_jdk_libs = "2.0.4" +datastorePreferences = "1.1.1" +desugar_jdk_libs = "2.1.2" kotlin = "1.9.0" -coreKtx = "1.12.0" -junitVersion = "1.1.5" -espressoCore = "3.5.1" -ktor = "2.3.9" -ktorClientLogging = "2.3.9" -lifecycleRuntimeKtx = "2.7.0" -activityCompose = "1.8.2" -composeBom = "2024.03.00" -appcompat = "1.6.1" -material = "1.11.0" -annotation = "1.7.1" +coreKtx = "1.13.1" +junitVersion = "1.2.1" +espressoCore = "3.6.1" +ktor = "2.3.12" +lifecycle = "2.8.5" +activityCompose = "1.9.2" +composeBom = "2024.03.00" # Updating this will cause an error! +appcompat = "1.7.0" +material = "1.12.0" +annotation = "1.8.2" constraintlayout = "2.1.4" -lifecycleLivedataKtx = "2.7.0" -lifecycleViewmodelKtx = "2.7.0" -activity = "1.8.2" -navigationCompose = "2.7.7" +activity = "1.9.2" +navigationCompose = "2.7.7" # Updating this will cause an error! roomRuntime = "2.6.1" secretsGradlePlugin = "2.0.1" splittiesFunPackAndroidBaseWithViewsDsl = "3.0.0" @@ -38,30 +36,30 @@ androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomRuntime" } androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "roomRuntime" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" } -compose = { module = "com.kizitonwose.calendar:compose", version.ref = "compose" } +compose = { module = "com.kizitonwose.calendar:compose", version.ref = "calendar" } desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } androidx-ui = { group = "androidx.compose.ui", name = "ui" } androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version = "1.6.4" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "compose" } androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-material3 = { group = "androidx.compose.material3", name = "material3" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktor" } ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } -ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktorClientLogging" } +ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "annotation" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } -androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycleLivedataKtx" } -androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" } +androidx-lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" } androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" } secrets-gradle-plugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secretsGradlePlugin" } splitties-funpack-android-base-with-views-dsl = { module = "com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl", version.ref = "splittiesFunPackAndroidBaseWithViewsDsl" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b0266e6..c66b25b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Mar 16 18:30:45 MSK 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists