fix: naming in version-catalogs.

oxyroid · May 17, 2024 · 8c72210 · 8c72210
1 parent 157458b
commit 8c72210
Show file tree

Hide file tree

Showing 16 changed files with 194 additions and 199 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -134,28 +134,26 @@ dependencies {
     implementation(project(":features:playlist-configuration"))
     implementation(project(":features:crash"))
 
-    implementation(libs.androidx.core.core.ktx)
-    implementation(libs.androidx.appcompat.appcompat)
-    implementation(libs.androidx.activity.activity.compose)
-    implementation(libs.androidx.startup.startup.runtime)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.startup.runtime)
 
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
-    implementation(libs.androidx.lifecycle.lifecycle.process)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.process)
 
-    implementation(libs.androidx.core.core.splashscreen)
+    implementation(libs.androidx.core.splashscreen)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    ksp(libs.com.google.dagger.hilt.compiler)
-    implementation(libs.androidx.hilt.hilt.navigation.compose)
+    implementation(libs.google.dagger.hilt)
+    ksp(libs.google.dagger.hilt.compiler)
+    implementation(libs.androidx.hilt.navigation.compose)
 
-    implementation(libs.androidx.work.work.runtime.ktx)
-    ksp(libs.androidx.hilt.hilt.compiler)
-    implementation(libs.androidx.hilt.hilt.work)
+    implementation(libs.androidx.work.runtime.ktx)
+    ksp(libs.androidx.hilt.compiler)
+    implementation(libs.androidx.hilt.work)
 
-    debugImplementation(libs.com.squareup.leakcanary.leakcanary.android)
+    debugImplementation(libs.squareup.leakcanary)
 
-    androidTestImplementation(libs.androidx.compose.ui.ui.test.junit4)
-
-    implementation(libs.androidx.compose.material3.material3.adaptive)
+    implementation(libs.androidx.compose.material3.adaptive)
 }
diff --git a/codec/lite/build.gradle.kts b/codec/lite/build.gradle.kts
@@ -33,9 +33,9 @@ android {
 }
 
 dependencies {
-    implementation(libs.androidx.core.core.ktx)
-    implementation(libs.androidx.appcompat.appcompat)
-    implementation(libs.com.google.android.material.material)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.google.material)
 
-    implementation(libs.androidx.media3.media3.exoplayer)
+    implementation(libs.androidx.media3.exoplayer)
 }
diff --git a/codec/rich/build.gradle.kts b/codec/rich/build.gradle.kts
@@ -33,10 +33,10 @@ android {
 }
 
 dependencies {
-    implementation(libs.androidx.core.core.ktx)
-    implementation(libs.androidx.appcompat.appcompat)
-    implementation(libs.com.google.android.material.material)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.google.material)
 
-    implementation(libs.androidx.media3.media3.exoplayer)
-    implementation(libs.nextlib.media3ext)
+    implementation(libs.androidx.media3.exoplayer)
+    implementation(libs.nextlib.media3.ext)
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -43,15 +43,15 @@ android {
 dependencies {
     api(project(":i18n"))
 
-    implementation(libs.androidx.core.core.ktx)
-    implementation(libs.androidx.appcompat.appcompat)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
     api(libs.androidx.compose.runtime)
     implementation(libs.kotlinx.serialization.json)
-    implementation(libs.com.squareup.retrofit2.retrofit)
-    implementation(libs.androidx.media3.media3.exoplayer)
-    implementation(libs.androidx.media3.media3.session)
-    implementation(libs.com.google.dagger.hilt.android)
-    ksp(libs.com.google.dagger.hilt.compiler)
+    implementation(libs.squareup.retrofit2)
+    implementation(libs.androidx.media3.exoplayer)
+    implementation(libs.androidx.media3.session)
+    implementation(libs.google.dagger.hilt)
+    ksp(libs.google.dagger.hilt.compiler)
 
     implementation(libs.kotlinx.serialization.json)
 

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -61,38 +61,38 @@ dependencies {
         implementation(project(":codec:lite"))
     }
 
-    implementation(libs.androidx.core.core.ktx)
-    implementation(libs.androidx.appcompat.appcompat)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
 
-    implementation(libs.androidx.room.room.runtime)
-    implementation(libs.androidx.room.room.paging)
-    implementation(libs.androidx.room.room.ktx)
-    ksp(libs.androidx.room.room.compiler)
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.androidx.room.paging)
+    implementation(libs.androidx.room.ktx)
+    ksp(libs.androidx.room.compiler)
 
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.serialization.coverter.retrofit)
 
