From bd5eb8cd8ac58fb54e3965439670aa6d4abf6935 Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Fri, 9 Jun 2023 13:04:03 +1000 Subject: [PATCH 1/2] [ANDROSDK-1692] Remove analytics settings with missing visualizations --- core/src/main/assets/migrations/147.sql | 3 +++ .../core/arch/db/access/internal/BaseDatabaseOpenHelper.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 core/src/main/assets/migrations/147.sql diff --git a/core/src/main/assets/migrations/147.sql b/core/src/main/assets/migrations/147.sql new file mode 100644 index 0000000000..2637530aac --- /dev/null +++ b/core/src/main/assets/migrations/147.sql @@ -0,0 +1,3 @@ +# (ANDROSDK-XXX) + +DELETE FROM AnalyticsDhisVisualization where uid NOT IN (SELECT uid FROM Visualization); diff --git a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java index 7d77e6d5e3..45075ea0dd 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java +++ b/core/src/main/java/org/hisp/dhis/android/core/arch/db/access/internal/BaseDatabaseOpenHelper.java @@ -35,7 +35,7 @@ class BaseDatabaseOpenHelper { - static final int VERSION = 146; + static final int VERSION = 147; private final AssetManager assetManager; private final int targetVersion; From 20383030fbfa623fe5da359c4bf82d554e61bdcc Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Fri, 9 Jun 2023 13:05:01 +1000 Subject: [PATCH 2/2] [ANDROSDK-1692] Version 1.8.1.1 --- core/gradle.properties | 4 ++-- core/src/main/assets/migrations/147.sql | 2 +- docs/content/developer/getting-started.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/gradle.properties b/core/gradle.properties index a57420d63d..c731971e76 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.8.1 -VERSION_CODE=281 +VERSION_NAME=1.8.1.1 +VERSION_CODE=282 GROUP=org.hisp.dhis diff --git a/core/src/main/assets/migrations/147.sql b/core/src/main/assets/migrations/147.sql index 2637530aac..e62b81a40e 100644 --- a/core/src/main/assets/migrations/147.sql +++ b/core/src/main/assets/migrations/147.sql @@ -1,3 +1,3 @@ -# (ANDROSDK-XXX) +# Missing Visualization (ANDROSDK-1692) DELETE FROM AnalyticsDhisVisualization where uid NOT IN (SELECT uid FROM Visualization); diff --git a/docs/content/developer/getting-started.md b/docs/content/developer/getting-started.md index bb591a29a9..59ab7d2742 100644 --- a/docs/content/developer/getting-started.md +++ b/docs/content/developer/getting-started.md @@ -6,7 +6,7 @@ Include dependency in build.gradle. ```gradle dependencies { - implementation "org.hisp.dhis:android-core:1.8.1" + implementation "org.hisp.dhis:android-core:1.8.1.1" ... } ```