Use published libraries in workflow library's dependencies (#2278)

google · Oct 22, 2023 · b15a259 · b15a259
1 parent c7750e4
commit b15a259
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -228,8 +228,8 @@ object Dependencies {
     }
 
     const val androidFhirCommon = "0.1.0-alpha05"
-    const val androidFhirEngine = "0.1.0-beta04"
-    const val androidFhirKnowledge = "0.1.0-alpha01"
+    const val androidFhirEngine = "0.1.0-beta05"
+    const val androidFhirKnowledge = "0.1.0-alpha03"
     const val apacheCommonsCompress = "1.21"
     const val desugarJdkLibs = "2.0.3"
     const val caffeine = "2.9.1"

diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
@@ -82,7 +82,6 @@ dependencies {
 
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
-  implementation(Dependencies.androidFhirCommon)
   implementation(Dependencies.Androidx.appCompat)
   implementation(Dependencies.Androidx.constraintLayout)
   implementation(Dependencies.Androidx.coreKtx)
@@ -96,6 +95,7 @@ dependencies {
   implementation(Dependencies.Kotlin.kotlinCoroutinesCore)
   implementation(Dependencies.Kotlin.stdlib)
   implementation(Dependencies.Lifecycle.viewModelKtx)
+  implementation(Dependencies.androidFhirCommon)
   implementation(Dependencies.material)
   implementation(Dependencies.timber)
 

diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
@@ -86,7 +86,6 @@ configurations {
 }
 
 dependencies {
-  testImplementation(project(mapOf("path" to ":knowledge")))
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
   androidTestImplementation(Dependencies.AndroidxTest.core)
@@ -104,26 +103,24 @@ dependencies {
   api(Dependencies.HapiFhir.guavaCaching)
 
   implementation(Dependencies.Androidx.coreKtx)
-
   implementation(Dependencies.Cql.evaluator)
   implementation(Dependencies.Cql.evaluatorFhirJackson)
-  implementation(Dependencies.timber)
-
   implementation(Dependencies.HapiFhir.guavaCaching)
-
   implementation(Dependencies.Kotlin.kotlinCoroutinesAndroid)
   implementation(Dependencies.Kotlin.kotlinCoroutinesCore)
   implementation(Dependencies.Kotlin.stdlib)
+  implementation(Dependencies.androidFhirEngine) { exclude(module = "truth") }
+  implementation(Dependencies.androidFhirKnowledge)
+  implementation(Dependencies.timber)
   implementation(Dependencies.xerces)
-  implementation(project(":engine")) { exclude(module = "truth") }
-  implementation(project(":knowledge"))
 
   testImplementation(Dependencies.AndroidxTest.core)
   testImplementation(Dependencies.jsonAssert)
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.robolectric)
   testImplementation(Dependencies.truth)
   testImplementation(Dependencies.xmlUnit)
+  testImplementation(project(mapOf("path" to ":knowledge")))
   testImplementation(project(":workflow-testing"))
 }