Update internal dependency on knowledge to beta01 (#2690)

buildSrc/src/main/kotlin/Dependencies.kt

@@ -87,14 +87,6 @@ object Dependencies {
   const val playServicesLocation =
     "com.google.android.gms:play-services-location:${Versions.playServicesLocation}"
 
-  const val androidFhirGroup = "com.google.android.fhir"
-  const val androidFhirEngineModule = "engine"
-  const val androidFhirKnowledgeModule = "knowledge"
-  const val androidFhirCommon = "$androidFhirGroup:common:${Versions.androidFhirCommon}"
-  const val androidFhirEngine =
-    "$androidFhirGroup:$androidFhirEngineModule:${Versions.androidFhirEngine}"
-  const val androidFhirKnowledge = "$androidFhirGroup:knowledge:${Versions.androidFhirKnowledge}"
-
   const val apacheCommonsCompress =
     "org.apache.commons:commons-compress:${Versions.apacheCommonsCompress}"
 
@@ -131,9 +123,6 @@ object Dependencies {
   const val xmlUnit = "org.xmlunit:xmlunit-core:${Versions.xmlUnit}"
 
   object Versions {
-    const val androidFhirCommon = "0.1.0-alpha05"
-    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"

datacapture/build.gradle.kts

@@ -90,9 +90,9 @@ dependencies {
     exclude(module = "commons-logging")
     exclude(module = "httpclient")
   }
-  implementation(Dependencies.androidFhirCommon)
   implementation(Dependencies.material)
   implementation(Dependencies.timber)
+  implementation(libs.android.fhir.common)
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.constraintlayout)
   implementation(libs.androidx.core)
@@ -106,7 +106,7 @@ dependencies {
   testImplementation(Dependencies.mockitoKotlin)
   testImplementation(Dependencies.robolectric)
   testImplementation(project(":knowledge")) {
-    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirEngineModule)
+    exclude(group = "com.google.android.fhir", module = "engine")
   }
   testImplementation(libs.androidx.test.core)
   testImplementation(libs.androidx.fragment.testing)

demo/build.gradle.kts

@@ -61,7 +61,7 @@ dependencies {
   implementation(libs.kotlinx.coroutines.android)
   implementation(libs.kotlinx.coroutines.core)
   implementation(project(":datacapture")) {
-    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirEngineModule)
+    exclude(group = "com.google.android.fhir", module = "engine")
   }
   implementation(project(":engine"))
 

document/build.gradle.kts

@@ -39,13 +39,13 @@ dependencies {
   coreLibraryDesugaring(Dependencies.desugarJdkLibs)
 
   implementation(Dependencies.material)
-  implementation(Dependencies.androidFhirEngine)
   implementation(Dependencies.Retrofit.coreRetrofit)
   implementation(Dependencies.Retrofit.gsonConverter)
   implementation(Dependencies.httpInterceptor)
   implementation(Dependencies.zxing)
   implementation(Dependencies.nimbus)
   implementation(Dependencies.timber)
+  implementation(libs.android.fhir.engine)
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.core)
 

engine/build.gradle.kts

@@ -113,14 +113,14 @@ dependencies {
     exclude(module = "httpclient")
   }
   implementation(Dependencies.Retrofit.coreRetrofit)
-  implementation(Dependencies.androidFhirCommon)
   implementation(Dependencies.guava)
   implementation(Dependencies.httpInterceptor)
   implementation(Dependencies.jsonToolsPatch)
   implementation(Dependencies.sqlcipher)
   implementation(Dependencies.timber)
   implementation(Dependencies.woodstox)
   implementation(Dependencies.xerces)
+  implementation(libs.android.fhir.common)
   implementation(libs.androidx.datastore.preferences)
   implementation(libs.androidx.lifecycle.livedata)
   implementation(libs.androidx.room.room)

gradle/libs.versions.toml

@@ -1,6 +1,9 @@
 # see https://docs.gradle.org/current/userguide/platforms.html
 
 [versions]
+android-fhir-common = "0.1.0-alpha05"
+android-fhir-engine = "0.1.0-beta05"
+android-fhir-knowledge = "0.1.0-beta01"
 androidx-acivity = "1.7.2"
 androidx-appcompat = "1.6.1"
 androidx-arch-core = "2.2.0"
@@ -30,6 +33,9 @@ opencds-cqf-fhir = "3.8.0"
 truth = "1.1.5"
 
 [libraries]
+android-fhir-common = { module = "com.google.android.fhir:common", version.ref = "android-fhir-common" }
+android-fhir-engine = { module = "com.google.android.fhir:engine", version.ref = "android-fhir-engine" }
+android-fhir-knowledge = { module = "com.google.android.fhir:knowledge", version.ref = "android-fhir-knowledge" }
 androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-acivity" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
 androidx-arch-core-testing = { module = "androidx.arch.core:core-testing", version.ref = "androidx-arch-core" }

workflow/benchmark/build.gradle.kts

@@ -70,11 +70,11 @@ dependencies {
   androidTestImplementation(libs.truth)
   androidTestImplementation(project(":engine"))
   androidTestImplementation(project(":knowledge")) {
-    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirEngineModule)
+    exclude(group = "com.google.android.fhir", module = "engine")
   }
   androidTestImplementation(project(":workflow")) {
-    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirEngineModule)
-    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirKnowledgeModule)
+    exclude(group = "com.google.android.fhir", module = "engine")
+    exclude(group = "com.google.android.fhir", module = "knowledge")
   }
   androidTestImplementation(project(":workflow-testing"))
 

workflow/build.gradle.kts

@@ -1,5 +1,6 @@
 import Dependencies.removeIncompatibleDependencies
 import java.net.URL
+import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.exclude
 
 plugins {
   id(Plugins.BuildPlugins.androidLib)
@@ -95,10 +96,10 @@ dependencies {
   api(Dependencies.HapiFhir.guavaCaching)
 
   implementation(Dependencies.HapiFhir.guavaCaching)
-  implementation(Dependencies.androidFhirEngine) { exclude(module = "truth") }
-  implementation(Dependencies.androidFhirKnowledge)
   implementation(Dependencies.timber)
   implementation(Dependencies.xerces)
+  implementation(libs.android.fhir.engine) { exclude(module = "truth") }
+  implementation(libs.android.fhir.knowledge)
   implementation(libs.androidx.core)
   implementation(libs.kotlin.stdlib)
   implementation(libs.kotlinx.coroutines.android)
@@ -123,7 +124,8 @@ dependencies {
       resolutionStrategy.dependencySubstitution {
         // To test the workflow library against the latest Knowledge Manager APIs, substitute the
         // dependency on the released Knowledge Manager library with the current build.
-        substitute(module(Dependencies.androidFhirKnowledge)).using(project(":knowledge"))
+        substitute(module("com.google.android.fhir:knowledge:0.1.0-beta01"))
+          .using(project(":knowledge"))
       }
     }
   }