From 41c234deacbdc416f0b44dbec66096bdf14712cd Mon Sep 17 00:00:00 2001 From: Zikani Nyirenda Mwase Date: Sun, 22 Mar 2026 18:12:49 +0200 Subject: [PATCH 1/2] chore: fix method visibility to fix tests --- .../java/org/openimis/imispolicies/ClientAndroidInterface.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java b/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java index aff2cbb2..b9c35d71 100644 --- a/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java +++ b/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java @@ -3592,7 +3592,7 @@ protected void onPostExecute(Boolean aBoolean) { } } - private void DeleteUploadedData(final int FamilyId, ArrayList FamilyIDs, int CallerId) { + public void DeleteUploadedData(final int FamilyId, ArrayList FamilyIDs, int CallerId) { if (FamilyIDs.isEmpty()) { FamilyIDs = new ArrayList() {{ add(String.valueOf(FamilyId)); From 680e77212c7036dc16afa44531f51e6495cc7bb6 Mon Sep 17 00:00:00 2001 From: Zikani Nyirenda Mwase Date: Sun, 22 Mar 2026 20:02:35 +0200 Subject: [PATCH 2/2] chore: fix gradle errors and downgrade to gradle 8.3 --- app/build.gradle | 54 ++++++++++++------------ app/custom-flavours.gradle.dist | 2 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 48fcbd56..b5682fd9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,25 +21,25 @@ static def getDate() { } android { - compileSdk 34 + compileSdk = 34 namespace = "org.openimis.imispolicies" if (keystorePropertiesFile.exists()) { signingConfigs { releaseConfig { - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] + storeFile = file(keystoreProperties['storeFile']) + storePassword = keystoreProperties['storePassword'] + keyAlias = keystoreProperties['keyAlias'] + keyPassword = keystoreProperties['keyPassword'] } } } defaultConfig { - applicationId "org.openimis.imispolicies" - minSdkVersion 21 - targetSdkVersion 33 - versionCode gitVersionCode - versionName gitVersionName - testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + applicationId = "org.openimis.imispolicies" + minSdkVersion = 21 + targetSdkVersion = 33 + versionCode = gitVersionCode + versionName = gitVersionName + testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner' vectorDrawables { useSupportLibrary = true } @@ -56,8 +56,8 @@ android { } buildTypes { release { - minifyEnabled false - shrinkResources false + minifyEnabled = false + shrinkResources = false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' debuggable = false if (keystorePropertiesFile.exists()) { @@ -82,19 +82,19 @@ android { flavorDimensions = ['std'] productFlavors { demoProd { - applicationId "org.openimis.imispolicies.demoProd" + applicationId = "org.openimis.imispolicies.demoProd" buildConfigField "String", "API_BASE_URL", '"https://demo.openimis.org/"' resValue "string", "app_name_policies", "Policies Demo" dimension = 'std' } demoRelease { - applicationId "org.openimis.imispolicies.demoRelease" + applicationId = "org.openimis.imispolicies.demoRelease" buildConfigField "String", "API_BASE_URL", '"https://release.openimis.org/"' resValue "string", "app_name_policies", "Policies Release" dimension = 'std' } chfDev { - applicationId "org.openimis.imispolicies.chfdev" + applicationId = "org.openimis.imispolicies.chfdev" buildConfigField "String", "API_BASE_URL", '"http://chf-dev.swisstph-mis.ch/"' buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true' buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'true' @@ -103,7 +103,7 @@ android { dimension = 'std' } mvDev { - applicationId "org.openimis.imispolicies.mv" + applicationId = "org.openimis.imispolicies.mv" buildConfigField "String", "API_BASE_URL", '"http://imis-mv.swisstph-mis.ch/"' buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true' buildConfigField "String", "API_VERSION", '"3"' @@ -111,20 +111,20 @@ android { dimension = 'std' } bephaDev { - applicationId "org.openimis.imispolicies.bepha" + applicationId = "org.openimis.imispolicies.bepha" buildConfigField "String", "API_BASE_URL", '"http://149.210.235.40/devupgrade/"' buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en-cm"' resValue "string", "app_name_policies", "Policies BEPHA DEV" dimension = 'std' } tchadDev { - applicationId "org.openimis.imispolicies.tchadDev" + applicationId = "org.openimis.imispolicies.tchadDev" buildConfigField "String", "API_BASE_URL", '"http://imis-tchad-dev.swisstph-mis.ch/"' resValue "string", "app_name_policies", "Policies TCHAD DEV" dimension = 'std' } local { - applicationId "org.openimis.imispolicies.local" + applicationId = "org.openimis.imispolicies.local" buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"' buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true' resValue "string", "app_name_policies", "Policies Local" @@ -132,7 +132,7 @@ android { versionCode = gitVersionCodeTime } niger { - applicationId "org.openimis.imispolicies.niger" + applicationId = "org.openimis.imispolicies.niger" buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://192.168.0.100/') + '"' resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Polices Niger" dimension = 'std' @@ -141,10 +141,10 @@ android { applicationIdSuffix System.getenv("APPLICATION_ID") ?: "org.openimis.imispolicies.cli" buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://10.0.2.2:35787/') + '"' resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Policies CLI" - dimension 'std' + dimension = 'std' } mauritaniaTrain { - applicationId "org.openimis.policies.mauritaniaTrain" + applicationId = "org.openimis.policies.mauritaniaTrain" buildConfigField "String", "API_BASE_URL", '"https://formation.cnass-mauritanie.swisstph-mis.ch/"' buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'false' buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'false' @@ -193,8 +193,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } packagingOptions { @@ -204,7 +204,7 @@ android { } buildFeatures { - buildConfig true + buildConfig = true } testOptions { @@ -229,7 +229,7 @@ apollo { tasks.withType(Test).configureEach { testLogging { events "passed", "skipped", "failed" - exceptionFormat "full" + exceptionFormat = "full" showStandardStreams = false } } diff --git a/app/custom-flavours.gradle.dist b/app/custom-flavours.gradle.dist index 885e1633..793d901b 100644 --- a/app/custom-flavours.gradle.dist +++ b/app/custom-flavours.gradle.dist @@ -2,7 +2,7 @@ android { productFlavors { example { - applicationId [APPLICATION_ID] + applicationId = [APPLICATION_ID] buildConfigField "String", "API_BASE_URL", [API_BASE_URL] buildConfigField "boolean", "SHOW_PAYMENT_MENU", [SHOW_PAYMENT_MENU] buildConfigField "boolean", "SHOW_BULK_CN_MENU", [SHOW_BULK_CN_MENU] diff --git a/build.gradle b/build.gradle index 7badfbef..3af5b18a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.android.tools.build:gradle:8.1.4' classpath "org.ajoberstar.grgit:grgit-gradle:4.1.1" classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14' } @@ -19,7 +19,7 @@ allprojects { google() mavenCentral() maven { - url "https://raw.github.com/embarkmobile/zxing-android-minimal/mvn-repo/maven-repository/" + url = "https://raw.github.com/embarkmobile/zxing-android-minimal/mvn-repo/maven-repository/" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 68b9123d..1d397947 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip