From 0ae276474ad5b4f5cafad928f24c5cb7cdf4c5b9 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 22 Sep 2020 19:01:05 +0200 Subject: [PATCH 1/3] [ANDROSDK-1237] Update version 1.3.0 --- 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 9cc54574b8..5f46d4e292 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -41,8 +41,8 @@ ext { buildToolsVersion: "29.0.3", minSdkVersion : 19, targetSdkVersion : 29, - versionCode : 221, - versionName : "1.2.1" + versionCode : 230, + versionName : "1.3.0" ] libraries = [ diff --git a/core/gradle.properties b/core/gradle.properties index 6a66f8a0f6..2059164544 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=1.2.1 -VERSION_CODE=221 +VERSION_NAME=1.3.0 +VERSION_CODE=230 GROUP=org.hisp.dhis From a7385274c15e3be47aa52decd878ed6b7851ebd0 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 22 Sep 2020 19:03:59 +0200 Subject: [PATCH 2/3] [ANDROSDK-1237] Update doc version 1.3.0 --- docs/content/developer/compatibility.md | 2 ++ docs/content/developer/getting-started.md | 2 +- docs/dhis2_android_sdk_developer_guide_INDEX.md | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/content/developer/compatibility.md b/docs/content/developer/compatibility.md index 3cde7f1da0..159bb73274 100644 --- a/docs/content/developer/compatibility.md +++ b/docs/content/developer/compatibility.md @@ -14,3 +14,5 @@ Compatibility table between DHIS2 Android SDK library, DHIS2 core and Android SD | 1.1.1 | 2.29 -> 2.34 | 19 - 28 | | 1.1.2 | 2.29 -> 2.34 | 19 - 28 | | 1.2.0 | 2.29 -> 2.34 | 19 - 28 | +| 1.2.1 | 2.29 -> 2.34 | 19 - 28 | +| 1.3.0 | 2.29 -> 2.35 | 19 - 28 | diff --git a/docs/content/developer/getting-started.md b/docs/content/developer/getting-started.md index bb14aa4dfb..146f1a6f55 100644 --- a/docs/content/developer/getting-started.md +++ b/docs/content/developer/getting-started.md @@ -10,7 +10,7 @@ Include dependency in build.gradle. ```gradle dependencies { - implementation "org.hisp.dhis:android-core:1.2.1" + implementation "org.hisp.dhis:android-core:1.3.0" ... } ``` diff --git a/docs/dhis2_android_sdk_developer_guide_INDEX.md b/docs/dhis2_android_sdk_developer_guide_INDEX.md index ac3af60680..d281fffb1d 100644 --- a/docs/dhis2_android_sdk_developer_guide_INDEX.md +++ b/docs/dhis2_android_sdk_developer_guide_INDEX.md @@ -3,11 +3,11 @@ title: 'DHIS 2 Android SDK Developer Guide' author: 'DHIS 2' date: year: 2020 -month: August +month: October keywords: [DHIS2, Android] commit: version: master -applicable_txt: 'Applicable to version 1.2.1' +applicable_txt: 'Applicable to version 1.3.0' --- From 3a4b48e718c5d9f08148c63db1390e34b69bdf62 Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 22 Sep 2020 19:13:30 +0200 Subject: [PATCH 3/3] [ANDROSDK-1237] Update workflow documentation --- docs/content/developer/workflow.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/content/developer/workflow.md b/docs/content/developer/workflow.md index c15e3bfb49..ac379dfd1e 100644 --- a/docs/content/developer/workflow.md +++ b/docs/content/developer/workflow.md @@ -348,8 +348,9 @@ Server response is parsed to ensure that data has been correctly uploaded to the d2.importModule().trackerImportConflicts() ``` -Conflicts linked to a TrackedEntityInstance, Enrollment or Event are -automatically removed after a successful upload of the object. +Conflicts linked to a TrackedEntityInstance, Enrollment or Event are automatically removed after a successful upload of the object. + +The SDK tries to identify the confliction dataElement or attribute by parsing the server response. If so, it also stores the value of the element when the conflict happened so that the application can highlight the element in form when the value has not been fixed yet. ### Tracker data: reserved values