Merge pull request #5271 from simpledotorg/master

Author: tramline-github[bot]

CHANGELOG.md

@@ -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
@@ -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
 

app/src/main/java/org/simple/clinic/cvdrisk/CVDRiskCalculationSheet.kt

@@ -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>
 

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.8.0"
+agp = "8.8.1"
 
 androidx-cameraView = "1.4.1"
 androidx-camera = "1.4.1"