Refactor dependencies catalog

app/build.gradle

@@ -18,8 +18,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdk = 21
 		targetSdk = 35
-		versionCode = 686
+		versionCode = 687
-		versionName = '7.7-a7'
+		versionName = '7.7-a8'
 		generatedDensities = []
 		testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
 		ksp {
@@ -121,21 +121,21 @@ dependencies {
 	implementation libs.kotlinx.coroutines.android
 	implementation libs.kotlinx.coroutines.guava
 
-	implementation libs.appcompat
+	implementation libs.androidx.appcompat
-	implementation libs.core.ktx
+	implementation libs.androidx.core
-	implementation libs.activity.ktx
+	implementation libs.androidx.activity
-	implementation libs.fragment.ktx
+	implementation libs.androidx.fragment
-	implementation libs.transition.ktx
+	implementation libs.androidx.transition
-	implementation libs.collection.ktx
+	implementation libs.androidx.collection
-	implementation libs.lifecycle.viewmodel.ktx
+	implementation libs.lifecycle.viewmodel
 	implementation libs.lifecycle.service
 	implementation libs.lifecycle.process
 	implementation libs.androidx.constraintlayout
 	implementation libs.androidx.swiperefreshlayout
 	implementation libs.androidx.recyclerview
 	implementation libs.androidx.viewpager2
-	implementation libs.androidx.preference.ktx
+	implementation libs.androidx.preference
-	implementation libs.androidx.biometric.ktx
+	implementation libs.androidx.biometric
 	implementation libs.material
 	implementation libs.androidx.lifecycle.common.java8
 	implementation libs.androidx.webkit
@@ -152,8 +152,8 @@ dependencies {
 	implementation libs.okhttp.dnsoverhttps
 	implementation libs.okio
 
-	implementation libs.adapterdelegates4.kotlin.dsl
+	implementation libs.adapterdelegates
-	implementation libs.adapterdelegates4.kotlin.dsl.viewbinding
+	implementation libs.adapterdelegates.viewbinding
 
 	implementation libs.hilt.android
 	kapt libs.hilt.compiler
@@ -165,9 +165,9 @@ dependencies {
 	implementation libs.coil.gif
 	implementation libs.coil.svg
 	implementation libs.avif.decoder
-	implementation libs.subsampling.scale.image.view
+	implementation libs.ssiv
 	implementation libs.disk.lru.cache
-	implementation libs.core
+	implementation libs.markwon
 
 	implementation libs.acra.http
 	implementation libs.acra.dialog
@@ -183,8 +183,8 @@ dependencies {
 
 	androidTestImplementation libs.androidx.runner
 	androidTestImplementation libs.androidx.rules
-	androidTestImplementation libs.androidx.core.ktx
+	androidTestImplementation libs.androidx.test.core
-	androidTestImplementation libs.androidx.junit.ktx
+	androidTestImplementation libs.androidx.junit
 
 	androidTestImplementation libs.kotlinx.coroutines.test
 

build.gradle

@@ -4,10 +4,11 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath libs.gradle
+		// https://github.com/gradle/gradle/issues/16958
-		classpath libs.kotlin.gradle.plugin
+		classpath "${libs.plugins.android.get()}"
-		classpath libs.hilt.android.gradle.plugin
+		classpath "${libs.plugins.kotlin.get()}"
-		classpath libs.symbol.processing.gradle.plugin
+		classpath "${libs.plugins.hilt.get()}"
+		classpath "${libs.plugins.ksp.get()}"
 	}
 }
 

gradle/libs.versions.toml

@@ -9,8 +9,8 @@ coil = "3.0.1"
 collections = "1.4.5"
 conscrypt = "2.5.3"
 constraintlayout = "2.2.0"
-core = "4.6.2"
 coreKtx = "1.15.0"
+coroutines = "1.9.0"
 desugar = "2.1.3"
 diskLruCache = "1.4"
 fragment = "1.8.5"
@@ -18,46 +18,49 @@ gradle = "8.7.2"
 guava = "33.3.1-android"
 hilt = "2.52"
 hiltWork = "1.2.0"
-junit = "4.13.2"
 json = "20240303"
+junit = "4.13.2"
 junitKtx = "1.2.1"
 kotlin = "2.0.21"
-coroutines = "1.9.0"
+kspPlugin = "2.0.21-1.0.27"
 leakcanary = "3.0-alpha-8"
 lifecycle = "2.8.7"
+markwon = "4.6.2"
 material = "1.12.0"
 moshi = "1.15.1"
 okhttp = "4.12.0"
 okio = "3.9.1"
-parsers = "8b4bac3cc2"
+parsers = "275d7f5419"
 preference = "1.2.1"
 recyclerview = "1.3.2"
 room = "2.6.1"
-runner = "1.6.2"
 rules = "1.6.1"
+runner = "1.6.2"
 ssiv = "d1d10a6975"
 swiperefreshlayout = "1.1.0"
-kspPlugin = "2.0.21-1.0.27"
 transition = "1.5.1"
 viewpager2 = "1.1.0"
 webkit = "1.12.1"
-workinspector = "5778dd1747"
 workRuntime = "2.10.0"
+workinspector = "5778dd1747"
 
 [libraries]
 acra-dialog = { module = "ch.acra:acra-dialog", version.ref = "acra" }
 acra-http = { module = "ch.acra:acra-http", version.ref = "acra" }
-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activity" }
+adapterdelegates = { module = "com.hannesdorfmann:adapterdelegates4-kotlin-dsl", version.ref = "adapterdelegates" }
-adapterdelegates4-kotlin-dsl = { module = "com.hannesdorfmann:adapterdelegates4-kotlin-dsl", version.ref = "adapterdelegates" }
+adapterdelegates-viewbinding = { module = "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding", version.ref = "adapterdelegates" }
-adapterdelegates4-kotlin-dsl-viewbinding = { module = "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding", version.ref = "adapterdelegates" }
+androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "activity" }
-androidx-biometric-ktx = { module = "androidx.biometric:biometric-ktx", version.ref = "biometric" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-biometric = { module = "androidx.biometric:biometric-ktx", version.ref = "biometric" }
+androidx-collection = { module = "androidx.collection:collection-ktx", version.ref = "collections" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
-androidx-core-ktx = { module = "androidx.test:core-ktx", version.ref = "rules" }
+androidx-core = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+androidx-fragment = { module = "androidx.fragment:fragment-ktx", version.ref = "fragment" }
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltWork" }
 androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hiltWork" }
-androidx-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
+androidx-junit = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" }
 androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle" }
-androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preference" }
+androidx-preference = { module = "androidx.preference:preference-ktx", version.ref = "preference" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
@@ -66,32 +69,26 @@ androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "
 androidx-rules = { module = "androidx.test:rules", version.ref = "rules" }
 androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
 androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
+androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "rules" }
+androidx-transition = { module = "androidx.transition:transition-ktx", version.ref = "transition" }
 androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" }
 androidx-webkit = { module = "androidx.webkit:webkit", version.ref = "webkit" }
 androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "workRuntime" }
-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 avif-decoder = { module = "org.aomedia.avif.android:avif", version.ref = "avifDecoder" }
 coil-core = { module = "io.coil-kt.coil3:coil-core", version.ref = "coil" }
+coil-gif = { module = "io.coil-kt.coil3:coil-gif", version.ref = "coil" }
 coil-network = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil" }
-coil-gif = { module = "io.coil-kt.coil3:coil-gif", version.ref = "coil" }
-collection-ktx = { module = "androidx.collection:collection-ktx", version.ref = "collections" }
 conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "conscrypt" }
-core = { module = "io.noties.markwon:core", version.ref = "core" }
-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
 desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" }
 disk-lru-cache = { module = "com.github.solkin:disk-lru-cache", version.ref = "diskLruCache" }
-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragment" }
-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
-hilt-android-gradle-plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
 hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
 hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
 json = { module = "org.json:json", version.ref = "json" }
 junit = { module = "junit:junit", version.ref = "junit" }
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "coroutines" }
@@ -99,16 +96,19 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
 lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
 lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "lifecycle" }
-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
+lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
+markwon = { module = "io.noties.markwon:core", version.ref = "markwon" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" }
 okhttp-tls = { module = "com.squareup.okhttp3:okhttp-tls", version.ref = "okhttp" }
 okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
-subsampling-scale-image-view = { module = "com.github.KotatsuApp:subsampling-scale-image-view", version.ref = "ssiv" }
+ssiv = { module = "com.github.KotatsuApp:subsampling-scale-image-view", version.ref = "ssiv" }
-symbol-processing-gradle-plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "kspPlugin" }
-transition-ktx = { module = "androidx.transition:transition-ktx", version.ref = "transition" }
 workinspector = { module = "com.github.Koitharu:WorkInspector", version.ref = "workinspector" }
 
 [plugins]
+android = { id = "com.android.tools.build:gradle", version.ref = "gradle" }
+hilt = { id = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
+kotlin = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+ksp = { id = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "kspPlugin" }