Skip to content

chore: fix method visibility to fix tests #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zikani03 merged 2 commits into from
Mar 22, 2026
Merged

chore: fix method visibility to fix tests #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41c234d
chore: fix method visibility to fix tests
zikani03 Mar 22, 2026
680e772
chore: fix gradle errors and downgrade to gradle 8.3
zikani03 Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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()) {
Expand All @@ -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'
Expand All @@ -103,36 +103,36 @@ 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"'
resValue "string", "app_name_policies", "Policies MV DEV"
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"
dimension = 'std'
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'
Expand All @@ -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'
Expand Down Expand Up @@ -193,8 +193,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

packagingOptions {
Expand All @@ -204,7 +204,7 @@ android {
}

buildFeatures {
buildConfig true
buildConfig = true
}

testOptions {
Expand All @@ -229,7 +229,7 @@ apollo {
tasks.withType(Test).configureEach {
testLogging {
events "passed", "skipped", "failed"
exceptionFormat "full"
exceptionFormat = "full"
showStandardStreams = false
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/custom-flavours.gradle.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3592,7 +3592,7 @@ protected void onPostExecute(Boolean aBoolean) {
}
}

private void DeleteUploadedData(final int FamilyId, ArrayList<String> FamilyIDs, int CallerId) {
public void DeleteUploadedData(final int FamilyId, ArrayList<String> FamilyIDs, int CallerId) {
if (FamilyIDs.isEmpty()) {
FamilyIDs = new ArrayList<String>() {{
add(String.valueOf(FamilyId));
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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/"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading