Skip to content

Commit 33bdfce

Browse files
Merge pull request #5559 from simpledotorg/master
2 parents 9a7d949 + f46c698 commit 33bdfce

File tree

160 files changed

+3073
-473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+3073
-473
lines changed

CHANGELOG.md

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
# CHANGELOG
22

3+
## Next Release
4+
5+
### Internal
6+
- Bump AGP to v8.12.0
7+
- Bump Lint to v31.12.0
8+
- Bump Kotlin to v2.2.0
9+
- Bump KSP to v2.2.0-2.0.2
10+
- Bump dagger to v2.57
11+
- Bump okhttp to v5.1.0
12+
- Bump retrofit to v3.0.0
13+
- Bump sqlcipher to v4.10.0
14+
- Bump AndroidX AppCompat to v1.7.1
15+
- Bump AndroidX Fragment KTX to v1.8.8
16+
- Bump asm to v9.8
17+
- Bump firebase remote config to v23.0.0
18+
- Bump Firebase Analytics KTX to v22.5.0
19+
- Bump Jackson Core to v2.19.2
20+
- Bump Lottie Compose to v6.6.7
21+
- Add `isUsingSmokelessTobacco` in `MedicalHistory` table
22+
23+
### Changes
24+
25+
- Update min sdk version to 26 (Android 8.0)
26+
- Update statin translations for `om-ET` and `sid-ET`
27+
- Update tobacco use dialog to single option select in Ethiopia
28+
329
## 2025.08.13
430

531
### Internal
@@ -27,7 +53,6 @@
2753
- Rename `Smoker` to `Smokes`
2854
- Update tobacco translations for `bn-BD`, `ta-LK` and `si-LK`
2955
- Remove `LongTeleconsultMessageBuilder_Old.kt`
30-
- Update statin translations for `om-ET` and `sid-ET`
3156

3257
## 2025.05.20
3358

@@ -51,6 +76,7 @@
5176
- Bump Sentry to v8.11.0
5277
- Bump Dagger to v2.56.2
5378
- Bump Coroutines to v1.10.2
79+
- Bump AGP to v8.9.2
5480
- Skip Sentry config during app startup in the debug mode
5581
- Show spanish language option in non-production builds only
5682
- Increase lab based risk threshold to 20%

app/build.gradle.kts

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,6 @@ android {
184184
beforeVariants { variant ->
185185
variant.enable = variant.name !in filteredVariants
186186
}
187-
188-
onVariants(selector().all()) { variant ->
189-
afterEvaluate {
190-
// This is a workaround for https://issuetracker.google.com/301245705 which depends on internal
191-
// implementations of the android gradle plugin and the ksp gradle plugin which might change in the future
192-
// in an unpredictable way.
193-
val variantName = variant.name.replaceFirstChar { it.titlecase() }
194-
project.tasks.getByName("ksp" + variantName + "Kotlin") {
195-
val dataBindingTask = project.tasks.getByName("dataBindingGenBaseClasses$variantName") as DataBindingGenBaseClassesTask
196-
(this as AbstractKotlinCompileTool<*>).setSource(dataBindingTask.sourceOutFolder)
197-
}
198-
}
199-
}
200187
}
201188

202189
lint {
@@ -216,7 +203,10 @@ android {
216203

217204
kotlinOptions {
218205
jvmTarget = JavaVersion.VERSION_17.toString()
219-
freeCompilerArgs = freeCompilerArgs + listOf("-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
206+
freeCompilerArgs = freeCompilerArgs + listOf(
207+
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
208+
"-Xannotation-default-target=param-property"
209+
)
220210
}
221211

222212
sourceSets {

app/lint.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555

5656
<issue id="ParcelCreator" severity="informational" />
5757
<issue id="GradleDependency" severity="informational" />
58+
<issue id="NewerVersionAvailable" severity="informational" />
5859
<issue id="PluralsCandidate" severity="informational" />
5960
<issue id="CannotEnableHidden" severity="informational" />
6061

0 commit comments

Comments
 (0)