diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 4c73349b1d..07a74bdb16 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -23,6 +23,7 @@ object Dependencies { "androidx.constraintlayout:constraintlayout:${Versions.Androidx.constraintLayout}" 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}" const val datastorePref = "androidx.datastore:datastore-preferences:${Versions.Androidx.datastorePref}" @@ -78,6 +79,7 @@ object Dependencies { const val desugarJdkLibs = "com.android.tools:desugar_jdk_libs:${Versions.desugarJdkLibs}" const val guava = "com.google.guava:guava:${Versions.guava}" + const val fhirUcum = "org.fhir:ucum:${Versions.fhirUcum}" const val httpInterceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.http}" const val http = "com.squareup.okhttp3:okhttp:${Versions.http}" const val jsonToolsPatch = "com.github.java-json-tools:json-patch:${Versions.jsonToolsPatch}" @@ -120,6 +122,7 @@ object Dependencies { const val navigation = "2.3.4" const val recyclerView = "1.1.0" const val room = "2.3.0" + const val sqliteKtx = "2.1.0" const val workRuntimeKtx = "2.5.0" const val datastorePref = "1.0.0-rc02" } @@ -137,6 +140,7 @@ object Dependencies { const val apacheCommonsCompress = "1.20" const val apacheCommonsIo = "2.10.0" const val desugarJdkLibs = "1.0.9" + const val fhirUcum = "1.0.3" const val guava = "28.2-android" const val hapiFhir = "5.4.0" const val http = "4.9.1" diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts index 93958b7bf8..74d4df5d96 100644 --- a/engine/build.gradle.kts +++ b/engine/build.gradle.kts @@ -12,7 +12,7 @@ afterEvaluate { from(components["release"]) artifactId = "engine" groupId = "com.google.android.fhir" - version = "0.1.0-alpha04" + version = "0.1.0-alpha05" // Also publish source code for developers' convenience artifact( tasks.create("androidSourcesJar") { @@ -102,8 +102,6 @@ configurations { } dependencies { - implementation("androidx.sqlite:sqlite-ktx:2.1.0") - implementation("org.fhir:ucum:1.0.3") androidTestImplementation(Dependencies.AndroidxTest.core) androidTestImplementation(Dependencies.AndroidxTest.extJunitKtx) androidTestImplementation(Dependencies.AndroidxTest.runner) @@ -114,18 +112,20 @@ 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.Lifecycle.liveDataKtx) implementation(Dependencies.Kotlin.stdlib) implementation(Dependencies.Room.runtime) implementation(Dependencies.Room.ktx) + implementation(Dependencies.fhirUcum) implementation(Dependencies.guava) implementation(Dependencies.jsonToolsPatch) - implementation(Dependencies.Lifecycle.liveDataKtx) - implementation(Dependencies.Androidx.datastorePref) kapt(Dependencies.Room.compiler)