Fix engine and knowledge library versions in workflow and testing

benchmark/build.gradle.kts

@@ -73,7 +73,12 @@ dependencies {
   androidTestImplementation(Dependencies.Retrofit.coreRetrofit)
 
   androidTestImplementation(project(":engine"))
-  androidTestImplementation(project(":knowledge"))
-  androidTestImplementation(project(":workflow"))
+  androidTestImplementation(project(":knowledge")) {
+    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirEngineModule)
+  }
+  androidTestImplementation(project(":workflow")) {
+    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirEngineModule)
+    exclude(group = Dependencies.androidFhirGroup, module = Dependencies.androidFhirKnowledgeModule)
+  }
   androidTestImplementation(project(":workflow-testing"))
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -168,10 +168,12 @@ object Dependencies {
   }
 
   const val androidFhirGroup = "com.google.android.fhir"
-  const val androidFhirCommon = "$androidFhirGroup:common:${Versions.androidFhirCommon}"
   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 desugarJdkLibs = "com.android.tools:desugar_jdk_libs:${Versions.desugarJdkLibs}"
   const val fhirUcum = "org.fhir:ucum:${Versions.fhirUcum}"
@@ -211,13 +213,15 @@ object Dependencies {
 
   const val androidBenchmarkRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
   const val androidJunitRunner = "androidx.test.runner.AndroidJUnitRunner"
+
   // Makes Json assertions where the order of elements, tabs/whitespaces are not important.
   const val jsonAssert = "org.skyscreamer:jsonassert:${Versions.jsonAssert}"
   const val junit = "junit:junit:${Versions.junit}"
   const val mockitoKotlin = "org.mockito.kotlin:mockito-kotlin:${Versions.mockitoKotlin}"
   const val mockitoInline = "org.mockito:mockito-inline:${Versions.mockitoInline}"
   const val robolectric = "org.robolectric:robolectric:${Versions.robolectric}"
   const val truth = "com.google.truth:truth:${Versions.truth}"
+
   // Makes XML assertions where the order of elements, tabs/whitespaces are not important.
   const val xmlUnit = "org.xmlunit:xmlunit-core:${Versions.xmlUnit}"
 
@@ -253,7 +257,8 @@ object Dependencies {
     }
 
     const val androidFhirCommon = "0.1.0-alpha04"
-    const val androidFhirEngine = "0.1.0-beta02"
+    const val androidFhirEngine = "0.1.0-beta03"
+    const val androidFhirKnowledge = "0.1.0-alpha01"
     const val desugarJdkLibs = "2.0.3"
     const val caffeine = "2.9.1"
     const val fhirUcum = "1.0.3"
@@ -264,6 +269,7 @@ object Dependencies {
     // Newer versions of HapiFhir don't work on Android due to the use of Caffeine 3+
     // Wait for this to release (6.3): https://github.com/hapifhir/hapi-fhir/pull/4196
     const val hapiFhir = "6.0.1"
+
     // Newer versions don't work on Android due to Apache Commons Codec:
     // Wait for this fix: https://github.com/hapifhir/org.hl7.fhir.core/issues/1046
     const val hapiFhirCore = "5.6.36"

buildSrc/src/main/kotlin/LicenseeConfig.kt

@@ -56,6 +56,9 @@ fun Project.configureLicensee() {
     }
 
     // SQLCipher
+    allowDependency("net.zetetic", "android-database-sqlcipher", "4.5.0") {
+      because("Custom license, essentially BSD-3. https://www.zetetic.net/sqlcipher/license/")
+    }
     allowDependency("net.zetetic", "android-database-sqlcipher", "4.5.4") {
       because("Custom license, essentially BSD-3. https://www.zetetic.net/sqlcipher/license/")
     }

buildSrc/src/main/kotlin/Releases.kt

@@ -37,6 +37,8 @@ object Releases {
   const val groupId = "com.google.android.fhir"
 
   // Libraries
+  // After releasing a new version of a library, you will need to bump up the library version
+  // in Dependencies.kt (in a separate PR)
 
   object Common : LibraryArtifact {
     override val artifactId = "common"

testing/build.gradle.kts

@@ -16,7 +16,7 @@ android {
 }
 
 dependencies {
-  api(project(":engine"))
+  api(Dependencies.androidFhirEngine)
 
   implementation(Dependencies.AndroidxTest.rules)
 }

workflow/build.gradle.kts

@@ -133,8 +133,8 @@ dependencies {
   implementation(Dependencies.Kotlin.kotlinCoroutinesCore)
   implementation(Dependencies.Kotlin.stdlib)
   implementation(Dependencies.xerces)
-  implementation(project(":engine"))
-  implementation(project(":knowledge"))
+  implementation(Dependencies.androidFhirEngine) { exclude(module = "truth") }
+  implementation(Dependencies.androidFhirKnowledge)
 
   testImplementation(Dependencies.AndroidxTest.core)
   testImplementation(Dependencies.jsonAssert)

workflow/src/test/java/com/google/android/fhir/workflow/FhirOperatorTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -148,7 +148,7 @@ class FhirOperatorTest {
 
     assertEquals(
       readResourceAsString("/plan-definition/cql-applicability-condition/care_plan.json"),
-      jsonParser.encodeResourceToString(carePlan),
+      jsonParser.setPrettyPrint(true).encodeResourceToString(carePlan),
       true
     )
   }