From f7a6aa5079aa741c98f2668620f0ded1ac1f3b7e Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Mon, 27 May 2019 13:18:27 +0200 Subject: [PATCH 1/2] [ANDROSDK-833] Send enrollment status --- .../java/org/hisp/dhis/android/core/enrollment/Enrollment.java | 1 + 1 file changed, 1 insertion(+) 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 index cacdc23749..ab9d4a139c 100644 --- 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(); From 1eba3b5912549d274e54e0a6171481463966d303 Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Mon, 27 May 2019 14:02:59 +0200 Subject: [PATCH 2/2] [DEVELOP] Version 0.16.2 --- core/build.gradle | 4 ++-- core/gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 2af4965033..21238215b3 100644 --- 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 index 1ab63fb6c2..8da7e060cc 100644 --- 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