First Steps into making Gradle Catalogs (home-assistant#3724)

* First Steps into making Gradle Catalogs * Rename a couple dependencies. * Downgrade compose compiler since it'll take more to bump the kotlin version apparently. * Code review comments. * Refactoring these are painful. * Now I know my ABC, next time wont you sing with me....
anyuta1166 · Jul 29, 2023 · ba31703 · ba31703
1 parent 2ced008
commit ba31703
Show file tree

Hide file tree

Showing 6 changed files with 348 additions and 200 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -46,7 +46,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.8"
+        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
 
     kotlinOptions {
@@ -141,74 +141,74 @@ play {
 dependencies {
     implementation(project(":common"))
 
-    implementation("com.github.Dimezis:BlurView:version-1.6.6")
-
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.22")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2")
-    "fullImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.2")
-
-    implementation("com.google.dagger:hilt-android:2.47")
-    kapt("com.google.dagger:hilt-android-compiler:2.47")
-
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.recyclerview:recyclerview:1.3.1")
-    implementation("androidx.preference:preference-ktx:1.2.0")
-    implementation("com.google.android.material:material:1.9.0")
-    implementation("androidx.fragment:fragment-ktx:1.6.1")
-
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.5")
-    implementation("com.squareup.okhttp3:okhttp:4.11.0")
-    implementation("com.squareup.picasso:picasso:2.8")
-
-    "fullImplementation"("com.google.android.gms:play-services-location:21.0.1")
-    "fullImplementation"("com.google.android.gms:play-services-home:16.0.0")
-    "fullImplementation"("com.google.android.gms:play-services-threadnetwork:16.0.0")
-    "fullImplementation"(platform("com.google.firebase:firebase-bom:32.1.0"))
-    "fullImplementation"("com.google.firebase:firebase-messaging")
-    "fullImplementation"("io.sentry:sentry-android:6.26.0")
-    "fullImplementation"("com.google.android.gms:play-services-wearable:18.0.0")
-    "fullImplementation"("androidx.wear:wear-remote-interactions:1.0.0")
-
-    implementation("androidx.biometric:biometric:1.1.0")
-    implementation("androidx.webkit:webkit:1.7.0")
-
-    implementation("com.google.android.exoplayer:exoplayer-core:2.18.7")
-    implementation("com.google.android.exoplayer:exoplayer-hls:2.18.7")
-    implementation("com.google.android.exoplayer:exoplayer-ui:2.18.7")
-    "fullImplementation"("com.google.android.exoplayer:extension-cronet:2.18.7")
-    "minimalImplementation"("com.google.android.exoplayer:extension-cronet:2.18.7") {
+    implementation(libs.blurView)
+
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlin.reflect)
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
+    "fullImplementation"(libs.kotlinx.coroutines.play.services)
+
+    implementation(libs.hilt.android)
+    kapt(libs.hilt.android.compiler)
+
+    implementation(libs.appcompat)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.constraintlayout)
+    implementation(libs.recyclerview)
+    implementation(libs.preference.ktx)
+    implementation(libs.material)
+    implementation(libs.fragment.ktx)
+
+    implementation(libs.jackson.module.kotlin)
+    implementation(libs.okhttp)
+    implementation(libs.picasso)
+
+    "fullImplementation"(libs.play.services.location)
+    "fullImplementation"(libs.play.services.home)
+    "fullImplementation"(libs.play.services.threadnetwork)
+    "fullImplementation"(platform(libs.firebase.bom))
+    "fullImplementation"(libs.firebase.messaging)
+    "fullImplementation"(libs.sentry.android)
+    "fullImplementation"(libs.play.services.wearable)
+    "fullImplementation"(libs.wear.remote.interactions)
+
+    implementation(libs.biometric)
+    implementation(libs.webkit)
+
+    implementation(libs.exoplayer.core)
+    implementation(libs.exoplayer.hls)
+    implementation(libs.exoplayer.ui)
+    "fullImplementation"(libs.extension.cronet)
+    "minimalImplementation"(libs.extension.cronet) {
         exclude(group = "com.google.android.gms", module = "play-services-cronet")
     }
-    "minimalImplementation"("org.chromium.net:cronet-embedded:113.5672.61")
-
-    implementation(platform("androidx.compose:compose-bom:2023.06.01"))
-    implementation("androidx.compose.animation:animation")
-    implementation("androidx.compose.compiler:compiler:1.5.1")
-    implementation("androidx.compose.foundation:foundation")
-    implementation("androidx.compose.material:material")
-    implementation("androidx.compose.material:material-icons-core")
-    implementation("androidx.compose.material:material-icons-extended")
-    implementation("androidx.compose.runtime:runtime")
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-tooling")
-    implementation("androidx.activity:activity-compose:1.7.2")
-    implementation("androidx.navigation:navigation-compose:2.6.0")
-    implementation("com.google.accompanist:accompanist-systemuicontroller:0.30.1")
-    implementation("com.google.accompanist:accompanist-themeadapter-material:0.30.1")
-
-    implementation("com.mikepenz:iconics-core:5.4.0")
-    implementation("com.mikepenz:iconics-compose:5.4.0")
-    implementation("com.mikepenz:community-material-typeface:7.0.96.0-kotlin@aar")
-
-    implementation("org.burnoutcrew.composereorderable:reorderable:0.9.6")
-    implementation("com.github.AppDevNext:ChangeLog:3.4")
-
-    implementation("androidx.car.app:app:1.3.0-rc01")
-    "fullImplementation"("androidx.car.app:app-projected:1.3.0-rc01")
+    "minimalImplementation"(libs.cronet.embedded)
+
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.animation)
+    implementation(libs.compose.compiler)
+    implementation(libs.compose.foundation)
+    implementation(libs.compose.material)
+    implementation(libs.compose.material.icons.core)
+    implementation(libs.compose.material.icons.extended)
+    implementation(libs.compose.runtime)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.uiTooling)
+    implementation(libs.activity.compose)
+    implementation(libs.navigation.compose)
+    implementation(libs.accompanist.systemuicontroller)
+    implementation(libs.accompanist.themeadapter.material)
+
+    implementation(libs.iconics.core)
+    implementation(libs.iconics.compose)
+    implementation(libs.community.material.typeface)
+
+    implementation(libs.reorderable)
+    implementation(libs.changeLog)
+
+    implementation(libs.car.core)
+    "fullImplementation"(libs.car.projected)
 }
 
 // Disable to fix memory leak and be compatible with the configuration cache.

