Version catalogs in the rest of modules

bike/build.gradle.kts

@@ -55,16 +55,15 @@ dependencies {
     implementation(project(":modules:framework"))
 
     implementation(libs.core.ktx)
-    implementation(libs.ui)
-    implementation(libs.material)
-    implementation(libs.ui.tooling.preview)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.material)
+    implementation(libs.compose.ui.tooling.preview)
     implementation(libs.lifecycle.runtime.ktx)
     implementation(libs.activity.compose)
     implementation(libs.hilt.android)
     kapt(libs.hilt.android.compiler)
     implementation(libs.hilt.navigation.compose)
-    implementation(libs.runtime)
-
+    implementation(libs.compose.runtime)
     implementation(libs.fastble)
 
     testImplementation(libs.junit)
@@ -73,7 +72,7 @@ dependencies {
 
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
-    androidTestImplementation(libs.ui.test.junit4)
+    androidTestImplementation(libs.compose.ui.test.junit4)
 
-    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.compose.ui.tooling)
 }

gabimoreno/build.gradle.kts

@@ -127,77 +127,59 @@ dependencies {
 
     implementation(libs.core.ktx)
     implementation(libs.google.material)
-
-    implementation(libs.material)
-    implementation(libs.androidx.material.icons.extended)
-    implementation(libs.androidx.navigation.compose)
-    implementation(libs.ui)
-    implementation(libs.ui.tooling.preview)
-
+    implementation(libs.compose.material)
+    implementation(libs.material.icons.extended)
+    implementation(libs.navigation.compose)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.tooling.preview)
     implementation(libs.lifecycle.runtime.ktx)
     implementation(libs.activity.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.runtime)
-
+    implementation(libs.lifecycle.viewmodel.compose)
+    implementation(libs.compose.runtime)
     implementation(platform("com.google.firebase:firebase-bom:32.1.1"))
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation("com.google.firebase:firebase-crashlytics-ktx")
     implementation("com.google.firebase:firebase-messaging-ktx")
-
     implementation(libs.hilt.android)
     kapt(libs.hilt.android.compiler)
     implementation(libs.hilt.navigation.compose)
-
     implementation(libs.retrofit)
     implementation(libs.converter.moshi)
-
     implementation(libs.moshi)
     kapt(libs.moshi.codegen)
-
     implementation(libs.logging.interceptor)
-
     implementation(libs.rssparser)
-
     implementation(libs.exoplayer)
     implementation(libs.extension.mediasession)
-
     implementation(libs.glide)
-
     implementation(libs.accompanist.insets)
     implementation(libs.accompanist.coil)
-
     implementation(libs.arrow.core)
-
-    implementation(libs.androidx.datastore.preferences)
-
-    implementation(libs.androidx.room.runtime)
-    kapt(libs.androidx.room.compiler)
-
+    implementation(libs.datastore.preferences)
+    implementation(libs.room.runtime)
+    kapt(libs.room.compiler)
     implementation(libs.gson)
-
     implementation(libs.clarity)
 
     testImplementation(libs.junit)
     testImplementation(libs.kluent)
     testImplementation(libs.mockk)
     testImplementation(libs.robolectric)
     testImplementation(libs.kotlinx.coroutines.test)
-
     testImplementation(libs.turbine)
 
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
-    androidTestImplementation(libs.ui.test.junit4)
+    androidTestImplementation(libs.compose.ui.test.junit4)
     androidTestImplementation(libs.kluent.android)
-
     androidTestImplementation(libs.hilt.android.testing)
     kaptAndroidTest(libs.hilt.android.compiler)
     androidTestImplementation(libs.mockwebserver)
     androidTestImplementation(libs.okhttp3.idling.resource)
     androidTestImplementation(libs.kotlinx.coroutines.test)
 
