Chore: Update dependencies

Signed-off-by: imknown <[email protected]>

Author: imknown

app/build.gradle.kts

@@ -192,59 +192,34 @@ dependencies {
     coreLibraryDesugaring(libsAndroid.desugarJdkLibs)
 
     // region [AndroidX]
-    implementation(libsAndroid.activity)
-
-    implementation(libsAndroid.annotation)
-    implementation(libsAndroid.annotation.experimental)
-
-    implementation(libsAndroid.appcompat)
-    implementation(libsAndroid.appcompat.resources)
-
-    implementation(libsAndroid.arch.core.common)
-    implementation(libsAndroid.arch.core.runtime)
-
+    implementation(libsAndroid.activity.ktx)
+    implementation(libsAndroid.bundles.annotation)
+    implementation(libsAndroid.bundles.appcompat)
+    implementation(libsAndroid.bundles.arch.core)
     implementation(libsAndroid.cardView)
-
     implementation(libsAndroid.constraintLayout)
-
     implementation(libsAndroid.coordinatorLayout)
-
-    implementation(libsAndroid.core)
-
-    implementation(libsAndroid.fragment)
-
-    implementation(libsAndroid.lifecycle.viewmodel)
-    implementation(libsAndroid.lifecycle.viewmodel.savedstate)
-
-    implementation(libsAndroid.preference)
-
+    implementation(libsAndroid.core.ktx)
+    implementation(libsAndroid.fragment.ktx)
+    implementation(libsAndroid.bundles.lifecycle)
+    implementation(libsAndroid.preference.ktx)
     implementation(libsAndroid.recyclerView)
-
-    implementation(libsAndroid.savedState)
-
+    implementation(libsAndroid.savedState.ktx)
     implementation(libsAndroid.swipeRefreshLayout)
     implementation(libsAndroid.webkit)
-    // endregion [AndroidX]
 
-    // region [Test]
-    testImplementation(libsAndroid.junit)
-    androidTestImplementation(libsAndroid.test.core)
-    androidTestImplementation(libsAndroid.test.espresso.core)
-    androidTestImplementation(libsAndroid.test.ext.junit)
-    // endregion [Test]
+    androidTestImplementation(libsAndroid.bundles.test)
+    // endregion [AndroidX]
 
     // region [Kotlin]
     implementation(libsKotlin.kotlinx.coroutines.android)
     implementation(libsKotlin.kotlinx.serialization.json)
 
-    implementation(libsKotlin.ktor.client.core)
-    implementation(libsKotlin.ktor.client.okhttp)
-    implementation(libsKotlin.ktor.client.logging)
+    implementation(libsKotlin.bundles.ktor.client)
     // endregion [Kotlin]
 
     // region [3rd Parties]
-    debugImplementation(libsThirdParty.leakCanary.android)
-    // implementation(libsThirdParty.leakCanary.plumber.android)
+    debugImplementation(libsThirdParty.bundles.leakCanary)
 
     implementation(libsThirdParty.versionCompare)
     // endregion [3rd Parties]
@@ -254,7 +229,6 @@ dependencies {
 
     val firebaseImplementation = IssueTracker.Firebase.name + "Implementation"
     firebaseImplementation(platform(libsGoogle.firebase.bom))
-    firebaseImplementation(libsGoogle.firebase.analytics)
-    firebaseImplementation(libsGoogle.firebase.crashlytics.ndk)
+    firebaseImplementation(libsGoogle.bundles.firebase)
     // endregion [Google]
 }

base/build.gradle.kts

@@ -45,18 +45,12 @@ dependencies {
     coreLibraryDesugaring(libsAndroid.desugarJdkLibs)
 
     // region [AndroidX]
-    // region [Test]
-    testImplementation(libsAndroid.junit)
-    androidTestImplementation(libsAndroid.test.core)
-    androidTestImplementation(libsAndroid.test.espresso.core)
-    androidTestImplementation(libsAndroid.test.ext.junit)
-    // endregion [Test]
+    androidTestImplementation(libsAndroid.bundles.test)
     // endregion [AndroidX]
 
     // region [3rd Parties]
     api(libsThirdParty.libsu)
 
-//    api(libsThirdParty.shizuku.api)
-//    api(libsThirdParty.shizuku.provider)
+//    api(libsThirdParty.bundles.shizuku)
     // endregion [3rd Parties]
 }

gradle/toml/android.toml

@@ -59,7 +59,6 @@ webkit = "1.13.0"
 
 # https://developer.android.com/jetpack/androidx/releases/test
 # region [Test]
-junit = "4.13.2"
 test-core = "1.6.1"
 test-espresso = "3.6.1"
 test-ext-junit = "1.2.1"
@@ -69,33 +68,53 @@ test-ext-junit = "1.2.1"
 [libraries]
 desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugarJdkLibs" }
 
-activity = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
+activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity" }
+
 annotation = { group = "androidx.annotation", name = "annotation", version.ref = "annotation" }
 annotation-experimental = { group = "androidx.annotation", name = "annotation-experimental", version.ref = "annotation-experimental" }
+
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 appcompat-resources = { group = "androidx.appcompat", name = "appcompat-resources", version.ref = "appcompat" }
+
 arch-core-common = { group = "androidx.arch.core", name = "core-common", version.ref = "arch-core" }
 arch-core-runtime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "arch-core" }