diff --git a/automotive/build.gradle.kts b/automotive/build.gradle.kts
@@ -81,7 +81,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.8"
+        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
 
     kotlinOptions {
@@ -170,74 +170,74 @@ play {
 dependencies {
     implementation(project(":common"))
 
-    implementation("com.github.Dimezis:BlurView:version-1.6.6")
-
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.22")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2")
-    "fullImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.2")
-
-    implementation("com.google.dagger:hilt-android:2.47")
-    kapt("com.google.dagger:hilt-android-compiler:2.47")
-
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.recyclerview:recyclerview:1.3.1")
-    implementation("androidx.preference:preference-ktx:1.2.0")
-    implementation("com.google.android.material:material:1.9.0")
-    implementation("androidx.fragment:fragment-ktx:1.6.1")
-
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.5")
-    implementation("com.squareup.okhttp3:okhttp:4.11.0")
-    implementation("com.squareup.picasso:picasso:2.8")
-
-    "fullImplementation"("com.google.android.gms:play-services-location:21.0.1")
-    "fullImplementation"("com.google.android.gms:play-services-home:16.0.0")
-    "fullImplementation"("com.google.android.gms:play-services-threadnetwork:16.0.0")
-    "fullImplementation"(platform("com.google.firebase:firebase-bom:32.1.0"))
-    "fullImplementation"("com.google.firebase:firebase-messaging")
-    "fullImplementation"("io.sentry:sentry-android:6.26.0")
-    "fullImplementation"("com.google.android.gms:play-services-wearable:18.0.0")
-    "fullImplementation"("androidx.wear:wear-remote-interactions:1.0.0")
-
-    implementation("androidx.biometric:biometric:1.1.0")
-    implementation("androidx.webkit:webkit:1.7.0")
-
-    implementation("com.google.android.exoplayer:exoplayer-core:2.18.7")
-    implementation("com.google.android.exoplayer:exoplayer-hls:2.18.7")
-    implementation("com.google.android.exoplayer:exoplayer-ui:2.18.7")
-    "fullImplementation"("com.google.android.exoplayer:extension-cronet:2.18.7")
-    "minimalImplementation"("com.google.android.exoplayer:extension-cronet:2.18.7") {
+    implementation(libs.blurView)
+
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlin.reflect)
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
+    "fullImplementation"(libs.kotlinx.coroutines.play.services)
+
+    implementation(libs.hilt.android)
+    kapt(libs.hilt.android.compiler)
+
+    implementation(libs.appcompat)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.constraintlayout)
+    implementation(libs.recyclerview)
+    implementation(libs.preference.ktx)
+    implementation(libs.material)
+    implementation(libs.fragment.ktx)
+
+    implementation(libs.jackson.module.kotlin)
+    implementation(libs.okhttp)
+    implementation(libs.picasso)
+
+    "fullImplementation"(libs.play.services.location)
+    "fullImplementation"(libs.play.services.home)
+    "fullImplementation"(libs.play.services.threadnetwork)
+    "fullImplementation"(platform(libs.firebase.bom))
+    "fullImplementation"(libs.firebase.messaging)
+    "fullImplementation"(libs.sentry.android)
+    "fullImplementation"(libs.play.services.wearable)
+    "fullImplementation"(libs.wear.remote.interactions)
+
+    implementation(libs.biometric)
+    implementation(libs.webkit)
+
+    implementation(libs.exoplayer.core)
+    implementation(libs.exoplayer.hls)
+    implementation(libs.exoplayer.ui)
+    "fullImplementation"(libs.extension.cronet)
+    "minimalImplementation"(libs.extension.cronet) {
         exclude(group = "com.google.android.gms", module = "play-services-cronet")
     }