-    implementation(libs.io.coil.kt.coil)
+    implementation(libs.io.coil.kt)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    ksp(libs.com.google.dagger.hilt.compiler)
+    implementation(libs.google.dagger.hilt)
+    ksp(libs.google.dagger.hilt.compiler)
 
-    implementation(libs.com.squareup.retrofit2.retrofit)
+    implementation(libs.squareup.retrofit2)
 
-    implementation(libs.androidx.media3.media3.exoplayer)
-    implementation(libs.androidx.media3.media3.exoplayer.dash)
-    implementation(libs.androidx.media3.media3.exoplayer.hls)
-    implementation(libs.androidx.media3.media3.exoplayer.rtsp)
-    implementation(libs.androidx.media3.media3.exoplayer.smoothstreaming)
-    implementation(libs.androidx.media3.media3.session)
-    implementation(libs.androidx.media3.media3.container)
-    implementation(libs.androidx.media3.media3.datasource.rtmp)
-    implementation(libs.androidx.media3.media3.datasource.okhttp)
-    implementation(libs.androidx.media3.media3.extractor)
+    implementation(libs.androidx.media3.exoplayer)
+    implementation(libs.androidx.media3.exoplayer.dash)
+    implementation(libs.androidx.media3.exoplayer.hls)
+    implementation(libs.androidx.media3.exoplayer.rtsp)
+    implementation(libs.androidx.media3.exoplayer.smoothstreaming)
+    implementation(libs.androidx.media3.session)
+    implementation(libs.androidx.media3.container)
+    implementation(libs.androidx.media3.datasource.rtmp)
+    implementation(libs.androidx.media3.datasource.okhttp)
+    implementation(libs.androidx.media3.extractor)
 
-    implementation(libs.androidx.work.work.runtime.ktx)
-    implementation(libs.androidx.hilt.hilt.work)
-    ksp(libs.androidx.hilt.hilt.compiler)
+    implementation(libs.androidx.work.runtime.ktx)
+    implementation(libs.androidx.hilt.work)
+    ksp(libs.androidx.hilt.compiler)
 
     implementation(libs.ktor.server.netty)
     implementation(libs.ktor.server.websockets)

diff --git a/features/crash/build.gradle.kts b/features/crash/build.gradle.kts
@@ -46,13 +46,13 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":ui"))
 
-    implementation(libs.androidx.core.core.ktx)
-    implementation(libs.androidx.activity.activity.compose)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.activity.compose)
 
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    implementation(libs.androidx.hilt.hilt.navigation.compose)
-    ksp(libs.com.google.dagger.hilt.compiler)
+    implementation(libs.google.dagger.hilt)
+    implementation(libs.androidx.hilt.navigation.compose)
+    ksp(libs.google.dagger.hilt.compiler)
 }
diff --git a/features/favorite/build.gradle.kts b/features/favorite/build.gradle.kts
@@ -46,12 +46,12 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":ui"))
 
-    implementation(libs.androidx.core.core.ktx)
+    implementation(libs.androidx.core.ktx)
 
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    implementation(libs.androidx.hilt.hilt.navigation.compose)
-    ksp(libs.com.google.dagger.hilt.compiler)
+    implementation(libs.google.dagger.hilt)
+    implementation(libs.androidx.hilt.navigation.compose)
+    ksp(libs.google.dagger.hilt.compiler)
 }
diff --git a/features/foryou/build.gradle.kts b/features/foryou/build.gradle.kts
@@ -46,16 +46,16 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":ui"))
 
-    implementation(libs.androidx.core.core.ktx)
+    implementation(libs.androidx.core.ktx)
 
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
-    implementation(libs.com.airbnb.android.lottie.compose)
+    implementation(libs.airbnb.lottie.compose)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    implementation(libs.androidx.hilt.hilt.navigation.compose)
-    ksp(libs.com.google.dagger.hilt.compiler)
+    implementation(libs.google.dagger.hilt)
+    implementation(libs.androidx.hilt.navigation.compose)
+    ksp(libs.google.dagger.hilt.compiler)
 
-    implementation(libs.androidx.work.work.runtime.ktx)
+    implementation(libs.androidx.work.runtime.ktx)
 }
diff --git a/features/playlist-configuration/build.gradle.kts b/features/playlist-configuration/build.gradle.kts
@@ -49,14 +49,14 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":ui"))
 
