From e47810f0ca49388f925bf8cb8549853cfd497ecd Mon Sep 17 00:00:00 2001 From: BinTianqi Date: Tue, 7 May 2024 21:31:14 +0800 Subject: [PATCH] use gradle version catalog update org.jetbrains.kotlin.android to 1.9.23 --- app/build.gradle.kts | 22 +++++++++++----------- build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 25 +++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 328097c..44300dd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.android.application") - id("org.jetbrains.kotlin.android") + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) } android { @@ -47,7 +47,7 @@ android { aidl = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.1" + kotlinCompilerExtensionVersion = "1.5.13" } packaging { resources { @@ -64,12 +64,12 @@ android { } dependencies { - implementation("androidx.activity:activity-compose:1.8.2") - implementation("androidx.compose.ui:ui") - implementation("androidx.compose.ui:ui-graphics") - implementation("com.google.accompanist:accompanist-drawablepainter:0.35.0-alpha") - implementation("androidx.compose.material3:material3:1.2.1") - implementation("androidx.navigation:navigation-compose:2.7.7") - implementation("dev.rikka.shizuku:provider:13.1.5") - implementation("dev.rikka.shizuku:api:13.1.5") + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.accompanist.drawablepainter) + implementation(libs.androidx.material3) + implementation(libs.androidx.navigation.compose) + implementation(libs.shizuku.provider) + implementation(libs.shizuku.api) } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 075a54a..922f551 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.9.0" apply false + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin.android) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..58301ad --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,25 @@ +[versions] +agp = "8.4.0" +kt-android = "1.9.23" + +androidx-activity-compose = "1.8.2" +navigation-compose = "2.7.7" +material3 = "1.2.1" +accompanist-drawablepainter = "0.35.0-alpha" +shizuku = "13.1.5" + +[libraries] +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } +androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" } +androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" } +androidx-ui-graphics = { module = "androidx.compose.ui:ui-graphics" } +androidx-ui = { module = "androidx.compose.ui:ui" } + +accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist-drawablepainter" } + +shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizuku" } +shizuku-api = { module = "dev.rikka.shizuku:api", version.ref = "shizuku" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kt-android" }