Migrate AndroidX dependencies to the version catalog (#2591)

* Migrate AndroidX dependencies to the version catalog * Update Dependencies.kt
google · Jun 26, 2024 · e192970 · e192970
1 parent ada0b03
commit e192970
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 108 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -19,21 +19,6 @@ import org.gradle.api.artifacts.DependencyConstraint
 import org.gradle.kotlin.dsl.exclude
 
 object Dependencies {
-
-  object Androidx {
-    const val activity = "androidx.activity:activity:${Versions.Androidx.activity}"
-    const val appCompat = "androidx.appcompat:appcompat:${Versions.Androidx.appCompat}"
-    const val constraintLayout =
-      "androidx.constraintlayout:constraintlayout:${Versions.Androidx.constraintLayout}"
-    const val coreKtx = "androidx.core:core-ktx:${Versions.Androidx.coreKtx}"
-    const val datastorePref =
-      "androidx.datastore:datastore-preferences:${Versions.Androidx.datastorePref}"
-    const val fragmentKtx = "androidx.fragment:fragment-ktx:${Versions.Androidx.fragmentKtx}"
-    const val recyclerView = "androidx.recyclerview:recyclerview:${Versions.Androidx.recyclerView}"
-    const val sqliteKtx = "androidx.sqlite:sqlite-ktx:${Versions.Androidx.sqliteKtx}"
-    const val workRuntimeKtx = "androidx.work:work-runtime-ktx:${Versions.Androidx.workRuntimeKtx}"
-  }
-
   object Cql {
     const val evaluator = "org.opencds.cqf.fhir:cqf-fhir-cr:${Versions.Cql.clinicalReasoning}"
     const val evaluatorFhirJackson =
@@ -106,32 +91,11 @@ object Dependencies {
     const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.Kotlin.stdlib}"
   }
 
-  object Lifecycle {
-    const val liveDataKtx =
-      "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.Androidx.lifecycle}"
-    const val runtime = "androidx.lifecycle:lifecycle-runtime:${Versions.Androidx.lifecycle}"
-    const val viewModelKtx =
-      "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.Androidx.lifecycle}"
-  }
-
-  object Navigation {
-    const val navFragmentKtx =
-      "androidx.navigation:navigation-fragment-ktx:${Versions.Androidx.navigation}"
-    const val navUiKtx = "androidx.navigation:navigation-ui-ktx:${Versions.Androidx.navigation}"
-  }
-
   object Retrofit {
     const val coreRetrofit = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
     const val gsonConverter = "com.squareup.retrofit2:converter-gson:${Versions.retrofit}"
   }
 
-  object Room {
-    const val compiler = "androidx.room:room-compiler:${Versions.Androidx.room}"
-    const val ktx = "androidx.room:room-ktx:${Versions.Androidx.room}"
-    const val runtime = "androidx.room:room-runtime:${Versions.Androidx.room}"
-    const val testing = "androidx.room:room-testing:${Versions.Androidx.room}"
-  }
-
   object Mlkit {
     const val barcodeScanning =
       "com.google.mlkit:barcode-scanning:${Versions.Mlkit.barcodeScanning}"
@@ -157,7 +121,6 @@ object Dependencies {
 
   const val desugarJdkLibs = "com.android.tools:desugar_jdk_libs:${Versions.desugarJdkLibs}"
   const val fhirUcum = "org.fhir:ucum:${Versions.fhirUcum}"
-  const val gson = "com.google.code.gson:gson:${Versions.gson}"
 
   const val guavaModule = "com.google.guava:guava"
   const val guava = "$guavaModule:${Versions.guava}"
@@ -188,8 +151,6 @@ object Dependencies {
       "androidx.fragment:fragment-testing:${Versions.AndroidxTest.fragmentVersion}"
     const val rules = "androidx.test:rules:${Versions.AndroidxTest.rules}"
     const val runner = "androidx.test:runner:${Versions.AndroidxTest.runner}"
-    const val workTestingRuntimeKtx =
-      "androidx.work:work-testing:${Versions.Androidx.workRuntimeKtx}"
   }
 
   object Espresso {
@@ -212,20 +173,6 @@ object Dependencies {
   const val xmlUnit = "org.xmlunit:xmlunit-core:${Versions.xmlUnit}"
 
   object Versions {
-    object Androidx {
-      const val activity = "1.7.2"
-      const val appCompat = "1.6.1"
-      const val constraintLayout = "2.1.4"
-      const val coreKtx = "1.10.1"
-      const val datastorePref = "1.0.0"
-      const val fragmentKtx = "1.6.0"
-      const val lifecycle = "2.6.1"
-      const val navigation = "2.6.0"
-      const val recyclerView = "1.3.0"
-      const val room = "2.5.2"
-      const val sqliteKtx = "2.3.1"
-      const val workRuntimeKtx = "2.8.1"
-    }
 
     object Cql {
       const val clinicalReasoning = "3.0.0-PRE9-SNAPSHOT"
@@ -243,7 +190,6 @@ object Dependencies {
     const val desugarJdkLibs = "2.0.3"
     const val caffeine = "2.9.1"
     const val fhirUcum = "1.0.3"
-    const val gson = "2.9.1"
     const val guava = "32.1.3-android"
 
     const val hapiFhir = "6.8.0"

diff --git a/buildSrc/src/main/kotlin/Plugins.kt b/buildSrc/src/main/kotlin/Plugins.kt
@@ -37,8 +37,7 @@ object Plugins {
     "androidx.benchmark:benchmark-gradle-plugin:${Versions.benchmarkPlugin}"
   const val kotlinGradlePlugin =
     "org.jetbrains.kotlin:kotlin-gradle-plugin:${Dependencies.Versions.Kotlin.stdlib}"
-  const val navSafeArgsGradlePlugin =
-    "androidx.navigation:navigation-safe-args-gradle-plugin:${Dependencies.Versions.Androidx.navigation}"
+  const val navSafeArgsGradlePlugin = "androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0"
   const val rulerGradlePlugin = "com.spotify.ruler:ruler-gradle-plugin:1.2.1"
   const val flankGradlePlugin = "com.osacky.flank.gradle:fladle:0.17.4"
   const val kspGradlePlugin =

diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
@@ -46,14 +46,14 @@ dependencies {
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
-  implementation(Dependencies.Androidx.appCompat)
-  implementation(Dependencies.Androidx.constraintLayout)
-  implementation(Dependencies.Androidx.coreKtx)
-  implementation(Dependencies.Androidx.fragmentKtx)
   implementation(Dependencies.material)
   implementation(Dependencies.Kotlin.stdlib)
-  implementation(Dependencies.Navigation.navFragmentKtx)
-  implementation(Dependencies.Navigation.navUiKtx)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.core)
+  implementation(libs.androidx.fragment)
+  implementation(libs.androidx.navigation.fragment)
+  implementation(libs.androidx.navigation.ui)
 
   implementation(project(path = ":datacapture"))
   implementation(project(path = ":engine"))

diff --git a/contrib/barcode/build.gradle.kts b/contrib/barcode/build.gradle.kts
@@ -59,14 +59,14 @@ dependencies {
   androidTestImplementation(Dependencies.truth)
 
   implementation(project(":datacapture"))
-  implementation(Dependencies.Androidx.coreKtx)
-  implementation(Dependencies.Androidx.fragmentKtx)
   implementation(Dependencies.Mlkit.barcodeScanning)
   implementation(Dependencies.Mlkit.objectDetection)
   implementation(Dependencies.Mlkit.objectDetectionCustom)
   implementation(Dependencies.material)
   implementation(Dependencies.timber)
-  implementation(Dependencies.Androidx.appCompat)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.core)
+  implementation(libs.androidx.fragment)
 
   testImplementation(Dependencies.AndroidxTest.core)
   testImplementation(Dependencies.AndroidxTest.fragmentTesting)

diff --git a/contrib/locationwidget/build.gradle.kts b/contrib/locationwidget/build.gradle.kts
@@ -51,13 +51,13 @@ configurations { all { removeIncompatibleDependencies() } }
 
 dependencies {
   implementation(project(":datacapture"))
-  implementation(Dependencies.Androidx.coreKtx)
-  implementation(Dependencies.Androidx.fragmentKtx)
   implementation(Dependencies.playServicesLocation)
   implementation(Dependencies.Kotlin.kotlinCoroutinesPlay)
   implementation(Dependencies.material)
   implementation(Dependencies.timber)
-  implementation(Dependencies.Androidx.appCompat)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.core)
+  implementation(libs.androidx.fragment)
 
   testImplementation(Dependencies.AndroidxTest.fragmentTesting)
   testImplementation(Dependencies.Kotlin.kotlinTestJunit)

diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
@@ -84,22 +84,22 @@ dependencies {
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
-  implementation(Dependencies.Androidx.appCompat)
-  implementation(Dependencies.Androidx.constraintLayout)
-  implementation(Dependencies.Androidx.coreKtx)
-  implementation(Dependencies.Androidx.fragmentKtx)
-  implementation(libs.glide)
   implementation(Dependencies.HapiFhir.guavaCaching)
   implementation(Dependencies.HapiFhir.validation) {
     exclude(module = "commons-logging")
     exclude(module = "httpclient")
   }
   implementation(Dependencies.Kotlin.kotlinCoroutinesCore)
   implementation(Dependencies.Kotlin.stdlib)
-  implementation(Dependencies.Lifecycle.viewModelKtx)
   implementation(Dependencies.androidFhirCommon)
   implementation(Dependencies.material)
   implementation(Dependencies.timber)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.core)
+  implementation(libs.androidx.fragment)
+  implementation(libs.androidx.lifecycle.viewmodel)
+  implementation(libs.glide)
 
   testImplementation(Dependencies.AndroidxTest.core)
   testImplementation(Dependencies.AndroidxTest.fragmentTesting)

diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -43,23 +43,23 @@ dependencies {
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
-  implementation(Dependencies.Androidx.activity)
-  implementation(Dependencies.Androidx.appCompat)
-  implementation(Dependencies.Androidx.constraintLayout)
-  implementation(Dependencies.Androidx.datastorePref)
-  implementation(Dependencies.Androidx.fragmentKtx)
-  implementation(Dependencies.Androidx.recyclerView)
-  implementation(Dependencies.Androidx.workRuntimeKtx)
   implementation(Dependencies.Kotlin.kotlinCoroutinesAndroid)
   implementation(Dependencies.Kotlin.kotlinCoroutinesCore)
   implementation(Dependencies.Kotlin.stdlib)
-  implementation(Dependencies.Lifecycle.liveDataKtx)
-  implementation(Dependencies.Lifecycle.runtime)
-  implementation(Dependencies.Lifecycle.viewModelKtx)
-  implementation(Dependencies.Navigation.navFragmentKtx)
-  implementation(Dependencies.Navigation.navUiKtx)
   implementation(Dependencies.material)
   implementation(Dependencies.timber)
+  implementation(libs.androidx.activity)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.datastore.preferences)
+  implementation(libs.androidx.fragment)
+  implementation(libs.androidx.lifecycle.livedata)
+  implementation(libs.androidx.lifecycle.runtime)
+  implementation(libs.androidx.lifecycle.viewmodel)
+  implementation(libs.androidx.navigation.fragment)
+  implementation(libs.androidx.navigation.ui)
+  implementation(libs.androidx.recyclerview)
+  implementation(libs.androidx.work.runtime)
   implementation(project(":datacapture")) {
     exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirEngineModule)
   }

diff --git a/document/build.gradle.kts b/document/build.gradle.kts
@@ -33,8 +33,6 @@ android {
 }
 
 dependencies {
-  implementation(Dependencies.Androidx.coreKtx)
-  implementation(Dependencies.Androidx.appCompat)
   implementation(Dependencies.material)
   implementation(Dependencies.androidFhirEngine)
   implementation(Dependencies.Retrofit.coreRetrofit)
@@ -43,6 +41,8 @@ dependencies {
   implementation(Dependencies.zxing)
   implementation(Dependencies.nimbus)
   implementation(Dependencies.timber)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.core)
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 

diff --git a/engine/benchmark/build.gradle.kts b/engine/benchmark/build.gradle.kts
@@ -44,16 +44,16 @@ android {
 afterEvaluate { configureFirebaseTestLabForMicroBenchmark() }
 
 dependencies {
-  androidTestImplementation(Dependencies.Androidx.workRuntimeKtx)
   androidTestImplementation(Dependencies.AndroidxTest.benchmarkJunit)
   androidTestImplementation(Dependencies.AndroidxTest.extJunit)
   androidTestImplementation(Dependencies.AndroidxTest.runner)
-  androidTestImplementation(Dependencies.AndroidxTest.workTestingRuntimeKtx)
   androidTestImplementation(Dependencies.Kotlin.kotlinCoroutinesAndroid)
   androidTestImplementation(Dependencies.Retrofit.coreRetrofit)
   androidTestImplementation(Dependencies.junit)
   androidTestImplementation(Dependencies.mockWebServer)
   androidTestImplementation(Dependencies.truth)
+  androidTestImplementation(libs.androidx.work.runtime)
+  androidTestImplementation(libs.androidx.work.testing)
 
   androidTestImplementation(project(":engine"))
   // for test json files only

diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts
@@ -95,10 +95,10 @@ dependencies {
   androidTestImplementation(Dependencies.AndroidxTest.core)
   androidTestImplementation(Dependencies.AndroidxTest.extJunitKtx)
   androidTestImplementation(Dependencies.AndroidxTest.runner)
-  androidTestImplementation(Dependencies.AndroidxTest.workTestingRuntimeKtx)
-  androidTestImplementation(Dependencies.Room.testing)
   androidTestImplementation(Dependencies.junit)
   androidTestImplementation(Dependencies.truth)
+  androidTestImplementation(libs.androidx.room.testing)
+  androidTestImplementation(libs.androidx.work.testing)
 
   api(Dependencies.HapiFhir.structuresR4) { exclude(module = "junit") }
 
@@ -115,31 +115,30 @@ dependencies {
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
-  implementation(Dependencies.Androidx.datastorePref)
-  implementation(Dependencies.Androidx.sqliteKtx)
-  implementation(Dependencies.Androidx.workRuntimeKtx)
   implementation(Dependencies.HapiFhir.validation) {
     exclude(module = "commons-logging")
     exclude(module = "httpclient")
   }
   implementation(Dependencies.Kotlin.stdlib)
-  implementation(Dependencies.Lifecycle.liveDataKtx)
   implementation(Dependencies.Retrofit.coreRetrofit)
-  implementation(Dependencies.Room.ktx)
-  implementation(Dependencies.Room.runtime)
   implementation(Dependencies.androidFhirCommon)
   implementation(Dependencies.guava)
   implementation(Dependencies.httpInterceptor)
   implementation(Dependencies.jsonToolsPatch)
   implementation(Dependencies.sqlcipher)
   implementation(Dependencies.timber)
   implementation(Dependencies.truth)
+  implementation(libs.androidx.datastore.preferences)
+  implementation(libs.androidx.lifecycle.livedata)
+  implementation(libs.androidx.room.room)
+  implementation(libs.androidx.room.runtime)
+  implementation(libs.androidx.sqlite)
+  implementation(libs.androidx.work.runtime)
 
-  ksp(Dependencies.Room.compiler)
+  ksp(libs.androidx.room.compiler)
 
   testImplementation(Dependencies.AndroidxTest.archCore)
   testImplementation(Dependencies.AndroidxTest.core)
-  testImplementation(Dependencies.AndroidxTest.workTestingRuntimeKtx)
   testImplementation(Dependencies.Kotlin.kotlinCoroutinesTest)
   testImplementation(Dependencies.Kotlin.kotlinTestJunit)
   testImplementation(Dependencies.junit)
@@ -149,6 +148,7 @@ dependencies {
   testImplementation(Dependencies.mockWebServer)
   testImplementation(Dependencies.robolectric)
   testImplementation(Dependencies.truth)
+  testImplementation(libs.androidx.work.testing)
 
   constraints {
     Dependencies.hapiFhirConstraints().forEach { (libName, constraints) ->

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,40 @@
 # see https://docs.gradle.org/current/userguide/platforms.html
 
 [versions]
+androidx-acivity = "1.7.2"
+androidx-appcompat = "1.6.1"
+androidx-constraintlayout = "2.1.4"
+androidx-core = "1.10.1"
+androidx-datastore-preferences = "1.0.0"
+androidx-fragment = "1.6.0"
+androidx-lifecycle = "2.6.1"
+androidx-navigation = "2.6.0"
+androidx-recyclerview = "1.3.0"
+androidx-room = "2.5.2"
+androidx-sqlite = "2.3.1"
+androidx-work = "2.8.1"
 glide = "4.16.0"
 
 [libraries]
+androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-acivity" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
+androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
+androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore-preferences" }
+androidx-fragment = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" }
+androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
+androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
+androidx-navigation-ui = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "androidx-navigation" }
+androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "androidx-recyclerview" }
+androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidx-room" }
+androidx-room-room = { module = "androidx.room:room-ktx", version.ref = "androidx-room" }
+androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidx-room" }
+androidx-room-testing = { module = "androidx.room:room-testing", version.ref = "androidx-room" }
+androidx-sqlite = { module = "androidx.sqlite:sqlite-ktx", version.ref = "androidx-sqlite" }
+androidx-work-runtime = { module = "androidx.work:work-runtime-ktx", version.ref = "androidx-work" }
+androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidx-work" }
 glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 
 [bundles]

diff --git a/knowledge/build.gradle.kts b/knowledge/build.gradle.kts
@@ -84,15 +84,15 @@ dependencies {
 
   implementation(Dependencies.Kotlin.stdlib)
   implementation(Dependencies.Kotlin.kotlinCoroutinesCore)
-  implementation(Dependencies.Lifecycle.liveDataKtx)
-  implementation(Dependencies.Room.ktx)
-  implementation(Dependencies.Room.runtime)
   implementation(Dependencies.timber)
   implementation(Dependencies.http)
   implementation(Dependencies.HapiFhir.fhirCoreConvertors)
   implementation(Dependencies.apacheCommonsCompress)
+  implementation(libs.androidx.lifecycle.livedata)
+  implementation(libs.androidx.room.room)
+  implementation(libs.androidx.room.runtime)
 
-  ksp(Dependencies.Room.compiler)
+  ksp(libs.androidx.room.compiler)
 
   testImplementation(Dependencies.AndroidxTest.archCore)
   testImplementation(Dependencies.AndroidxTest.core)