Merge and cleanup version catalogs (#3103)

core/common/build.gradle.kts

@@ -22,24 +22,24 @@ dependencies {
 
     api(libs.logcat)
 
-    api(libs.rxjava)
+    api(libs.rxJava)
 
     api(libs.okhttp.core)
     api(libs.okhttp.logging)
     api(libs.okhttp.brotli)
-    api(libs.okhttp.dnsoverhttps)
+    api(libs.okhttp.dnsOverHttps)
     api(libs.okio)
 
     implementation(libs.image.decoder)
 
     implementation(libs.unifile)
-    implementation(libs.libarchive)
+    implementation(libs.archive)
 
-    api(kotlinx.coroutines.core)
-    api(kotlinx.serialization.json)
-    api(kotlinx.serialization.json.okio)
+    api(libs.kotlinx.coroutines.core)
+    api(libs.kotlinx.serialization.json)
+    api(libs.kotlinx.serialization.jsonOkio)
 
-    api(libs.preferencektx)
+    api(libs.androidx.preference)
 
     implementation(libs.jsoup)
 
@@ -47,7 +47,7 @@ dependencies {
     implementation(libs.natural.comparator)
 
     // JavaScript engine
-    implementation(libs.bundles.js.engine)
+    implementation(libs.quickJs)
 
     testImplementation(libs.bundles.test)
     testRuntimeOnly(libs.junit.platform.launcher)