-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into main-lw-sample
* main: Add icons to be displayed on eusm service point register. (#3047) Upgrade sdk libraries to latest versions (#2825) Make Login Screen Logo Size Configurable (#3045) # Conflicts: # android/gradle/libs.versions.toml # android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt
- Loading branch information
Showing
165 changed files
with
55,205 additions
and
1,309 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| plugins { | ||
| `kotlin-dsl` | ||
| } | ||
|
|
||
| repositories { | ||
| google() | ||
| gradlePluginPortal() | ||
| mavenCentral() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| /* | ||
| * Copyright 2023-2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import org.gradle.api.artifacts.Configuration | ||
| import org.gradle.api.artifacts.DependencyConstraint | ||
| import org.gradle.kotlin.dsl.exclude | ||
|
|
||
| object Dependencies { | ||
|
|
||
| object HapiFhir { | ||
| const val fhirBaseModule = "ca.uhn.hapi.fhir:hapi-fhir-base" | ||
| const val fhirClientModule = "ca.uhn.hapi.fhir:hapi-fhir-client" | ||
| const val structuresDstu2Module = "ca.uhn.hapi.fhir:hapi-fhir-structures-dstu2" | ||
| const val structuresDstu3Module = "ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3" | ||
| const val structuresR4Module = "ca.uhn.hapi.fhir:hapi-fhir-structures-r4" | ||
| const val structuresR4bModule = "ca.uhn.hapi.fhir:hapi-fhir-structures-r4b" | ||
| const val structuresR5Module = "ca.uhn.hapi.fhir:hapi-fhir-structures-r5" | ||
|
|
||
| const val validationModule = "ca.uhn.hapi.fhir:hapi-fhir-validation" | ||
| const val validationDstu3Module = "ca.uhn.hapi.fhir:hapi-fhir-validation-resources-dstu3" | ||
| const val validationR4Module = "ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4" | ||
| const val validationR5Module = "ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r5" | ||
|
|
||
| const val fhirCoreDstu2Module = "ca.uhn.hapi.fhir:org.hl7.fhir.dstu2" | ||
| const val fhirCoreDstu2016Module = "ca.uhn.hapi.fhir:org.hl7.fhir.dstu2016may" | ||
| const val fhirCoreDstu3Module = "ca.uhn.hapi.fhir:org.hl7.fhir.dstu3" | ||
| const val fhirCoreR4Module = "ca.uhn.hapi.fhir:org.hl7.fhir.r4" | ||
| const val fhirCoreR4bModule = "ca.uhn.hapi.fhir:org.hl7.fhir.r4b" | ||
| const val fhirCoreR5Module = "ca.uhn.hapi.fhir:org.hl7.fhir.r5" | ||
| const val fhirCoreUtilsModule = "ca.uhn.hapi.fhir:org.hl7.fhir.utilities" | ||
| const val fhirCoreConvertorsModule = "ca.uhn.hapi.fhir:org.hl7.fhir.convertors" | ||
|
|
||
| const val guavaCachingModule = "ca.uhn.hapi.fhir:hapi-fhir-caching-guava" | ||
|
|
||
| const val fhirBase = "$fhirBaseModule:${Versions.hapiFhir}" | ||
| const val fhirClient = "$fhirClientModule:${Versions.hapiFhir}" | ||
| const val structuresDstu2 = "$structuresDstu2Module:${Versions.hapiFhir}" | ||
| const val structuresDstu3 = "$structuresDstu3Module:${Versions.hapiFhir}" | ||
| const val structuresR4 = "$structuresR4Module:${Versions.hapiFhir}" | ||
| const val structuresR4b = "$structuresR4bModule:${Versions.hapiFhir}" | ||
| const val structuresR5 = "$structuresR5Module:${Versions.hapiFhir}" | ||
|
|
||
| const val validation = "$validationModule:${Versions.hapiFhir}" | ||
| const val validationDstu3 = "$validationDstu3Module:${Versions.hapiFhir}" | ||
| const val validationR4 = "$validationR4Module:${Versions.hapiFhir}" | ||
| const val validationR5 = "$validationR5Module:${Versions.hapiFhir}" | ||
|
|
||
| const val fhirCoreDstu2 = "$fhirCoreDstu2Module:${Versions.hapiFhirCore}" | ||
| const val fhirCoreDstu2016 = "$fhirCoreDstu2016Module:${Versions.hapiFhirCore}" | ||
| const val fhirCoreDstu3 = "$fhirCoreDstu3Module:${Versions.hapiFhirCore}" | ||
| const val fhirCoreR4 = "$fhirCoreR4Module:${Versions.hapiFhirCore}" | ||
| const val fhirCoreR4b = "$fhirCoreR4bModule:${Versions.hapiFhirCore}" | ||
| const val fhirCoreR5 = "$fhirCoreR5Module:${Versions.hapiFhirCore}" | ||
| const val fhirCoreUtils = "$fhirCoreUtilsModule:${Versions.hapiFhirCore}" | ||
| const val fhirCoreConvertors = "$fhirCoreConvertorsModule:${Versions.hapiFhirCore}" | ||
|
|
||
| const val guavaCaching = "$guavaCachingModule:${Versions.hapiFhir}" | ||
| } | ||
|
|
||
| object Jackson { | ||
| private const val mainGroup = "com.fasterxml.jackson" | ||
| private const val coreGroup = "$mainGroup.core" | ||
| private const val dataformatGroup = "$mainGroup.dataformat" | ||
| private const val datatypeGroup = "$mainGroup.datatype" | ||
| private const val moduleGroup = "$mainGroup.module" | ||
|
|
||
| const val annotationsBase = "$coreGroup:jackson-annotations:${Versions.jackson}" | ||
| const val bomBase = "$mainGroup:jackson-bom:${Versions.jackson}" | ||
| const val coreBase = "$coreGroup:jackson-core:${Versions.jacksonCore}" | ||
| const val databindBase = "$coreGroup:jackson-databind:${Versions.jackson}" | ||
| const val dataformatXmlBase = "$dataformatGroup:jackson-dataformat-xml:${Versions.jackson}" | ||
| const val jaxbAnnotationsBase = | ||
| "$moduleGroup:jackson-module-jaxb-annotations:${Versions.jackson}" | ||
| const val jsr310Base = "$datatypeGroup:jackson-datatype-jsr310:${Versions.jackson}" | ||
| } | ||
|
|
||
| object Versions { | ||
| const val hapiFhir = "6.8.0" | ||
| const val hapiFhirCore = "6.0.22" | ||
|
|
||
| // Maximum Jackson libraries (excluding core) version that supports Android API Level 24: | ||
| // https://github.com/FasterXML/jackson-databind/issues/3658 | ||
| const val jackson = "2.13.5" | ||
|
|
||
| // Maximum Jackson Core library version that supports Android API Level 24: | ||
| const val jacksonCore = "2.15.2" | ||
| } | ||
|
|
||
| fun Configuration.removeIncompatibleDependencies() { | ||
| exclude(module = "xpp3") | ||
| exclude(module = "xpp3_min") | ||
| exclude(module = "xmlpull") | ||
| exclude(module = "javax.json") | ||
| exclude(module = "jcl-over-slf4j") | ||
| exclude(group = "org.apache.httpcomponents") | ||
| exclude(group = "org.antlr", module = "antlr4") | ||
| exclude(group = "org.eclipse.persistence", module = "org.eclipse.persistence.moxy") | ||
| exclude(module = "hapi-fhir-caching-caffeine") | ||
| exclude(group = "com.github.ben-manes.caffeine", module = "caffeine") | ||
| } | ||
|
|
||
| fun hapiFhirConstraints(): Map<String, DependencyConstraint.() -> Unit> { | ||
| return mutableMapOf<String, DependencyConstraint.() -> Unit>( | ||
| HapiFhir.fhirBaseModule to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.fhirClientModule to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.fhirCoreConvertorsModule to { version { strictly(Versions.hapiFhirCore) } }, | ||
| HapiFhir.fhirCoreDstu2Module to { version { strictly(Versions.hapiFhirCore) } }, | ||
| HapiFhir.fhirCoreDstu2016Module to { version { strictly(Versions.hapiFhirCore) } }, | ||
| HapiFhir.fhirCoreDstu3Module to { version { strictly(Versions.hapiFhirCore) } }, | ||
| HapiFhir.fhirCoreR4Module to { version { strictly(Versions.hapiFhirCore) } }, | ||
| HapiFhir.fhirCoreR4bModule to { version { strictly(Versions.hapiFhirCore) } }, | ||
| HapiFhir.fhirCoreR5Module to { version { strictly(Versions.hapiFhirCore) } }, | ||
| HapiFhir.fhirCoreUtilsModule to { version { strictly(Versions.hapiFhirCore) } }, | ||
| HapiFhir.structuresDstu2Module to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.structuresDstu3Module to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.structuresR4Module to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.structuresR5Module to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.validationModule to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.validationDstu3Module to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.validationR4Module to { version { strictly(Versions.hapiFhir) } }, | ||
| HapiFhir.validationR5Module to { version { strictly(Versions.hapiFhir) } }, | ||
| Jackson.annotationsBase to { version { strictly(Versions.jackson) } }, | ||
| Jackson.bomBase to { version { strictly(Versions.jackson) } }, | ||
| Jackson.coreBase to { version { strictly(Versions.jacksonCore) } }, | ||
| Jackson.databindBase to { version { strictly(Versions.jackson) } }, | ||
| Jackson.jaxbAnnotationsBase to { version { strictly(Versions.jackson) } }, | ||
| Jackson.jsr310Base to { version { strictly(Versions.jackson) } }, | ||
| Jackson.dataformatXmlBase to { version { strictly(Versions.jackson) } }, | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.