Merge branch 'master' into sp/inequality

common/build.gradle.kts

@@ -8,7 +8,4 @@ java {
  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-dependencies {
- api(Dependencies.HapiFhir.structuresR4) { exclude(module = "junit") }
- implementation(Dependencies.fhirUcum)
-}
+dependencies { implementation(Dependencies.fhirUcum) }

common/src/main/java/com/google/android/fhir/UnitConverter.kt

@@ -24,6 +24,7 @@ import org.fhir.ucum.Pair
 import org.fhir.ucum.UcumEssenceService
 import org.fhir.ucum.UcumException
 
+/** Canonicalizes unit values to UCUM base units. */
 object UnitConverter {
  private val ucumService by lazy {
  UcumEssenceService(this::class.java.getResourceAsStream("/ucum-essence.xml"))

datacapture/build.gradle.kts

@@ -73,7 +73,6 @@ android {
 configurations { all { exclude(module = "xpp3") } }
 
 dependencies {
- implementation(project(mapOf("path" to ":common")))
  androidTestImplementation(Dependencies.AndroidxTest.core)
  androidTestImplementation(Dependencies.AndroidxTest.extJunit)
  androidTestImplementation(Dependencies.AndroidxTest.extJunitKtx)
@@ -100,6 +99,7 @@ dependencies {
  implementation(Dependencies.Lifecycle.viewModelKtx)
  implementation(Dependencies.material)
  implementation(Dependencies.flexBox)
+ implementation(project(":common"))
 
  testImplementation(Dependencies.AndroidxTest.core)
  testImplementation(Dependencies.junit)

engine/build.gradle.kts

@@ -106,7 +106,6 @@ configurations {
 }
 
 dependencies {
- implementation(project(mapOf("path" to ":common")))
  androidTestImplementation(Dependencies.AndroidxTest.core)
  androidTestImplementation(Dependencies.AndroidxTest.extJunitKtx)
  androidTestImplementation(Dependencies.AndroidxTest.runner)

settings.gradle.kts

@@ -9,7 +9,3 @@ include(":datacapturegallery")
 include(":engine")
 
 include(":reference")
-
-include(":codegen")
-
-include(":common")