Skip to content

Commit

Permalink
Upgrade dependencies ⬆️
Browse files Browse the repository at this point in the history
- Upgrade FHIR SDK Engine + SDC dependencies
- Upgrade Android and Other dependencies
  • Loading branch information
ndegwamartin committed Feb 4, 2025
1 parent 55dbd93 commit e3d404e
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 27 deletions.
2 changes: 1 addition & 1 deletion android/buildSrc/src/main/kotlin/BuildConfigs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions android/buildSrc/src/main/kotlin/jacoco-report.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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
)

/**
* Runs instrumentation tests for all modules except quest. Quest instrumentation tests are divided
* 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
Expand Down Expand Up @@ -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",
)
)
Expand Down
32 changes: 16 additions & 16 deletions android/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -44,24 +44,24 @@ 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"
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"
Expand All @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions android/quest/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -390,7 +392,7 @@ private fun ListItem(
modifier = Modifier.testTag(MONTH_TEST_TAG),
)
Icon(
imageVector = Icons.Filled.KeyboardArrowRight,
imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,

Check warning on line 395 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/ReportTypeSelectorScreen.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/report/measure/screens/ReportTypeSelectorScreen.kt#L395

Added line #L395 was not covered by tests
contentDescription = null,
tint = DefaultColor.copy(alpha = 0.7f),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -109,7 +110,7 @@ fun UserSettingInsightScreen(
navigationIcon = {
IconButton(onClick = { navController.popBackStack() }) {
Icon(
imageVector = Icons.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,

Check warning on line 113 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingInsightScreen.kt#L113

Added line #L113 was not covered by tests
modifier = Modifier.testTag(USER_INSIGHT_TOP_APP_BAR),
contentDescription = null,
)
Expand Down

0 comments on commit e3d404e

Please sign in to comment.