-    implementation(libs.androidx.core.core.ktx)
+    implementation(libs.androidx.core.ktx)
 
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    implementation(libs.androidx.hilt.hilt.navigation.compose)
-    ksp(libs.com.google.dagger.hilt.compiler)
+    implementation(libs.google.dagger.hilt)
+    implementation(libs.androidx.hilt.navigation.compose)
+    ksp(libs.google.dagger.hilt.compiler)
 
-    implementation(libs.androidx.work.work.runtime.ktx)
+    implementation(libs.androidx.work.runtime.ktx)
 }
diff --git a/features/playlist/build.gradle.kts b/features/playlist/build.gradle.kts
@@ -48,27 +48,27 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":ui"))
 
-    implementation(libs.androidx.core.core.ktx)
+    implementation(libs.androidx.core.ktx)
 
     // for m2 BackdropScaffold only
     implementation("androidx.compose.material:material:${libs.versions.androidx.compose}")
 
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
-    implementation(libs.androidx.tv.tv.foundation)
-    implementation(libs.androidx.tv.tv.material)
+    implementation(libs.androidx.tv.foundation)
+    implementation(libs.androidx.tv.material)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    implementation(libs.androidx.hilt.hilt.navigation.compose)
-    implementation(libs.androidx.hilt.hilt.work)
+    implementation(libs.google.dagger.hilt)
+    implementation(libs.androidx.hilt.navigation.compose)
+    implementation(libs.androidx.hilt.work)
 
-    ksp(libs.com.google.dagger.hilt.compiler)
-    ksp(libs.androidx.hilt.hilt.compiler)
+    ksp(libs.google.dagger.hilt.compiler)
+    ksp(libs.androidx.hilt.compiler)
 
-    implementation(libs.androidx.work.work.runtime.ktx)
+    implementation(libs.androidx.work.runtime.ktx)
 
-    implementation(libs.androidx.tvprovider.tvprovider)
+    implementation(libs.androidx.tvprovider)
 }
 
 tasks.withType<KotlinCompile>().configureEach {

diff --git a/features/setting/build.gradle.kts b/features/setting/build.gradle.kts
@@ -46,18 +46,18 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":ui"))
 
-    implementation(libs.androidx.core.core.ktx)
+    implementation(libs.androidx.core.ktx)
 
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    ksp(libs.com.google.dagger.hilt.compiler)
-    implementation(libs.androidx.hilt.hilt.navigation.compose)
+    implementation(libs.google.dagger.hilt)
+    ksp(libs.google.dagger.hilt.compiler)
+    implementation(libs.androidx.hilt.navigation.compose)
 
-    implementation(libs.androidx.work.work.runtime.ktx)
-    ksp(libs.androidx.hilt.hilt.compiler)
-    implementation(libs.androidx.hilt.hilt.work)
+    implementation(libs.androidx.work.runtime.ktx)
+    ksp(libs.androidx.hilt.compiler)
+    implementation(libs.androidx.hilt.work)
 
-    implementation(libs.androidx.compose.material3.material3.adaptive)
+    implementation(libs.androidx.compose.material3.adaptive)
 }
diff --git a/features/stream/build.gradle.kts b/features/stream/build.gradle.kts
@@ -47,20 +47,20 @@ dependencies {
     implementation(project(":core"))
     implementation(project(":ui"))
 
-    implementation(libs.androidx.core.core.ktx)
+    implementation(libs.androidx.core.ktx)
 
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime.compose)
 
-    implementation(libs.androidx.media3.media3.exoplayer)
+    implementation(libs.androidx.media3.exoplayer)
 
-    implementation(libs.com.google.dagger.hilt.android)
-    implementation(libs.androidx.hilt.hilt.navigation.compose)
-    ksp(libs.com.google.dagger.hilt.compiler)
+    implementation(libs.google.dagger.hilt)
+    implementation(libs.androidx.hilt.navigation.compose)
+    ksp(libs.google.dagger.hilt.compiler)
 
-    implementation(libs.androidx.work.work.runtime.ktx)
-    ksp(libs.androidx.hilt.hilt.compiler)
-    implementation(libs.androidx.hilt.hilt.work)
+    implementation(libs.androidx.work.runtime.ktx)
+    ksp(libs.androidx.hilt.compiler)
+    implementation(libs.androidx.hilt.work)
 
     implementation(libs.minabox)
     implementation(libs.net.mm2d.mmupnp.mmupnp)