+
 cardView = { group = "androidx.cardview", name = "cardview", version.ref = "cardView" }
+
 constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" }
+
 coordinatorLayout = { group = "androidx.coordinatorlayout", name = "coordinatorlayout", version.ref = "coordinatorLayout" }
-core = { group = "androidx.core", name = "core-ktx", version.ref = "core" }
-fragment = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" }
-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
+
+core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core" }
+
+fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" }
+
+lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
+lifecycle-livedata-ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle" }
 lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" }
-preference = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference" }
+lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
+
+preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference" }
+
 recyclerView = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerView" }
-savedState = { group = "androidx.savedstate", name = "savedstate", version.ref = "savedState" }
+
+savedState-ktx = { group = "androidx.savedstate", name = "savedstate-ktx", version.ref = "savedState" }
+
 swipeRefreshLayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "swipeRefreshLayout" }
+
 webkit = { group = "androidx.webkit", name = "webkit", version.ref = "webkit" }
 
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-test-core = { group = "androidx.test", name = "core-ktx", version.ref = "test-core" }
+test-core-ktx = { group = "androidx.test", name = "core-ktx", version.ref = "test-core" }
 test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "test-espresso" }
-test-ext-junit = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "test-ext-junit" }
+test-ext-junit-ktx = { group = "androidx.test.ext", name = "junit-ktx", version.ref = "test-ext-junit" }
 
 [bundles]
+annotation = ["annotation", "annotation-experimental"]
+appcompat = ["appcompat", "appcompat-resources"]
+arch-core = ["arch-core-common", "arch-core-runtime"]
+lifecycle = ["lifecycle-viewmodel-ktx", "lifecycle-livedata-ktx", "lifecycle-runtime-ktx", "lifecycle-viewmodel-savedstate"]
+
+test = ["test-core-ktx", "test-espresso-core", "test-ext-junit-ktx"]
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

gradle/toml/google.toml

@@ -22,6 +22,7 @@ firebase-crashlytics-ndk = { group = "com.google.firebase", name = "firebase-cra
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
 [bundles]
+firebase = ["firebase-analytics", "firebase-crashlytics-ndk"]
 
 [plugins]
 googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices-gradlePlugin" }

gradle/toml/kotlin.toml

@@ -21,6 +21,7 @@ ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.r
 ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
 
 [bundles]
+ktor-client = ["ktor-client-core", "ktor-client-okhttp", "ktor-client-logging"]
 
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

gradle/toml/thirdParty.toml

@@ -23,5 +23,8 @@ shizuku-api = { group = "dev.rikka.shizuku", name = "api", version.ref = "shizuk
 shizuku-provider = { group = "dev.rikka.shizuku", name = "provider", version.ref = "shizuku" }
 
 [bundles]
+leakCanary = ["leakCanary-android"] # "leakCanary-plumber-android"
+
+shizuku = ["shizuku-api", "shizuku-provider"]
 
 [plugins]