Merge pull request #840 from dhis2/develop

Develop 0.16.2
dhis2 · May 27, 2019 · 09f1f28 · 09f1f28
2 parents 66c9a67 + 1eba3b5
commit 09f1f28
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -36,8 +36,8 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 19,
             targetSdkVersion : 28,
-            versionCode      : 132,
-            versionName      : "0.16.1-SNAPSHOT"
+            versionCode      : 133,
+            versionName      : "0.16.2-SNAPSHOT"
     ]
 
     libraries = [

diff --git a/core/gradle.properties b/core/gradle.properties
@@ -29,8 +29,8 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=0.16.1-SNAPSHOT
-VERSION_CODE=132
+VERSION_NAME=0.16.2-SNAPSHOT
+VERSION_CODE=133
 
 GROUP=org.hisp.dhis
 

diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.java
@@ -106,6 +106,7 @@ public abstract class Enrollment extends BaseDataModel implements ObjectWithDele
     public abstract Boolean followUp();
 
     @Nullable
+    @JsonProperty()
     @ColumnAdapter(DbEnrollmentStatusColumnAdapter.class)
     public abstract EnrollmentStatus status();