From 9d6094173d92e62220f6f86b7a3df9235e03e13b Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Wed, 17 Jul 2024 17:28:06 +0800 Subject: [PATCH] Build(Gradle): Upgrade dependencies --- app/build.gradle.kts | 1 + build.gradle.kts | 1 + gradle/libs.versions.toml | 33 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 99b93ff..aaf8e28 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,6 +4,7 @@ import com.mikepenz.aboutlibraries.plugin.AboutLibrariesTask plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.jetbrainsKotlinAndroid) + alias(libs.plugins.compose.compiler) alias(libs.plugins.ksp) alias(libs.plugins.aboutlibraries) alias(libs.plugins.hilt) diff --git a/build.gradle.kts b/build.gradle.kts index eec1b59..fce884e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,6 +2,7 @@ plugins { alias(libs.plugins.androidApplication) apply false alias(libs.plugins.jetbrainsKotlinAndroid) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.ksp) apply false alias(libs.plugins.aboutlibraries) apply false alias(libs.plugins.hilt) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 531bd50..814c6b7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,32 +1,32 @@ [versions] -agp = "8.4.0" -kotlin = "1.9.23" -ksp = "1.9.23-1.0.20" -aboutlibraries = "11.1.0" +agp = "8.5.1" +kotlin = "2.0.0" +ksp = "2.0.0-1.0.23" +aboutlibraries = "11.2.2" protobufPlugin = "0.9.4" -kotlinxSerialization = "1.9.23" +kotlinxSerialization = "2.0.0" secrets = "2.0.1" -paging = "3.2.1" +paging = "3.3.0" desugarJdkLibs = "2.0.4" -composeBom = "2024.05.00" +composeBom = "2024.06.00" junit = "4.13.2" coreKtx = "1.13.1" -junitVersion = "1.1.5" -espressoCore = "3.5.1" +junitVersion = "1.2.1" +espressoCore = "3.6.1" activityCompose = "1.9.0" -appcompat = "1.6.1" -androidxLifecycle = "2.7.0" +appcompat = "1.7.0" +androidxLifecycle = "2.8.3" androidxCoreSplashscreen = "1.0.1" -hilt = "2.51" +hilt = "2.51.1" coil = "2.6.0" -kotlinxDatetime = "0.5.0" +kotlinxDatetime = "0.6.0" androidxDataStore = "1.1.1" -protobuf = "3.25.2" +protobuf = "4.27.2" androidxNavigation = "2.7.7" androidxHiltNavigationCompose = "1.2.0" -kotlinxSerializationJson = "1.6.3" -retrofit = "2.9.0" +kotlinxSerializationJson = "1.7.1" +retrofit = "2.11.0" retrofitKotlinxSerializationJson = "1.0.0" okhttp = "4.12.0" androidsvg = "1.4" @@ -35,6 +35,7 @@ webviewCompose = "0.33.6" [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0cc0fca..3376a9d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ #Sat Mar 09 10:57:35 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME