Merge branch 'master' into custom-package-server

google · Oct 9, 2023 · 01137e6 · 01137e6
2 parents 3b31fb2 + 7efe4d5
commit 01137e6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/buildSrc/src/main/kotlin/LicenseeConfig.kt b/buildSrc/src/main/kotlin/LicenseeConfig.kt
@@ -24,6 +24,12 @@ fun Project.configureLicensee() {
     allow("Apache-2.0")
     allow("MIT")
 
+    ignoreDependencies("com.ibm.icu", "icu4j") {
+      because(
+        "ICU uses an ICU license that was mispaced and cannot be loaded by this tool right now",
+      )
+    }
+
     // Occasionally, dependencies may add their licenses via a direct URL instead of an SPDX id.
     nonStandardLicenseUrls.forEach { allowUrl(it) }
 

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
@@ -42,7 +42,7 @@ object Releases {
 
   object Common : LibraryArtifact {
     override val artifactId = "common"
-    override val version = "0.1.0-alpha04"
+    override val version = "0.1.0-alpha05"
     override val name = "Android FHIR Common Library"
   }
 

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -17,10 +17,20 @@ android {
   kotlin { jvmToolchain(11) }
 }
 
-configurations { all { exclude(module = "xpp3") } }
+configurations {
+  all {
+    exclude(module = "xpp3")
+    exclude(module = "hapi-fhir-caching-caffeine")
+    exclude(group = "com.github.ben-manes.caffeine", module = "caffeine")
+
+    resolutionStrategy { force("com.google.guava:guava:32.1.2-android") }
+  }
+}
 
 dependencies {
-  api(Dependencies.HapiFhir.structuresR4)
+  // REVERT to DEPENDENCIES LATER
+  api("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.8.0")
+  api("ca.uhn.hapi.fhir:hapi-fhir-caching-guava:6.8.0")
 
   implementation(Dependencies.fhirUcum)