-    debugImplementation(libs.androidx.ui.tooling)
-    debugImplementation(libs.androidx.ui.test.manifest)
+    debugImplementation(libs.compose.ui.tooling)
+    debugImplementation(libs.compose.ui.test.manifest)
 }
 
 fun isLocalBuild(): Boolean {

gradle/libs.versions.toml

@@ -3,6 +3,7 @@ accompanist-coil = "0.12.0"
 accompanist-insets = "0.12.0"
 activity-compose = "1.7.2"
 androidx-junit = "1.1.5"
+appcompat = "1.4.1"
 arrow-core = "1.0.1"
 clarity = "1.3.0"
 converter-moshi = "2.9.0"
@@ -19,6 +20,7 @@ hilt-navigation-compose = "1.0.0"
 junit = "4.13.2"
 kluent-android = "1.68"
 kotlinx-coroutines-test = "1.6.4"
+kotest = "5.5.4"
 lifecycle-runtime-ktx = "2.6.1"
 logging-interceptor = "4.9.2"
 material = "1.4.3"
@@ -27,6 +29,7 @@ mockwebserver = "4.9.3"
 moshi = "1.15.0"
 navigation-compose = "2.7.0-beta01"
 okhttp3-idling-resource = "1.0.0"
+palette = "1.0.0"
 retrofit = "2.9.0"
 robolectric = "4.8.1"
 room-runtime = "2.5.1"
@@ -39,50 +42,74 @@ ui-test-manifest = "1.5.0-beta02"
 [libraries]
 accompanist-coil = { module = "com.google.accompanist:accompanist-coil", version.ref = "accompanist-coil" }
 accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist-insets" }
+
 activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
-androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore-preferences" }
-androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-runtime-ktx" }
-androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "material" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
-androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room-runtime" }
-androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room-runtime" }
-androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "ui-test-manifest" }
-androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "ui" }
+appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore-preferences" }
+
+lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-runtime-ktx" }
+material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "material" }
+navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
+compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "runtime" }
+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "ui" }
+compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "ui" }
+
+room-compiler = { module = "androidx.room:room-compiler", version.ref = "room-runtime" }
+room-runtime = { module = "androidx.room:room-runtime", version.ref = "room-runtime" }
+
 arrow-core = { module = "io.arrow-kt:arrow-core", version.ref = "arrow-core" }
+
 clarity = { module = "com.microsoft.clarity:clarity", version.ref = "clarity" }
-converter-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "converter-moshi" }
+
 core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
+
 exoplayer = { module = "com.google.android.exoplayer:exoplayer", version.ref = "exoplayer" }
-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
+exoplayer-core = { module = "com.google.android.exoplayer:exoplayer-core", version.ref = "exoplayer" }
+exoplayer-ui = { module = "com.google.android.exoplayer:exoplayer-ui", version.ref = "exoplayer" }
+
 extension-mediasession = { module = "com.google.android.exoplayer:extension-mediasession", version.ref = "exoplayer" }
 fastble = { module = "com.github.Jasonchenlijian:FastBle", version.ref = "fastble" }
 glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 google-material = { module = "com.google.android.material:material", version.ref = "google-material" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt-android" }
 hilt-android-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt-android" }
-hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt-android" }
 hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hilt-navigation-compose" }
-junit = { module = "junit:junit", version.ref = "junit" }
-kluent = { module = "org.amshove.kluent:kluent", version.ref = "kluent-android" }
-kluent-android = { module = "org.amshove.kluent:kluent-android", version.ref = "kluent-android" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines-test" }
+
 lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
 logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "logging-interceptor" }
-material = { module = "androidx.compose.material:material", version.ref = "material" }
-mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "mockwebserver" }
+compose-material = { module = "androidx.compose.material:material", version.ref = "material" }
+
 moshi = { group = "com.squareup.moshi", name = "moshi", version.ref = "moshi" }
 moshi-codegen = { group = "com.squareup.moshi", name = "moshi-kotlin-codegen", version.ref = "moshi" }
-okhttp3-idling-resource = { module = "com.jakewharton.espresso:okhttp3-idling-resource", version.ref = "okhttp3-idling-resource" }
+converter-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "converter-moshi" }
+
+palette = { module = "androidx.palette:palette-ktx", version.ref = "palette" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
 rssparser = { module = "com.prof18.rssparser:rssparser", version.ref = "rssparser" }
-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "runtime" }
+
+# Tests
+junit = { module = "junit:junit", version.ref = "junit" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
+kotest = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
+kluent = { module = "org.amshove.kluent:kluent", version.ref = "kluent-android" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines-test" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
-ui = { module = "androidx.compose.ui:ui", version.ref = "ui" }
-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "ui" }
-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "ui" }
+robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+
+# Android Tests
+ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-junit" }
+compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "ui" }
+kluent-android = { module = "org.amshove.kluent:kluent-android", version.ref = "kluent-android" }
+mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
+mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "mockwebserver" }
+okhttp3-idling-resource = { module = "com.jakewharton.espresso:okhttp3-idling-resource", version.ref = "okhttp3-idling-resource" }
+espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
+hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt-android" }
+
+# Debug
+compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "ui-test-manifest" }
+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "ui" }
 
 [plugins]

modules/core-testing/build.gradle.kts

