Skip to content

Commit 46a03cc

Browse files
zikani03zikani03
authored
Merge pull request #230 from openimis/chore/fix-failing-tests
chore: fix method visibility to fix tests
2 parents 31b44ef + 680e772 commit 46a03cc

5 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎app/build.gradle‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@ static def getDate() {
2121
}
2222

2323
android {
24-
compileSdk 34
24+
compileSdk = 34
2525
namespace = "org.openimis.imispolicies"
2626
if (keystorePropertiesFile.exists()) {
2727
signingConfigs {
2828
releaseConfig {
29-
storeFile file(keystoreProperties['storeFile'])
30-
storePassword keystoreProperties['storePassword']
31-
keyAlias keystoreProperties['keyAlias']
32-
keyPassword keystoreProperties['keyPassword']
29+
storeFile = file(keystoreProperties['storeFile'])
30+
storePassword = keystoreProperties['storePassword']
31+
keyAlias = keystoreProperties['keyAlias']
32+
keyPassword = keystoreProperties['keyPassword']
3333
}
3434
}
3535
}
3636
defaultConfig {
37-
applicationId "org.openimis.imispolicies"
38-
minSdkVersion 21
39-
targetSdkVersion 33
40-
versionCode gitVersionCode
41-
versionName gitVersionName
42-
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
37+
applicationId = "org.openimis.imispolicies"
38+
minSdkVersion = 21
39+
targetSdkVersion = 33
40+
versionCode = gitVersionCode
41+
versionName = gitVersionName
42+
testInstrumentationRunner = 'androidx.test.runner.AndroidJUnitRunner'
4343
vectorDrawables {
4444
useSupportLibrary = true
4545
}
@@ -56,8 +56,8 @@ android {
5656
}
5757
buildTypes {
5858
release {
59-
minifyEnabled false
60-
shrinkResources false
59+
minifyEnabled = false
60+
shrinkResources = false
6161
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
6262
debuggable = false
6363
if (keystorePropertiesFile.exists()) {
@@ -82,19 +82,19 @@ android {
8282
flavorDimensions = ['std']
8383
productFlavors {
8484
demoProd {
85-
applicationId "org.openimis.imispolicies.demoProd"
85+
applicationId = "org.openimis.imispolicies.demoProd"
8686
buildConfigField "String", "API_BASE_URL", '"https://demo.openimis.org/"'
8787
resValue "string", "app_name_policies", "Policies Demo"
8888
dimension = 'std'
8989
}
9090
demoRelease {
91-
applicationId "org.openimis.imispolicies.demoRelease"
91+
applicationId = "org.openimis.imispolicies.demoRelease"
9292
buildConfigField "String", "API_BASE_URL", '"https://release.openimis.org/"'
9393
resValue "string", "app_name_policies", "Policies Release"
9494
dimension = 'std'
9595
}
9696
chfDev {
97-
applicationId "org.openimis.imispolicies.chfdev"
97+
applicationId = "org.openimis.imispolicies.chfdev"
9898
buildConfigField "String", "API_BASE_URL", '"http://chf-dev.swisstph-mis.ch/"'
9999
buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
100100
buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'true'
@@ -103,36 +103,36 @@ android {
103103
dimension = 'std'
104104
}
105105
mvDev {
106-
applicationId "org.openimis.imispolicies.mv"
106+
applicationId = "org.openimis.imispolicies.mv"
107107
buildConfigField "String", "API_BASE_URL", '"http://imis-mv.swisstph-mis.ch/"'
108108
buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
109109
buildConfigField "String", "API_VERSION", '"3"'
110110
resValue "string", "app_name_policies", "Policies MV DEV"
111111
dimension = 'std'
112112
}
113113
bephaDev {
114-
applicationId "org.openimis.imispolicies.bepha"
114+
applicationId = "org.openimis.imispolicies.bepha"
115115
buildConfigField "String", "API_BASE_URL", '"http://149.210.235.40/devupgrade/"'
116116
buildConfigField "String", "DEFAULT_LANGUAGE_CODE", '"en-cm"'
117117
resValue "string", "app_name_policies", "Policies BEPHA DEV"
118118
dimension = 'std'
119119
}
120120
tchadDev {
121-
applicationId "org.openimis.imispolicies.tchadDev"
121+
applicationId = "org.openimis.imispolicies.tchadDev"
122122
buildConfigField "String", "API_BASE_URL", '"http://imis-tchad-dev.swisstph-mis.ch/"'
123123
resValue "string", "app_name_policies", "Policies TCHAD DEV"
124124
dimension = 'std'
125125
}
126126
local {
127-
applicationId "org.openimis.imispolicies.local"
127+
applicationId = "org.openimis.imispolicies.local"
128128
buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"'
129129
buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
130130
resValue "string", "app_name_policies", "Policies Local"
131131
dimension = 'std'
132132
versionCode = gitVersionCodeTime
133133
}
134134
niger {
135-
applicationId "org.openimis.imispolicies.niger"
135+
applicationId = "org.openimis.imispolicies.niger"
136136
buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://192.168.0.100/') + '"'
137137
resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Polices Niger"
138138
dimension = 'std'
@@ -141,10 +141,10 @@ android {
141141
applicationIdSuffix System.getenv("APPLICATION_ID") ?: "org.openimis.imispolicies.cli"
142142
buildConfigField "String", "API_BASE_URL", '"' + (System.getenv("API_BASE_URL") ?: 'http://10.0.2.2:35787/') + '"'
143143
resValue "string", "app_name_policies", System.getenv("CLI_APP_NAME") ?: "Policies CLI"
144-
dimension 'std'
144+
dimension = 'std'
145145
}
146146
mauritaniaTrain {
147-
applicationId "org.openimis.policies.mauritaniaTrain"
147+
applicationId = "org.openimis.policies.mauritaniaTrain"
148148
buildConfigField "String", "API_BASE_URL", '"https://formation.cnass-mauritanie.swisstph-mis.ch/"'
149149
buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'false'
150150
buildConfigField "boolean", "SHOW_BULK_CN_MENU", 'false'
@@ -193,8 +193,8 @@ android {
193193
}
194194

195195
compileOptions {
196-
sourceCompatibility JavaVersion.VERSION_11
197-
targetCompatibility JavaVersion.VERSION_11
196+
sourceCompatibility = JavaVersion.VERSION_11
197+
targetCompatibility = JavaVersion.VERSION_11
198198
}
199199

200200
packagingOptions {
@@ -204,7 +204,7 @@ android {
204204
}
205205

206206
buildFeatures {
207-
buildConfig true
207+
buildConfig = true
208208
}
209209

210210
testOptions {
@@ -229,7 +229,7 @@ apollo {
229229
tasks.withType(Test).configureEach {
230230
testLogging {
231231
events "passed", "skipped", "failed"
232-
exceptionFormat "full"
232+
exceptionFormat = "full"
233233
showStandardStreams = false
234234
}
235235
}

‎app/custom-flavours.gradle.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
android {
33
productFlavors {
44
example {
5-
applicationId [APPLICATION_ID]
5+
applicationId = [APPLICATION_ID]
66
buildConfigField "String", "API_BASE_URL", [API_BASE_URL]
77
buildConfigField "boolean", "SHOW_PAYMENT_MENU", [SHOW_PAYMENT_MENU]
88
buildConfigField "boolean", "SHOW_BULK_CN_MENU", [SHOW_BULK_CN_MENU]

‎app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3592,7 +3592,7 @@ protected void onPostExecute(Boolean aBoolean) {
35923592
}
35933593
}
35943594

3595-
private void DeleteUploadedData(final int FamilyId, ArrayList<String> FamilyIDs, int CallerId) {
3595+
public void DeleteUploadedData(final int FamilyId, ArrayList<String> FamilyIDs, int CallerId) {
35963596
if (FamilyIDs.isEmpty()) {
35973597
FamilyIDs = new ArrayList<String>() {{
35983598
add(String.valueOf(FamilyId));

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.13.0'
11+
classpath 'com.android.tools.build:gradle:8.1.4'
1212
classpath "org.ajoberstar.grgit:grgit-gradle:4.1.1"
1313
classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14'
1414
}
@@ -19,7 +19,7 @@ allprojects {
1919
google()
2020
mavenCentral()
2121
maven {
22-
url "https://raw.github.com/embarkmobile/zxing-android-minimal/mvn-repo/maven-repository/"
22+
url = "https://raw.github.com/embarkmobile/zxing-android-minimal/mvn-repo/maven-repository/"
2323
}
2424
}
2525
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

0 commit comments

Comments
 (0)