From e3d404e8652bb9eef06fd732e19939f220e89d6a Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Tue, 4 Feb 2025 12:45:32 +0300 Subject: [PATCH] =?UTF-8?q?Upgrade=20dependencies=20=E2=AC=86=EF=B8=8F=20-?= =?UTF-8?q?=20Upgrade=20FHIR=20SDK=20Engine=20+=20SDC=20dependencies=20-?= =?UTF-8?q?=20Upgrade=20Android=20and=20Other=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buildSrc/src/main/kotlin/BuildConfigs.kt | 2 +- .../src/main/kotlin/jacoco-report.gradle.kts | 6 ++-- android/gradle/libs.versions.toml | 32 +++++++++---------- android/quest/build.gradle.kts | 3 +- .../screens/MeasureReportListScreen.kt | 3 +- .../screens/MeasureReportResultScreen.kt | 3 +- .../screens/ReportTypeSelectorScreen.kt | 6 ++-- .../usersetting/UserSettingInsightScreen.kt | 3 +- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/android/buildSrc/src/main/kotlin/BuildConfigs.kt b/android/buildSrc/src/main/kotlin/BuildConfigs.kt index f049e1663a9..852fc0e3a95 100644 --- a/android/buildSrc/src/main/kotlin/BuildConfigs.kt +++ b/android/buildSrc/src/main/kotlin/BuildConfigs.kt @@ -6,7 +6,7 @@ object BuildConfigs { const val versionName = "2.1.1" const val applicationId = "org.smartregister.opensrp" const val jvmToolchain = 17 - const val kotlinCompilerExtensionVersion = "1.5.8" + const val kotlinCompilerExtensionVersion = "1.5.14" const val jacocoVersion ="0.8.11" const val ktLintVersion = "0.49.0" const val enableUnitTestCoverage = true diff --git a/android/buildSrc/src/main/kotlin/jacoco-report.gradle.kts b/android/buildSrc/src/main/kotlin/jacoco-report.gradle.kts index 6982d4bcf33..78a33cd05b1 100644 --- a/android/buildSrc/src/main/kotlin/jacoco-report.gradle.kts +++ b/android/buildSrc/src/main/kotlin/jacoco-report.gradle.kts @@ -5,7 +5,7 @@ val actualProjectName : String = if(isApplication) "opensrp" else project.name project.tasks.create("fhircoreJacocoReport", JacocoReport::class.java) { val tasksList = mutableSetOf( - "test${if(isApplication) actualProjectName.capitalize() else ""}DebugUnitTest", // Generates unit test coverage report + "test${if(isApplication) actualProjectName.replaceFirstChar { it.uppercase() } else ""}DebugUnitTest", // Generates unit test coverage report ) /** @@ -13,7 +13,7 @@ project.tasks.create("fhircoreJacocoReport", JacocoReport::class.java) { * into functional tests and performance tests. Performance tests can take upto 1 hr and are not required * while functional tests alone will take ~40 mins and they are required. */ - tasksList += "connected${if (isApplication) actualProjectName.capitalize() else ""}DebugAndroidTest" + tasksList += "connected${if (isApplication) actualProjectName.replaceFirstChar { it.uppercase() } else ""}DebugAndroidTest" dependsOn( tasksList @@ -108,7 +108,7 @@ project.tasks.create("fhircoreJacocoReport", JacocoReport::class.java) { fileTree(baseDir = project.layout.buildDirectory.get()) { include( listOf( - "outputs/unit_test_code_coverage/${moduleVariant}UnitTest/test${if(isApplication) actualProjectName.capitalize() else ""}DebugUnitTest.exec", + "outputs/unit_test_code_coverage/${moduleVariant}UnitTest/test${if(isApplication) actualProjectName.replaceFirstChar { it.uppercase() } else ""}DebugUnitTest.exec", "outputs/code_coverage/${moduleVariant}AndroidTest/connected/**/*.ec", ) ) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 9f6dacc83f3..145052d732d 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -1,37 +1,37 @@ [versions] accompanist = "0.23.1" -activity-compose = "1.8.2" +activity-compose = "1.9.3" androidJunit5 = "1.8.2.1" -androidx-camera = "1.4.0" -androidx-paging = "3.3.2" +androidx-camera = "1.4.1" +androidx-paging = "3.3.5" androidx-test= "1.6.2" appcompat = "1.7.0" benchmark-junit = "1.3.3" cardview = "1.0.0" common-utils = "1.0.1-SNAPSHOT" -compose-ui = "1.6.8" +compose-ui = "1.7.7" compressor = "3.0.1" -constraintlayout = "2.1.4" -constraintlayout-compose = "1.0.1" +constraintlayout = "2.2.0" +constraintlayout-compose = "1.1.0" converter-gson = "2.9.0" core-ktx = "1.13.1" core-testing = "2.2.0" coverallsGradlePlugin = "2.12.2" cqfFhirCr = "3.0.0-PRE9" dagger-hilt = "2.51" -datastore = "1.1.1" -desugar-jdk-libs = "2.1.3" +datastore = "1.1.2" +desugar-jdk-libs = "2.1.4" dokkaBase = "1.9.20" easyRulesCore = "4.1.1-SNAPSHOT" 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-preview9.2-SNAPSHOT" -fhir-sdk-engine = "1.1.0-preview4-SNAPSHOT" +fhir-sdk-data-capture = "1.3.0-preview-SNAPSHOT" +fhir-sdk-engine = "1.2.0-preview-SNAPSHOT" fhir-sdk-knowledge = "0.1.0-alpha03-preview5-rc2-SNAPSHOT" fhir-sdk-workflow = "0.1.0-alpha04-preview10-rc1-SNAPSHOT" -fragment-ktx = "1.8.3" +fragment-ktx = "1.8.5" glide = "4.16.0" gradle = "8.3.2" gson = "2.10.1" @@ -44,16 +44,16 @@ jsonPath = "2.9.0" junit = "1.2.1" junit-jupiter = "5.10.3" junit-ktx = "1.2.1" -kotlin = "1.9.22" +kotlin = "1.9.24" kotlin-serialization = "1.8.10" kotlinx-coroutines = "1.9.0" -kotlinx-serialization-json = "1.6.0" +kotlinx-serialization-json = "1.6.3" kt3k-coveralls-ver="2.12.0" ktlint = "0.50.0" kujaku-library = "0.10.8-SNAPSHOT" kujaku-mapbox-sdk-turf = "7.2.0" leakcanary-android = "2.10" -lifecycle= "2.8.5" +lifecycle= "2.8.7" log4j = "1.2.17" logback-android = "3.0.0" material = "1.12.0" @@ -61,7 +61,7 @@ mlkit-barcode-scanning = "17.3.0" mockk = "1.13.8" mockk-android = "1.13.8" msg-simple = "1.2" -navigation = "2.7.7" +navigation = "2.8.6" okhttp = "4.12.0" okhttp-logging-interceptor = "4.12.0" orchestrator = "1.5.1" @@ -75,7 +75,7 @@ retrofit = "2.9.0" retrofit-mock = "2.9.0" retrofit2-kotlinx-serialization-converter = "0.8.0" robolectric = "4.13" -room = "2.5.2" +room = "2.6.1" rules = "1.6.1" security-crypto = "1.1.0-alpha06" slf4j-nop = "2.0.7" diff --git a/android/quest/build.gradle.kts b/android/quest/build.gradle.kts index fef83d3a7e9..0bc0d6939b1 100644 --- a/android/quest/build.gradle.kts +++ b/android/quest/build.gradle.kts @@ -1,4 +1,3 @@ -import android.databinding.tool.ext.capitalizeUS import com.android.build.api.variant.FilterConfiguration.FilterType import io.sentry.android.gradle.extensions.InstrumentationFeature import io.sentry.android.gradle.instrumentation.logcat.LogcatLevel @@ -394,7 +393,7 @@ android { applicationVariants.all { val variant = this - tasks.register("jacocoTestReport${variant.name.capitalizeUS()}") + tasks.register("jacocoTestReport${variant.name.replaceFirstChar { it.uppercase() }}") } splits { diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/MeasureReportListScreen.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/MeasureReportListScreen.kt index fd6d09f7057..b4f223ee376 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/MeasureReportListScreen.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/MeasureReportListScreen.kt @@ -32,6 +32,7 @@ import androidx.compose.material.Scaffold import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -64,7 +65,7 @@ fun MeasureReportListScreen( title = { Text(text = stringResource(R.string.reports)) }, navigationIcon = { IconButton(onClick = { navController.popBackStack() }) { - Icon(Icons.Filled.ArrowBack, null) + Icon(Icons.AutoMirrored.Filled.ArrowBack, null) } }, contentColor = Color.White, diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/MeasureReportResultScreen.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/MeasureReportResultScreen.kt index e14357d96d8..3fc22aa81c0 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/MeasureReportResultScreen.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/MeasureReportResultScreen.kt @@ -32,6 +32,7 @@ import androidx.compose.material.Scaffold import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -92,7 +93,7 @@ fun MeasureReportResultPage( title = { Text(text = screenTitle, overflow = TextOverflow.Ellipsis, maxLines = 1) }, navigationIcon = { IconButton(onClick = { navController.popBackStack() }) { - Icon(Icons.Filled.ArrowBack, null) + Icon(Icons.AutoMirrored.Filled.ArrowBack, null) } }, contentColor = Color.White, diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/ReportTypeSelectorScreen.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/ReportTypeSelectorScreen.kt index a1664992584..f03caa46697 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/ReportTypeSelectorScreen.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/ReportTypeSelectorScreen.kt @@ -43,6 +43,8 @@ import androidx.compose.material.Scaffold import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.KeyboardArrowDown import androidx.compose.material.icons.filled.KeyboardArrowRight @@ -166,7 +168,7 @@ fun ReportFilterSelector( ) }, navigationIcon = { - IconButton(onClick = onBackPressed) { Icon(Icons.Filled.ArrowBack, null) } + IconButton(onClick = onBackPressed) { Icon(Icons.AutoMirrored.Filled.ArrowBack, null) } }, contentColor = Color.White, backgroundColor = MaterialTheme.colors.primary, @@ -390,7 +392,7 @@ private fun ListItem( modifier = Modifier.testTag(MONTH_TEST_TAG), ) Icon( - imageVector = Icons.Filled.KeyboardArrowRight, + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, contentDescription = null, tint = DefaultColor.copy(alpha = 0.7f), ) diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt index de718ebb845..aa21a5beca5 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt @@ -47,6 +47,7 @@ import androidx.compose.material.Surface import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.Check import androidx.compose.material.primarySurface @@ -109,7 +110,7 @@ fun UserSettingInsightScreen( navigationIcon = { IconButton(onClick = { navController.popBackStack() }) { Icon( - imageVector = Icons.Filled.ArrowBack, + imageVector = Icons.AutoMirrored.Filled.ArrowBack, modifier = Modifier.testTag(USER_INSIGHT_TOP_APP_BAR), contentDescription = null, )