Merge update_version_to3.2.0-DEV into develop (#3950)

* Update version to 3.2.0-DEV * chore: update desigSystem to 0.5.0 and SDK to 1.12.0 Signed-off-by: andresmr <andres@dhis2.org> * chore: non null feature type --------- Signed-off-by: andresmr <andres@dhis2.org> Co-authored-by: @dhis2-bot <apps@dhis2.org> Co-authored-by: andresmr <andres@dhis2.org>
dhis2 · Jan 24, 2025 · 597c4ed · 597c4ed
1 parent 27cb4fc
commit 597c4ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt b/app/src/main/java/org/dhis2/usescases/enrollment/EnrollmentActivity.kt
@@ -156,8 +156,8 @@ class EnrollmentActivity : ActivityGlobalAbstract(), EnrollmentView {
                         data.getStringExtra(MapSelectorActivity.DATA_EXTRA)?.let {
                             handleGeometry(
                                 FeatureType.valueOfFeatureType(
-                                    data.getStringExtra(MapSelectorActivity.LOCATION_TYPE_EXTRA),
-                                ),
+                                    data.getStringExtra(MapSelectorActivity.LOCATION_TYPE_EXTRA)!!,
+                                )!!,
                                 it,
                                 requestCode,
                             )

diff --git a/...ava/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsFragment.kt b/...ava/org/dhis2/usescases/eventsWithoutRegistration/eventDetails/ui/EventDetailsFragment.kt
@@ -181,7 +181,7 @@ class EventDetailsFragment : FragmentGlobalAbstract() {
                 MapSelectorActivity.create(
                     activity = requireActivity(),
                     fieldUid = null,
-                    locationType = FeatureType.valueOfFeatureType(featureType),
+                    locationType = FeatureType.valueOfFeatureType(featureType)!!,
                     initialData = initCoordinate,
                     programUid = requireArguments().getString(PROGRAM_UID),
                 ),

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,13 +2,13 @@
 sdk = "35"
 minSdk = "21"
 vCode = "139"
-vName = "3.1.1"
+vName = "3.2.0-DEV"
 gradle = "8.8.0"
 kotlin = '2.0.21'
 hilt = '2.47'
 jacoco = '0.8.10'
-designSystem = "0.4.1"
-dhis2sdk = "1.11.1"
+designSystem = "0.5.0-SNAPSHOT"
+dhis2sdk = "1.12.0-SNAPSHOT"
 ruleEngine = "3.2.0"
 expressionParser = "1.1.0"
 appcompat = "1.6.1"