Merge branch 'master' into ak/978-auto-complete-widget-rewrite

google · Jun 27, 2022 · 85a114d · 85a114d
2 parents ea0fd6d + e331b97
commit 85a114d
Show file tree

Hide file tree

Showing 137 changed files with 2,755 additions and 787 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,13 @@ allprojects {
   configureSpotless()
 }
 
-subprojects { configureLicensee() }
+subprojects {
+  // We have some empty folders like the :contrib root folder, which Gradle recognizes as projects.
+  // Don't configure plugins for those folders.
+  if (project.buildFile.exists()) {
+    configureLicensee()
+  }
+}
 
 // Create a CI repository and also change versions to include the build number
 afterEvaluate {

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -92,13 +92,18 @@ object Dependencies {
     const val runtime = "androidx.room:room-runtime:${Versions.Androidx.room}"
   }
 
+  object Mlkit {
+    const val barcodeScanning =
+      "com.google.mlkit:barcode-scanning:${Versions.Mlkit.barcodeScanning}"
+    const val objectDetection =
+      "com.google.mlkit:object-detection:${Versions.Mlkit.objectDetection}"
+    const val objectDetectionCustom =
+      "com.google.mlkit:object-detection-custom:${Versions.Mlkit.objectDetectionCustom}"
+  }
+
   const val androidFhirCommon = "com.google.android.fhir:common:${Versions.androidFhirCommon}"
-  const val barcodeScanning = "com.google.mlkit:barcode-scanning:${Versions.Mlkit.barcodeScanning}"
   const val lifecycleExtensions =
     "androidx.lifecycle:lifecycle-extensions:${Versions.Androidx.lifecycle}"
-  const val objectDetection = "com.google.mlkit:object-detection:${Versions.Mlkit.objectDetection}"
-  const val objectDetectionCustom =
-    "com.google.mlkit:object-detection-custom:${Versions.Mlkit.objectDetectionCustom}"
   const val desugarJdkLibs = "com.android.tools:desugar_jdk_libs:${Versions.desugarJdkLibs}"
   const val fhirUcum = "org.fhir:ucum:${Versions.fhirUcum}"
   const val guava = "com.google.guava:guava:${Versions.guava}"

diff --git a/buildSrc/src/main/kotlin/Releases.kt b/buildSrc/src/main/kotlin/Releases.kt
@@ -63,6 +63,14 @@ object Releases {
     override val name = "Android FHIR Workflow Library"
   }
 
+  object Contrib {
+    object Barcode : LibraryArtifact {
+      override val artifactId = "contrib-barcode"
+      override val version = "0.1.0-beta3"
+      override val name = "Android FHIR Structured Data Capture - Barcode Extensions (contrib)"
+    }
+  }
+
   // Demo apps
 
   object Demo {

diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
@@ -61,6 +61,7 @@ dependencies {
   implementation(Dependencies.Navigation.navUiKtx)
 
   implementation(project(path = ":datacapture"))
+  implementation(project(path = ":contrib:barcode"))
 
   testImplementation(Dependencies.junit)
 }