From 903929a22a9d4d8264243e129df40b2aba81dcf5 Mon Sep 17 00:00:00 2001 From: danielTari Date: Thu, 28 Nov 2024 12:47:50 +0100 Subject: [PATCH 1/4] [1.11.0.1-RC] fix new ping server version --- .../hisp/dhis/android/core/systeminfo/internal/PingService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingService.kt b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingService.kt index afe589e7b1..d54eed517e 100644 --- a/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingService.kt +++ b/core/src/main/java/org/hisp/dhis/android/core/systeminfo/internal/PingService.kt @@ -39,7 +39,7 @@ internal class PingService( private val dhisVersionManager: DHISVersionManager, ) { suspend fun getPing(): HttpResponse { - return if (dhisVersionManager.isGreaterThan(DHISVersion.V2_36)) { + return if (dhisVersionManager.isGreaterOrEqualThan(DHISVersion.V2_40)) { client.get { url("ping") excludeCredentials() From 52c02d84abd96134ab38c0e15593ed8db2fe1a39 Mon Sep 17 00:00:00 2001 From: danielTari Date: Thu, 28 Nov 2024 12:48:09 +0100 Subject: [PATCH 2/4] [1.11.0.1-RC] update snapshot version to 1.11.0.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6d03d2b81a..b0633a5b16 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -dhis2AndroidSdkVersion = "1.11.0-SNAPSHOT" +dhis2AndroidSdkVersion = "1.11.0.1-SNAPSHOT" dhis2AndroidSdkCode = "295" gradle = "8.6.1" From 31c6d3b21c2fd839207833cd8b38c4a0bd8e984f Mon Sep 17 00:00:00 2001 From: danielTari Date: Thu, 28 Nov 2024 14:37:04 +0100 Subject: [PATCH 3/4] [1.11.0.1-RC] update jenkinsfile to trigger deployment for hotfixes --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 02975820cf..978c5a8785 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -81,7 +81,7 @@ pipeline { expression { env.CHANGE_ID == null } anyOf { expression { env.GIT_BRANCH == "develop" } - expression { env.GIT_BRANCH ==~ /[0-9]+\.[0-9]+\.[0-9]+-rc/ } + expression { env.GIT_BRANCH ==~ /[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?-rc/ } } } } From a127aed105bfbff7bada3cd29e539d274974e9bb Mon Sep 17 00:00:00 2001 From: danielTari Date: Fri, 29 Nov 2024 10:09:38 +0100 Subject: [PATCH 4/4] [1.11.0.1-RC] update sdk version in documentation page --- docs/content/developer/getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/developer/getting-started.md b/docs/content/developer/getting-started.md index 783b2e0adb..66ea58885a 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.11.0" + implementation "org.hisp.dhis:android-core:1.11.0.1" ... } ```