From a7859ae95cff9e66000984a801edb10e3507a5ab Mon Sep 17 00:00:00 2001 From: Martin Ndegwa Date: Mon, 5 Mar 2018 19:04:52 +0300 Subject: [PATCH] Update maven artifact release version Fix broken compilation build error --- gradle.properties | 2 +- opensrp-immunization/build.gradle | 6 +++--- .../immunization/util/VaccinatorUtils.java | 10 +++++----- sample/build.gradle | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc31d6f7..f1691c44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=1.2.1-SNAPSHOT +VERSION_NAME=1.2.1 VERSION_CODE=2 GROUP=org.smartregister POM_SETTING_DESCRIPTION=OpenSRP Client Immunization diff --git a/opensrp-immunization/build.gradle b/opensrp-immunization/build.gradle index b85d4e12..9d5f5f88 100644 --- a/opensrp-immunization/build.gradle +++ b/opensrp-immunization/build.gradle @@ -73,11 +73,11 @@ android { dependencies { compile 'junit:junit:4.12' - compile('org.smartregister:opensrp-client-core:1.2.1-SNAPSHOT@aar') { + compile('org.smartregister:opensrp-client-core:1.2.0@aar') { transitive = true exclude group: 'com.github.bmelnychuk', module: 'atv' } - compile('org.smartregister:opensrp-client-native-form:1.0.0-SNAPSHOT@aar') { + compile('org.smartregister:opensrp-client-native-form:1.0.2@aar') { transitive = true exclude group: 'com.android.support', module: 'recyclerview-v7' } @@ -137,4 +137,4 @@ coveralls { } -apply from: '../maven.gradle' \ No newline at end of file +apply from: '../maven.gradle' diff --git a/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java b/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java index 0c75d199..3893f255 100644 --- a/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java +++ b/opensrp-immunization/src/main/java/org/smartregister/immunization/util/VaccinatorUtils.java @@ -42,13 +42,12 @@ import org.joda.time.DateTime; import org.json.JSONException; import org.json.JSONObject; -import org.opensrp.api.domain.Location; -import org.opensrp.api.util.EntityUtils; -import org.opensrp.api.util.LocationTree; -import org.opensrp.api.util.TreeNode; import org.smartregister.commonregistry.CommonPersonObject; import org.smartregister.domain.Alert; import org.smartregister.domain.AlertStatus; +import org.smartregister.domain.jsonmapping.Location; +import org.smartregister.domain.jsonmapping.util.LocationTree; +import org.smartregister.domain.jsonmapping.util.TreeNode; import org.smartregister.immunization.ImmunizationLibrary; import org.smartregister.immunization.R; import org.smartregister.immunization.db.VaccineRepo; @@ -62,6 +61,7 @@ import org.smartregister.immunization.fragment.UndoVaccinationDialogFragment; import org.smartregister.immunization.fragment.VaccinationDialogFragment; import org.smartregister.immunization.repository.RecurringServiceRecordRepository; +import org.smartregister.util.AssetHandler; import org.smartregister.util.IntegerUtil; import java.lang.reflect.Type; @@ -93,7 +93,7 @@ public static HashMap providerDetails() { org.smartregister.util.Log.logDebug("TEAM DETAILS" + getPreference(context.applicationContext(), "team", "{}")); String locationJson = context.anmLocationController().get(); - LocationTree locationTree = EntityUtils.fromJson(locationJson, LocationTree.class); + LocationTree locationTree = AssetHandler.jsonStringToJava(locationJson, LocationTree.class); HashMap map = new HashMap<>(); diff --git a/sample/build.gradle b/sample/build.gradle index 9ff3e2cf..de357762 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -66,7 +66,7 @@ android { dependencies { testCompile 'junit:junit:4.12' - compile('org.smartregister:opensrp-client-core:1.0.0-SNAPSHOT@aar') { + compile('org.smartregister:opensrp-client-core:1.2.0-SNAPSHOT@aar') { transitive = true exclude group: 'com.github.bmelnychuk', module: 'atv' }