@@ -34,7 +34,7 @@ android {
 }
 
 dependencies {
-    testImplementation("junit:junit:4.13.2")
-    implementation("io.mockk:mockk:1.12.4")
-    implementation("io.kotest:kotest-assertions-core:5.5.4")
+    testImplementation(libs.junit)
+    implementation(libs.mockk)
+    implementation(libs.kotest)
 }

modules/core-view/build.gradle.kts

@@ -35,22 +35,20 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.10.1")
-    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("com.google.android.material:material:1.5.0")
-
-    implementation("com.google.dagger:hilt-android:${rootProject.extra["version_hilt"]}")
-    kapt("com.google.dagger:hilt-android-compiler:${rootProject.extra["version_hilt"]}")
-
-    implementation("androidx.compose.ui:ui:${rootProject.extra["version_compose"]}")
-    implementation("androidx.palette:palette-ktx:1.0.0")
-
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.amshove.kluent:kluent-android:1.68")
-    testImplementation("io.mockk:mockk:1.12.4")
-    testImplementation("org.robolectric:robolectric:4.8.1")
-
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
-    androidTestImplementation("io.mockk:mockk-android:1.12.4")
+    implementation(libs.core.ktx)
+    implementation(libs.appcompat)
+    implementation(libs.google.material)
+    implementation(libs.hilt.android)
+    kapt(libs.hilt.android.compiler)
+    implementation(libs.compose.ui)
+    implementation(libs.palette)
+
+    testImplementation(libs.junit)
+    testImplementation(libs.kluent.android)
+    testImplementation(libs.mockk)
+    testImplementation(libs.robolectric)
+
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.mockk.android)
 }

modules/core/build.gradle.kts

@@ -9,7 +9,7 @@ java {
 }
 
 dependencies {
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.amshove.kluent:kluent-android:1.68")
-    testImplementation("io.mockk:mockk:1.12.4")
+    testImplementation(libs.junit)
+    testImplementation(libs.kluent.android)
+    testImplementation(libs.mockk)
 }

modules/framework/build.gradle.kts

@@ -35,22 +35,20 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.10.1")
-    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("com.google.android.material:material:1.5.0")
-
-    implementation("com.google.dagger:hilt-android:${rootProject.extra["version_hilt"]}")
-    kapt("com.google.dagger:hilt-android-compiler:${rootProject.extra["version_hilt"]}")
-
-    implementation("androidx.compose.ui:ui:${rootProject.extra["version_compose"]}")
-    implementation("androidx.palette:palette-ktx:1.0.0")
-
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.amshove.kluent:kluent-android:1.68")
-    testImplementation("io.mockk:mockk:1.12.4")
-    testImplementation("org.robolectric:robolectric:4.8.1")
-
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
-    androidTestImplementation("io.mockk:mockk-android:1.12.4")
+    implementation(libs.core.ktx)
+    implementation(libs.appcompat)
+    implementation(libs.google.material)
+    implementation(libs.hilt.android)
+    kapt(libs.hilt.android.compiler)
+    implementation(libs.compose.ui)
+    implementation(libs.palette)
+
+    testImplementation(libs.junit)
+    testImplementation(libs.kluent.android)
+    testImplementation(libs.mockk)
+    testImplementation(libs.robolectric)
+
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.mockk.android)
 }

modules/player/build.gradle.kts

@@ -34,15 +34,14 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.10.1")
-    implementation("androidx.appcompat:appcompat:1.4.1")
-    implementation("com.google.android.material:material:1.5.0")
+    implementation(libs.core.ktx)
+    implementation(libs.appcompat)
+    implementation(libs.google.material)
+    implementation(libs.exoplayer.core)
+    implementation(libs.exoplayer.ui)
 
-    implementation("com.google.android.exoplayer:exoplayer-core:${rootProject.extra["version_exo_player"]}")
-    implementation("com.google.android.exoplayer:exoplayer-ui:${rootProject.extra["version_exo_player"]}")
+    testImplementation(libs.junit)
 
-    testImplementation("junit:junit:4.13.2")
-
-    androidTestImplementation("androidx.test.ext:junit:1.1.3")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.espresso.core)
 }

modules/raffle/build.gradle.kts

@@ -10,7 +10,7 @@ java {
 
 
 dependencies {
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("org.amshove.kluent:kluent-android:1.68")
-    testImplementation("io.mockk:mockk:1.12.4")
+    testImplementation(libs.junit)
+    testImplementation(libs.kluent.android)
+    testImplementation(libs.mockk)
 }