Skip to content

[2025.02.*] Pre-release merge #5271

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

Merged
tramline-github merged 2 commits into from
Feb 18, 2025
Merged

[2025.02.*] Pre-release merge #5271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12ea956
chore(deps): update agp to v8.8.1 (#5266)
renovate[bot] Feb 18, 2025
5a41eee
Fix JSON variable name in non-lab based statin calculation sheet (#5270)
msasikanth Feb 18, 2025
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
- Bump AndroidX Annotation to v1.9.1
- Upload generated mapping file to Sentry
- Bump ConstraintLayout to v2.2.0
- Bump AGP to v8.8.0
- Add `isSmoking` in `MedicalHistory` table
- Add `PatientAttribute` sync resource
- Add `CVDRisk` sync resource
Expand Down Expand Up @@ -63,6 +62,8 @@
- Bug fixes in CI workflows
- Fetch `lab_based_cvd_risk_calculation_sheet` from remote config
- Add `cholesterol_value` to `MedicalHistory` table
- Bump AGP to v8.8.1
- Fix JSON variable name in non-lab based statin calculation sheet

### Fixes

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/simple/clinic/cvdrisk/CVDRiskCalculationSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ sealed interface CVDRiskCalculationSheet
@JsonClass(generateAdapter = true)
data class Women<T: RiskEntry>(
override val smoking: AgeData<T>,
@Json(name = "nonsmoking")
override val nonSmoking: AgeData<T>
): SmokingData<T>

@JsonClass(generateAdapter = true)
data class Men<T: RiskEntry>(
override val smoking: AgeData<T>,
@Json(name = "nonsmoking")
override val nonSmoking: AgeData<T>
): SmokingData<T>

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
agp = "8.8.0"
agp = "8.8.1"

androidx-cameraView = "1.4.1"
androidx-camera = "1.4.1"
Expand Down
Loading