Android 10 support

.gitignore

@@ -31,3 +31,4 @@ opensrp-anc/jacoco.exec
 jacoco.exec
 ~                 
 /build/
+/google-services.json

build.gradle

@@ -3,25 +3,26 @@
 buildscript {
     repositories {
         google()
+        mavenCentral()
         jcenter()
-        maven {
-            url 'https://maven.fabric.io/public'
-        }
+        maven { url 'https://maven.fabric.io/public' }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
         classpath 'com.palantir:jacoco-coverage:0.4.0'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.gms:google-services:4.3.5'
         classpath 'io.fabric.tools:gradle:1.31.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.0'
+        classpath 'com.google.firebase:perf-plugin:1.3.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
-apply plugin: 'com.palantir.jacoco-full-report'
+//apply plugin: 'com.palantir.jacoco-full-report'
 apply plugin: 'com.github.kt3k.coveralls'
 
 configure(allprojects) { project ->
@@ -31,8 +32,8 @@ configure(allprojects) { project ->
     buildscript {
         repositories {
             google()
-            jcenter()
             mavenCentral()
+            jcenter()
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
             mavenLocal()
         }
@@ -51,6 +52,7 @@ allprojects {
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "https://cloudant.github.io/cloudant-sync-eap/repository" }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
+        maven { url "https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases" }
         google()
         jcenter()
     }
@@ -61,8 +63,8 @@ project.ext.preDexLibs = !project.hasProperty('disablePreDex')
 subprojects {
     group = 'org.smartregister'
 
-    ext.androidToolsBuildGradle = '29.0.2'
-    ext.androidBuildToolsVersion = '29.0.2'
+    ext.androidToolsBuildGradle = '29.0.3'
+    ext.androidBuildToolsVersion = '29.0.3'
     ext.androidMinSdkVersion = 18
     ext.androidCompileSdkVersion = 29
     ext.androidTargetSdkVersion = 29
@@ -81,13 +83,13 @@ subprojects {
     }
 }
 
-task clean(type: Delete) {
+/*task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}*/
 
-jacocoFull {
-    excludeProject ":sample", ":opensrp-client-anc"
-}
+//jacocoFull {
+//    excludeProject ":sample", ":opensrp-client-anc"
+//}
 
 coveralls {
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoFullReport/jacocoFullReport.xml"

gradle.properties

@@ -8,10 +8,12 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx1536m
+
 android.debug.obsoleteApi=true
 
 ## PUBLISHING VARS
-VERSION_NAME=2.0.1-SNAPSHOT
+VERSION_NAME=2.1.0-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client ANC Library
@@ -24,6 +26,5 @@ POM_SETTING_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_SETTING_LICENCE_DIST=repo
 POM_SETTING_DEVELOPER_ID=opensrp
 POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev
-android.enableUnitTestBinaryResources=true
-android.enableSeparateAnnotationProcessing=true
-android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Nov 21 15:37:28 EAT 2019
+#Wed Feb 17 10:54:24 EAT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

opensrp-anc/build.gradle

@@ -4,9 +4,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.gms:google-services:4.3.5'
     }
 }
 
@@ -55,20 +55,54 @@ android {
     defaultConfig {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode 1
-        versionName "1.2.11"
+        versionCode Integer.parseInt(project.VERSION_CODE)
+        versionName project.VERSION_NAME
+        buildConfigField "int", "VERSION_CODE", "'" + Integer.parseInt(project.VERSION_CODE) + "'"
         multiDexEnabled true
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         if (properties != null && properties.containsKey("store.file") && properties.containsKey("store.password") && properties.containsKey("key.password")) {
             signingConfig signingConfigs.release
         }
 
         javaCompileOptions {
             annotationProcessorOptions {
+                includeCompileClasspath true
                 arguments = [eventBusIndex: 'org.smartregister.anc.library.ANCEventBusIndex']
             }
         }
+        if (project.rootProject.file("local.properties").exists()) {
+            Properties properties = new Properties()
+            properties.load(project.rootProject.file("local.properties").newDataInputStream())
+            if (properties != null && properties.containsKey("flurry.api.key")) {
+                buildConfigField "String", "FLURRY_API_KEY", properties["flurry.api.key"]
+            } else {
+                println("Flurry Analytics API key config variables is not set in your local.properties")
+                buildConfigField "String", "FLURRY_API_KEY", "\"sample_key\""
+            }
+
+            if (properties != null && properties.containsKey("oauth.client.id")) {
+                buildConfigField "String", "OAUTH_CLIENT_ID", properties["oauth.client.id"]
+
+            } else {
+                project.logger.error("oauth.client.id variable is not set in your local.properties")
+                buildConfigField "String", "OAUTH_CLIENT_ID", "\"sample_client_id\""
+            }
+
+
+            if (properties != null && properties.containsKey("oauth.client.secret")) {
+                buildConfigField "String", "OAUTH_CLIENT_SECRET", properties["oauth.client.secret"]
+
+            } else {
+                project.logger.error("oauth.client.secret variable is not set in your local.properties")
+                buildConfigField "String", "OAUTH_CLIENT_SECRET", "\"sample_client_secret\""
+            }
+        } else {
+            println("local.properties does not exist")
+            buildConfigField "String", "FLURRY_API_KEY", "\"sample_key\""
+            buildConfigField "String", "OAUTH_CLIENT_ID", "\"sample_client_id\""
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", "\"sample_client_secret\""
+        }
 
         buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Province", "District", "Facility", "Village"}'
         buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Province", "District", "Health Facility", "Village"}'
@@ -95,30 +129,7 @@ android {
     }
 
     packagingOptions {
-        exclude 'META-INF/DEPENDENCIES.txt'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/notice.txt'
-        exclude 'META-INF/license.txt'
-        exclude 'META-INF/dependencies.txt'
-        exclude 'META-INF/LGPL2.1'
-        exclude 'LICENSE.txt'
-
-    }
-    packagingOptions {
-        exclude 'META-INF/DEPENDENCIES.txt'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/notice.txt'
-        exclude 'META-INF/license.txt'
-        exclude 'META-INF/dependencies.txt'
-        exclude 'META-INF/LGPL2.1'
+        exclude 'META-INF/*'
         exclude 'LICENSE.txt'
     }
 
@@ -139,11 +150,8 @@ tasks.withType(Test) {
 }
 
 dependencies {
-    def powerMockVersion = '2.0.4'
-
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation('org.smartregister:opensrp-client-native-form:1.7.28-SNAPSHOT@aar') {
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation('org.smartregister:opensrp-client-native-form:2.0.10-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -154,7 +162,7 @@ dependencies {
         exclude group: 'org.yaml', module: 'snakeyaml'
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
-    implementation('org.smartregister:opensrp-client-core:1.9.4-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:4.3.3002-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'
@@ -166,7 +174,9 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'design'
         exclude group: 'com.rengwuxian.materialedittext', module: 'library'
+        exclude group: 'com.ibm.fhir', module: 'fhir-model'
     }
+
     implementation('org.smartregister:opensrp-client-configurable-views:1.1.5-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
@@ -176,56 +186,53 @@ dependencies {
         exclude group: 'com.android.support', module: 'cardview-v7'
         exclude group: 'com.android.support', module: 'support-v4'
     }
-    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.8'
-    annotationProcessor 'com.jakewharton:butterknife:10.2.0'
-    implementation 'net.zetetic:android-database-sqlcipher:4.2.0@aar'
-    implementation 'commons-validator:commons-validator:1.6'
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
-        transitive = true
-    }
+    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.9'
+    annotationProcessor 'com.jakewharton:butterknife:10.2.3'
+    implementation 'net.zetetic:android-database-sqlcipher:4.4.0@aar'
+    implementation 'commons-validator:commons-validator:1.7'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'org.greenrobot:eventbus:3.1.1'
-    annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.1.1'
-    implementation 'com.google.guava:guava:24.1-jre'
+    implementation 'org.greenrobot:eventbus:3.2.0'
+    annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.2.0'
+    implementation 'com.google.guava:guava:30.0-jre'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.15'
-    implementation 'com.evernote:android-job:1.2.6'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.20'
+    implementation 'com.evernote:android-job:1.4.2'
     implementation 'com.github.lecho:hellocharts-android:v1.5.8'
     implementation 'id.zelory:compressor:2.1.0'
-    implementation('com.android.support:design:28.0.0') {
+    implementation('com.google.android.material:material:1.3.0') {
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'cardview-v7'
     }
 
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation group: 'org.yaml', name: 'snakeyaml', version: '1.25'
-    implementation 'de.hdodenhof:circleimageview:3.0.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation group: 'org.yaml', name: 'snakeyaml', version: '1.27'
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
     implementation 'org.jeasy:easy-rules-core:3.3.0'
     implementation 'org.jeasy:easy-rules-mvel:3.3.0'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
     testImplementation('com.squareup:fest-android:1.0.8') {
         exclude module: 'support-v4'
     }
-    testImplementation 'org.robolectric:robolectric:4.3.1'
-    testImplementation 'org.robolectric:shadows-multidex:4.3.1'
-    testImplementation 'org.robolectric:shadows-support-v4:3.4-rc2'
-    testImplementation "org.powermock:powermock-module-junit4:$powerMockVersion"
-    testImplementation "org.powermock:powermock-module-junit4-rule:$powerMockVersion"
-    testImplementation "org.powermock:powermock-api-mockito2:$powerMockVersion"
-    testImplementation "org.powermock:powermock-classloading-xstream:$powerMockVersion"
-    testImplementation 'org.mockito:mockito-core:3.1.0'
+    testImplementation 'org.robolectric:robolectric:4.4'
+    testImplementation 'org.robolectric:shadows-multidex:4.4'
+    testImplementation 'com.ibm.fhir:fhir-model:4.2.3'
+    //testImplementation 'org.robolectric:shadows-support-v4:3.4-rc2'
+    testImplementation "org.powermock:powermock-module-junit4:2.0.7"
+    testImplementation "org.powermock:powermock-module-junit4-rule:2.0.7"
+    testImplementation "org.powermock:powermock-api-mockito2:2.0.7"
+    testImplementation "org.powermock:powermock-classloading-xstream:2.0.7"
+    testImplementation 'org.mockito:mockito-core:3.5.15'
     testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
     testImplementation 'org.skyscreamer:jsonassert:1.5.0'
 
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2') {
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0') {
         exclude group: 'com.google.code.findbugs'
     }
 }
@@ -243,11 +250,11 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'crea
     def debugTree = fileTree(dir: "$project.buildDir/intermediates/javac/debug/classes/", excludes: fileFilter)
     def mainSrc = "$project.projectDir/src/main/java"
 
-    sourceDirectories = files([mainSrc])
+/*    sourceDirectories = files([mainSrc])
     classDirectories = files([debugTree])
     executionData = fileTree(dir: project.buildDir, includes: [
             'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec'
-    ])
+    ])*/
 }
 
 task printTasks {