Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate FHIR SDK Artifacts to the latest version changes #3640

Merged
merged 4 commits into from
Dec 1, 2024
Merged

Migrate FHIR SDK Artifacts to the latest version changes #3640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b6ce18
Migrate FHIR SDK Artifacts to the latest version changes
ndegwamartin Nov 28, 2024
7a7ae4d
Reduce the verbosity of logs on CI 🧱
ndegwamartin Nov 29, 2024
da78e99
Refactor FhirCarePlanGeneratorTest unit test for Future Proofing 💚
ndegwamartin Nov 30, 2024
4073325
Merge branch 'main' into ndegwamartin-patch-1
dubdabasoduba Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions .../engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,15 +1246,31 @@ class FhirCarePlanGeneratorTest : RobolectricTest() {
"\$this + 3 'month'",
)!!
.value

val expectedAssertionDates: MutableList<Date> =
mutableListOf(
fhirCarePlanGenerator
.evaluateToDate(
DateTimeType(ancStart),
"\$this + 1 'month'",
)!!
.value,
)

for (index in 1 until this.size) {
expectedAssertionDates.add(
fhirCarePlanGenerator
.evaluateToDate(
DateTimeType(expectedAssertionDates.last()),
"\$this + 1 'month'",
)!!
.value,
)
}

this.forEachIndexed { index, task ->
assertEquals(
(fhirCarePlanGenerator
.evaluateToDate(
DateTimeType(ancStart),
"\$this + ${index + 1} 'month'",
)!!
.value)
.asYyyyMmDd(),
expectedAssertionDates[index].asYyyyMmDd(),
task.executionPeriod.start.asYyyyMmDd(),
)
}
Expand Down
1 change: 1 addition & 0 deletions android/engine/src/test/resources/plans/anc-visit/plandefinition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"resourceType": "PlanDefinition",
"id": "132157",
"url": "https://my-opensrp-server.org/my/globally/unique/url/132157",
"meta": {
"versionId": "1",
"lastUpdated": "2022-06-20T22:30:39.217+00:00"
Expand Down
5 changes: 1 addition & 4 deletions android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@ android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.suppressUnsupportedCompileSdk=34
android.jetifier.ignorelist=jackson-core
org.gradle.warning.mode=all

org.gradle.logging.level=INFO

org.gradle.warning.mode=all
org.gradle.caching=false
org.gradle.parallel=true
org.gradle.configureondemand=true

android.enableR8.fullMode=true
android.enableR8.verbose=true
4 changes: 2 additions & 2 deletions android/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ espresso-core = "3.6.1"
fhir-sdk-common = "0.1.0-alpha05-preview3-SNAPSHOT"
fhir-sdk-contrib-barcode = "0.1.0-beta3-preview7-rc1-SNAPSHOT"
fhir-sdk-contrib-locationwidget = "0.1.0-alpha01-preview2-rc1-SNAPSHOT"
fhir-sdk-data-capture = "1.2.0-preview4-SNAPSHOT"
fhir-sdk-engine = "1.0.0-preview16-SNAPSHOT"
fhir-sdk-data-capture = "1.2.0-preview5-SNAPSHOT"
fhir-sdk-engine = "1.0.0-preview17-SNAPSHOT"
fhir-sdk-knowledge = "0.1.0-alpha03-preview5-rc1-SNAPSHOT"
fhir-sdk-workflow = "0.1.0-alpha04-preview10-rc1-SNAPSHOT"
fragment-ktx = "1.8.3"
Expand Down
Loading