Clean up version catalog

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Goooler <10363352+Goooler@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>

Author: Copilot

app/build.gradle.kts

@@ -18,14 +18,13 @@ dependencies {
 
     implementation(libs.kotlin.coroutine)
     implementation(libs.androidx.core)
-    implementation(libs.androidx.activity)
+    implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.fragment)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.coordinator)
     implementation(libs.androidx.recyclerview)
     implementation(libs.google.material)
     implementation(libs.quickie.bundled)
-    implementation(libs.androidx.activity.ktx)
 }
 
 tasks.getByName("clean", type = Delete::class) {
@@ -68,4 +67,4 @@ afterEvaluate {
 
 tasks.getByName("clean", type = Delete::class) {
     delete(file(geoFilesDownloadDir))
-}
+}

design/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     implementation(libs.kotlin.coroutine)
     implementation(libs.androidx.core)
     implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.activity)
+    implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.coordinator)
     implementation(libs.androidx.recyclerview)
     implementation(libs.androidx.fragment)

gradle/libs.versions.toml

@@ -1,47 +1,35 @@
 [versions]
-agp = "8.13.2"
 kotlin = "2.3.10"
-ksp = "2.3.6"
-golang = "1.0.4"
-coroutine = "1.10.2"
-coreKtx = "1.17.0"
 activity = "1.12.4"
-fragment = "1.8.9"
-appcompat = "1.7.1"
-coordinator = "1.3.0"
-recyclerview = "1.4.0"
-viewpager = "1.1.0"
-material = "1.13.0"
-serialization = "1.10.0"
 kaidl = "1.15"
 room = "2.8.4"
-multiprocess = "1.0.0"
-quickie = "1.11.0"
-androidx-activity-ktx = "1.12.4"
+okhttp = "5.3.2"
 
 [libraries]
-build-android = { module = "com.android.tools.build:gradle", version.ref = "agp" }
+build-android = { module = "com.android.tools.build:gradle", version = "8.13.2" }
 build-kotlin-common = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 build-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
-build-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
-build-golang = { module = "com.github.kr328.golang:gradle-plugin", version.ref = "golang" }
-kotlin-coroutine = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutine" }
-kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
-androidx-core = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
-androidx-activity = { module = "androidx.activity:activity", version.ref = "activity" }
-androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "fragment" }
-androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
-androidx-coordinator = { module = "androidx.coordinatorlayout:coordinatorlayout", version.ref = "coordinator" }
-androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
-androidx-viewpager = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager" }
+build-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version = "2.3.6" }
+build-golang = { module = "com.github.kr328.golang:gradle-plugin", version = "1.0.4" }
+
+kotlin-coroutine = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.10.2" }
+kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.10.0" }
+
+androidx-core = { module = "androidx.core:core-ktx", version = "1.17.0" }
+androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activity" }
+androidx-fragment = { module = "androidx.fragment:fragment", version = "1.8.9" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
+androidx-coordinator = { module = "androidx.coordinatorlayout:coordinatorlayout", version = "1.3.0" }
+androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
+androidx-viewpager = { module = "androidx.viewpager2:viewpager2", version = "1.1.0" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
-google-material = { module = "com.google.android.material:material", version.ref = "material" }
+
+google-material = { module = "com.google.android.material:material", version = "1.13.0" }
 kaidl-compiler = { module = "com.github.kr328.kaidl:kaidl", version.ref = "kaidl" }
 kaidl-runtime = { module = "com.github.kr328.kaidl:kaidl-runtime", version.ref = "kaidl" }
-rikkax-multiprocess = { module = "dev.rikka.rikkax.preference:multiprocess", version.ref = "multiprocess" }
-quickie-bundled = { group = "io.github.g00fy2.quickie", name = "quickie-bundled", version.ref = "quickie" }
-androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity-ktx" }
-
-[plugins]
+rikkax-multiprocess = { module = "dev.rikka.rikkax.preference:multiprocess", version = "1.0.0" }
+quickie-bundled = { module = "io.github.g00fy2.quickie:quickie-bundled", version = "1.11.0" }
+okhttp-client = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+okhttp-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }

service/build.gradle.kts

@@ -19,11 +19,8 @@ dependencies {
     implementation(libs.androidx.room.ktx)
     implementation(libs.kaidl.runtime)
     implementation(libs.rikkax.multiprocess)
-    implementation(platform("com.squareup.okhttp3:okhttp-bom:5.3.2"))
-
-    // define any required OkHttp artifacts without version
-    implementation("com.squareup.okhttp3:okhttp")
-    implementation("com.squareup.okhttp3:logging-interceptor")
+    implementation(libs.okhttp.client)
+    implementation(libs.okhttp.interceptor)
 }
 
 afterEvaluate {
@@ -33,4 +30,4 @@ afterEvaluate {
             sourceSets[it.name].java.srcDir(buildDir.resolve("generated/ksp/${it.name}/java"))
         }
     }
-}
+}