-    "minimalImplementation"("org.chromium.net:cronet-embedded:113.5672.61")
-
-    implementation(platform("androidx.compose:compose-bom:2023.06.01"))
-    implementation("androidx.compose.animation:animation")
-    implementation("androidx.compose.compiler:compiler:1.5.1")
-    implementation("androidx.compose.foundation:foundation")
-    implementation("androidx.compose.material:material")
-    implementation("androidx.compose.material:material-icons-core")
-    implementation("androidx.compose.material:material-icons-extended")
-    implementation("androidx.compose.runtime:runtime")
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-tooling")
-    implementation("androidx.activity:activity-compose:1.7.2")
-    implementation("androidx.navigation:navigation-compose:2.6.0")
-    implementation("com.google.accompanist:accompanist-systemuicontroller:0.30.1")
-    implementation("com.google.accompanist:accompanist-themeadapter-material:0.30.1")
-
-    implementation("com.mikepenz:iconics-core:5.4.0")
-    implementation("com.mikepenz:iconics-compose:5.4.0")
-    implementation("com.mikepenz:community-material-typeface:7.0.96.0-kotlin@aar")
-
-    implementation("org.burnoutcrew.composereorderable:reorderable:0.9.6")
-    implementation("com.github.AppDevNext:ChangeLog:3.4")
-
-    implementation("androidx.car.app:app:1.3.0-rc01")
-    implementation("androidx.car.app:app-automotive:1.3.0-rc01")
+    "minimalImplementation"(libs.cronet.embedded)
+
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.animation)
+    implementation(libs.compose.compiler)
+    implementation(libs.compose.foundation)
+    implementation(libs.compose.material)
+    implementation(libs.compose.material.icons.core)
+    implementation(libs.compose.material.icons.extended)
+    implementation(libs.compose.runtime)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.uiTooling)
+    implementation(libs.activity.compose)
+    implementation(libs.navigation.compose)
+    implementation(libs.accompanist.systemuicontroller)
+    implementation(libs.accompanist.themeadapter.material)
+
+    implementation(libs.iconics.core)
+    implementation(libs.iconics.compose)
+    implementation(libs.community.material.typeface)
+
+    implementation(libs.reorderable)
+    implementation(libs.changeLog)
+
+    implementation(libs.car.core)
+    implementation(libs.car.automotive)
 }
 
 // Disable to fix memory leak and be compatible with the configuration cache.

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.jlleitschuh.gradle.ktlint") version "11.5.0"
-    id("com.github.ben-manes.versions") version "0.47.0"
+    alias(libs.plugins.ktlint)
 }
 
 buildscript {
@@ -11,13 +10,13 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.0.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
-        classpath("com.google.gms:google-services:4.3.15")
-        classpath("com.google.firebase:firebase-appdistribution-gradle:4.0.0")
-        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.9.3.0")
-        classpath("com.github.triplet.gradle:play-publisher:3.8.4")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:2.47")
+        classpath(libs.android.plugin)
+        classpath(libs.kotlin.gradle.plugin)
+        classpath(libs.google.services)
+        classpath(libs.firebase.appdistribution.gradle)
+        classpath(libs.android.junit5)
+        classpath(libs.play.publisher)
+        classpath(libs.hilt.android.gradle.plugin)
     }
 }
 

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -55,34 +55,34 @@ android {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.22")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlin.reflect)
+    implementation(libs.kotlinx.coroutines.core)
 
-    implementation("com.google.dagger:hilt-android:2.47")
-    kapt("com.google.dagger:hilt-android-compiler:2.47")
+    implementation(libs.hilt.android)
+    kapt(libs.hilt.android.compiler)
 
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
+    implementation(libs.appcompat)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
-    api("androidx.room:room-runtime:2.5.2")
-    api("androidx.room:room-ktx:2.5.2")
-    kapt("androidx.room:room-compiler:2.5.2")
+    api(libs.androidx.room.runtime)
+    api(libs.androidx.room.ktx)
+    kapt(libs.androidx.room.compiler)
 
-    api("androidx.work:work-runtime-ktx:2.8.1")
+    api(libs.androidx.work.runtime.ktx)
 
-    api("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-jackson:2.9.0")
-    implementation("com.squareup.okhttp3:okhttp:4.11.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.5")
-    implementation("org.altbeacon:android-beacon-library:2.19.6")
+    api(libs.retrofit)
+    implementation(libs.converter.jackson)
+    implementation(libs.okhttp)
+    implementation(libs.logging.interceptor)
+    implementation(libs.jackson.module.kotlin)
+    implementation(libs.android.beacon.library)
 
-    implementation("com.mikepenz:iconics-core:5.4.0")
-    implementation("com.mikepenz:community-material-typeface:7.0.96.0-kotlin@aar")
+    implementation(libs.iconics.core)
+    implementation(libs.community.material.typeface)
 
-    implementation("com.vdurmont:emoji-java:5.1.1") {
+    implementation(libs.emojiJava) {
         exclude(group = "org.json", module = "json")
     }
 }