From 33205801582f48a559d7be9aa8b6ddc2fcabf50e Mon Sep 17 00:00:00 2001 From: Vishnu Ravi Date: Sun, 26 May 2024 20:01:08 -0400 Subject: [PATCH] Extract dependencies to version catalog --- gradle/libs.versions.toml | 4 ++++ modules/healthconnectonfhir/build.gradle.kts | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94846ab13..df3955a21 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,9 +6,11 @@ androidTools = "31.4.0" appcompat = "1.6.1" compileSdk = "34" composeBom = "2024.05.00" +healthConnectClient = "1.1.0-alpha02" coreKtx = "1.13.1" coreTestingVersion = "2.2.0" coroutinesVersion = "1.8.0" +fhirDataCapture = "1.0.0" dokka = "1.9.20" espressoCore = "3.5.1" hiltNavigation = "1.2.0" @@ -31,9 +33,11 @@ android-gradle = { group = "com.android.tools.build", name = "gradle", version.r android-tools-common = { group = "com.android.tools", name = "common", version.ref = "androidTools" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +androidx-health-connect-client = { module = "androidx.health.connect:connect-client", version.ref = "healthConnectClient" } androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "coreTestingVersion" } androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +android-fhir-data-capture = { module = "com.google.android.fhir:data-capture", version.ref = "fhirDataCapture" } androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleKtx" } androidx-lifecycle-view-model-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleKtx" } diff --git a/modules/healthconnectonfhir/build.gradle.kts b/modules/healthconnectonfhir/build.gradle.kts index 86f255284..abb0b8360 100644 --- a/modules/healthconnectonfhir/build.gradle.kts +++ b/modules/healthconnectonfhir/build.gradle.kts @@ -7,9 +7,6 @@ android { } dependencies { - implementation("androidx.health.connect:connect-client:1.1.0-alpha02") - implementation("com.google.android.fhir:data-capture:1.0.0") - - implementation(project(":core:utils")) - implementation(project(":core:coroutines")) + implementation(libs.androidx.health.connect.client) + implementation(libs.android.fhir.data.capture) } \ No newline at end of file