diff --git a/CHANGELOG.md b/CHANGELOG.md index 96868033ea5..d05384ba27c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,39 +5,43 @@ ### Internal - Bump Sentry to v8.29.0 -- Bump AndroidX Lifecycle to v2.9.4 +- Bump AndroidX Lifecycle to v2.10.0 - Bump AndroidX Test Runner to v1.7.0 - Bump AndroidX Test Rules to v1.7.0 - Bump AndroidX JUnit to v1.3.0 -- Bump Jackson Core to v2.20.0 -- Bump Play Services Auth to v21.4.0 +- Bump Jackson Core to v2.20.1 +- Bump Play Services Auth to v21.5.0 - Bump Material Components to v1.12.0 -- Bump Kotlin to v2.2.20 -- Bump AndroidX Work to v2.10.5 -- Bump AndroidX ViewModel to v2.9.4 -- Bump Lottie Compose to v6.6.9 +- Bump Kotlin to v2.3.0 +- Bump AndroidX Work to v2.11.0 +- Bump AndroidX ViewModel to v2.10.0 +- Bump Lottie Compose to v6.7.1 - Bump Gson to v2.13.2 - Bump KSP to v2.3.4 - Bump firebase remote config to v23.0.1 - Bump Google Truth to v1.4.5 - Bump AndroidX Benchmark to v1.4.1 -- Bump AndroidX Camera to v1.5.0 -- Bump AndroidX Camera View to v1.5.0 +- Bump AndroidX Camera to v1.5.2 +- Bump AndroidX Camera View to v1.5.2 - Bump dagger to v2.57.2 - Bump UUID generator to v5.1.1 -- Bump Compose BOM to v2025.09.01 +- Bump Compose BOM to v2025.12.01 - Bump Sentry Android to v5.12.2 - Update GH Actions `checkout` to v5 - Update GH Actions `setup-jdk` to to v5 - Bump Gradle to v9.1.0 - Bump Mockito Kotlin to v6.1.0 - Add helper function `diagnosedAt` to update the htn and dm diagnosed at fields in medical history -- Bump asm to v9.9 +- Bump asm to v9.9.1 - Bump AGP to v8.13.2 - Bump Lint to v31.13.2 - Disable Ksp1 and enable Ksp2 by default - Update GH Workflow Actions `Setup Gradle` to v5 - Bump Google Service to v4.4.4 +- Bump AndroidX Room to v2.8.4 +- Bump AndroidX Security Crypto to v1.1.0 +- Bump okhttp to v5.3.2 +- Bump sqlcipher to v4.12.0 ### Changes diff --git a/app/build.gradle.kts b/app/build.gradle.kts index df70ae00e8d..d8e3688e8e1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,10 +1,8 @@ @file:Suppress("UnstableApiUsage") -import com.android.build.gradle.internal.tasks.databinding.DataBindingGenBaseClassesTask import io.sentry.android.gradle.extensions.InstrumentationFeature import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent -import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompileTool import org.simple.rmg.RoomMetadataGenerator import java.util.EnumSet @@ -201,14 +199,18 @@ android { isCoreLibraryDesugaringEnabled = true } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - freeCompilerArgs = freeCompilerArgs + listOf( - "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", - "-Xannotation-default-target=param-property" - ) + kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + + freeCompilerArgs.addAll( + "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-Xannotation-default-target=param-property" + ) + } } + sourceSets { getByName("androidTest") { assets.srcDirs(files("$projectDir/schemas")) diff --git a/app/src/main/java/org/simple/clinic/summary/bloodsugar/ui/BloodSugarSummaryItem.kt b/app/src/main/java/org/simple/clinic/summary/bloodsugar/ui/BloodSugarSummaryItem.kt index d1e8680f8ea..a977525ec43 100644 --- a/app/src/main/java/org/simple/clinic/summary/bloodsugar/ui/BloodSugarSummaryItem.kt +++ b/app/src/main/java/org/simple/clinic/summary/bloodsugar/ui/BloodSugarSummaryItem.kt @@ -17,7 +17,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -100,9 +99,8 @@ fun BloodSugarSummaryItem( @Composable private fun BloodSugarReadingText(item: BloodSugarSummaryItem) { - val context = LocalContext.current - val displayUnit = context.getString(item.reading.displayUnit(item.measurementUnit)) - val displayType = context.getString(item.reading.displayType) + val displayUnit = stringResource(item.reading.displayUnit(item.measurementUnit)) + val displayType = stringResource(item.reading.displayType) val readingPrefix = item.reading.displayValue(item.measurementUnit) val readingSuffix = "$displayUnit $displayType" diff --git a/common-ui/build.gradle.kts b/common-ui/build.gradle.kts index 382c9c16cf4..a278f67be6e 100644 --- a/common-ui/build.gradle.kts +++ b/common-ui/build.gradle.kts @@ -28,15 +28,18 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } buildFeatures { compose = true } } +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + } +} + dependencies { implementation(libs.androidx.core.ktx) implementation(libs.androidx.appcompat) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f234ee117ef..bcfe37daa11 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] agp = "8.13.2" -androidx-cameraView = "1.5.0" -androidx-camera = "1.5.0" +androidx-cameraView = "1.5.2" +androidx-camera = "1.5.2" androidx-paging = "3.3.6" -androidx-room = "2.7.2" -androidx-work = "2.10.5" -androidx-security-crypto = "1.1.0-alpha07" -androidx-viewmodel = "2.9.4" -androidx-lifecycle = "2.9.4" +androidx-room = "2.8.4" +androidx-work = "2.11.0" +androidx-security-crypto = "1.1.0" +androidx-viewmodel = "2.10.0" +androidx-lifecycle = "2.10.0" androidx-activity = "1.10.1" chucker = "4.2.0" dagger = "2.57.2" -kotlin = "2.2.20" +kotlin = "2.3.0" ksp = "2.3.4" @@ -26,7 +26,7 @@ mobius = "2.1.1" moshi = "1.15.2" -okhttp = "5.1.0" +okhttp = "5.3.2" retrofit = "3.0.0" @@ -38,11 +38,11 @@ coroutines = "1.10.2" compose-compiler = "1.5.13" -androidx-compose-bom = "2025.09.01" +androidx-compose-bom = "2025.12.01" composeThemeAdapter = "0.36.0" -sqlCipher = "4.10.0" +sqlCipher = "4.12.0" [libraries] android-desugaring = "com.android.tools:desugar_jdk_libs:2.1.5" @@ -94,7 +94,7 @@ androidx-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmod androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidx-lifecycle" } -asm = "org.ow2.asm:asm:9.9" +asm = "org.ow2.asm:asm:9.9.1" chucker = { module = "com.github.chuckerteam.chucker:library", version.ref = "chucker" } chucker-no-op = { module = "com.github.chuckerteam.chucker:library-no-op", version.ref = "chucker" } @@ -116,7 +116,7 @@ itemanimators = "com.mikepenz:itemanimators:1.1.0" itext7 = "com.itextpdf:itext7-core:7.2.5" -jackson-core = "com.fasterxml.jackson.core:jackson-core:2.20.0" +jackson-core = "com.fasterxml.jackson.core:jackson-core:2.20.1" jbcrypt = "org.mindrot:jbcrypt:0.4" @@ -138,7 +138,7 @@ lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "lint #noinspection GradleDependency logback-classic = "ch.qos.logback:logback-classic:1.2.11" -lottie = "com.airbnb.android:lottie-compose:6.6.9" +lottie = "com.airbnb.android:lottie-compose:6.7.1" material = "com.google.android.material:material:1.13.0" @@ -160,7 +160,7 @@ okhttp-interceptor-logging = { module = "com.squareup.okhttp3:logging-intercepto openCsv = "com.opencsv:opencsv:5.12.0" play-app-update = "com.google.android.play:app-update-ktx:2.1.0" -play-services-auth = "com.google.android.gms:play-services-auth:21.4.0" +play-services-auth = "com.google.android.gms:play-services-auth:21.5.0" play-services-location = "com.google.android.gms:play-services-location:21.3.0" play-services-mlkit-barcode = "com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.1" diff --git a/mobius-base/build.gradle.kts b/mobius-base/build.gradle.kts index 5a33a78fce8..51f2119cda7 100644 --- a/mobius-base/build.gradle.kts +++ b/mobius-base/build.gradle.kts @@ -32,9 +32,11 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } +} - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) } } diff --git a/simple-platform/build.gradle.kts b/simple-platform/build.gradle.kts index a11c16d904d..b0cdc6e0a97 100644 --- a/simple-platform/build.gradle.kts +++ b/simple-platform/build.gradle.kts @@ -33,9 +33,11 @@ android { isCoreLibraryDesugaringEnabled = true } +} - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) } } diff --git a/simple-visuals/build.gradle.kts b/simple-visuals/build.gradle.kts index ef72d07a4a7..7cb9bcf55f3 100644 --- a/simple-visuals/build.gradle.kts +++ b/simple-visuals/build.gradle.kts @@ -31,9 +31,11 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } +} - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) } }