Merge branch 'master' into enable-multiple-column-mappings

Author: dubdabasoduba

README.md

@@ -4,7 +4,7 @@
 [![Dristhi](opensrp-app/res/drawable-mdpi/login_logo.png)](https://smartregister.atlassian.net/wiki/dashboard.action)
 
 
-# Table of Contents
+# Table of Contents 
 
 * [Introduction](#introduction)
 * [Features](#features)

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=1.7.2-SNAPSHOT
+VERSION_NAME=1.7.26-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application

maven.gradle

@@ -2,14 +2,14 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 def sonatypeRepositoryURL
-def mavenLocalFlag = hasProperty('mavenLocal') ? mavenLocal.toBoolean() : true;
-
+def mavenLocalFlag = hasProperty('mavenLocal') ? mavenLocal.toBoolean() : true
+def timestampMsg = " at " + getDate()
 if (isReleaseBuild()) {
-    println 'PROCESSING MAVEN ' + (mavenLocalFlag ? 'LOCAL' : 'REMOTE') + ' RELEASE BUILD VERSION ' + project.VERSION_NAME + '...'
+    println 'PROCESSING MAVEN ' + (mavenLocalFlag ? 'LOCAL' : 'REMOTE') + ' RELEASE BUILD VERSION ' + project.VERSION_NAME + timestampMsg + '...'
     sonatypeRepositoryURL = hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
             : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
 } else {
-    println 'PROCESSING MAVEN ' + (mavenLocalFlag ? 'LOCAL' : 'REMOTE') + ' SNAPSHOT BUILD VERSION ' + project.VERSION_NAME + '...'
+    println 'PROCESSING MAVEN ' + (mavenLocalFlag ? 'LOCAL' : 'REMOTE') + ' SNAPSHOT BUILD VERSION ' + project.VERSION_NAME + timestampMsg + '...'
     sonatypeRepositoryURL = hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
             : "https://oss.sonatype.org/content/repositories/snapshots/"
 
@@ -131,4 +131,8 @@ afterEvaluate { project ->
         username getRepositoryUsername()
         password getRepositoryPassword()
     }
+}
+
+def getDate() {
+    return new Date().format('yyyy-MM-dd HH:mm:ss')
 }

opensrp-app/build.gradle

@@ -14,8 +14,6 @@ buildscript {
     }
 }
 
-
-
 allprojects {
     repositories {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
@@ -104,7 +102,6 @@ android {
         androidTest.setRoot('src/androidTest')
     }
 
-
     aaptOptions {
         noCompress 'apk'
     }
@@ -159,65 +156,60 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation "org.apache.httpcomponents:httpmime:4.2.3"
-    implementation 'com.google.code.gson:gson:2.3'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.1.1'
     implementation group: 'commons-codec', name: 'commons-codec', version: '1.10'
     implementation group: 'com.google.guava', name: 'guava', version: '20.0'
     implementation group: 'commons-io', name: 'commons-io', version: '2.4'
     implementation 'org.apache.commons:commons-lang3:3.2'
     implementation 'org.mozilla:rhino:1.7R4'
     implementation 'com.ocpsoft:ocpsoft-pretty-time:1.0.7'
-    implementation 'joda-time:joda-time:2.3'
+    api 'joda-time:joda-time:2.10.3'
     implementation 'com.github.bmelnychuk:atv:1.2.9'
     implementation 'com.github.johnkil.print:print:1.2.3'
+
     implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
         transitive = true
     }
+
     implementation('ch.acra:acra:4.5.0') {
         exclude group: 'org.json', module: 'json'
     }
-    implementation 'com.github.ybq:Android-SpinKit:1.2.0'
 
-    implementation 'com.google.guava:guava:18.0'
+    implementation 'com.github.ybq:Android-SpinKit:1.2.0'
     implementation 'com.mcxiaoke.volley:library:1.0.19'
+
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     annotationProcessor fileTree(include: ['butterknife*.jar'], dir: 'libs')
-    implementation 'com.cloudant:cloudant-http:2.7.0'
 
+    implementation 'com.cloudant:cloudant-http:2.7.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
 
     implementation('com.android.support:design:28.0.0') {
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'cardview-v7'
-
     }
 
     implementation 'com.evernote:android-job:1.2.6'
-    implementation 'com.rengwuxian.materialedittext:library:2.1.4'
-    implementation 'com.google.android.gms:play-services-vision:17.0.2'
     implementation group: 'commons-validator', name: 'commons-validator', version: '1.6'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
 
-    implementation ('org.smartregister:android-p2p-sync:0.3.1-SNAPSHOT') {
+    implementation('org.smartregister:android-p2p-sync:0.3.1-SNAPSHOT') {
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'android.arch.core', module: 'runtime'
     }
 }
 
 dependencies {
-    androidTestImplementation 'com.jayway.android.robotium:robotium-solo:4.3'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.0'
+
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation 'junit:junit:4.12'
 
     testImplementation group: 'com.google.android', name: 'android-test', version: '4.1.1.4'
     testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
     testImplementation 'org.mockito:mockito-core:1.9.5'
-    testImplementation('com.squareup:fest-android:1.0.3') { exclude module: 'support-v4' }
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
     testAnnotationProcessor fileTree(include: ['butterknife*.jar'], dir: 'libs')
-    testImplementation('org.robolectric:robolectric:3.8') {
 
+    testImplementation('org.robolectric:robolectric:3.8') {
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'org.apache.maven', module: 'maven-model'
         exclude group: 'com.android.support'
@@ -226,24 +218,20 @@ dependencies {
     testImplementation('org.robolectric:shadows-multidex:3.8') {
         exclude group: 'com.google.guava', module: 'guava'
     }
+
     testImplementation('org.robolectric:shadows-support-v4:3.3.2') {
         exclude group: 'com.google.guava', module: 'guava'
     }
 
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.+') {
-
-        exclude group: 'com.android.support', module: 'support-annotations'
-        exclude group: 'junit', module: 'junit'
-    }
     testImplementation "org.robolectric:shadows-support-v4:3.3.2"
     // PowerMock
     def powerMockVersion = '1.7.1'
     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")
-
 }
+
 task clearJar(type: Delete) {
     delete 'build/libs/myCompiledLibrary.jar'
 }

opensrp-app/jacoco.exec

@@ -398,5 +398,21 @@
     <string name="do_not_edit_client_records_until_complete">Do not edit client records until complete.</string>
     <string name="processing_disclaimer">Records will be processed for up to 10 minutes before your records will be updated. Do not edit medical records until the process is complete.</string>
 
+    <!-- Duration -->
+    <string name="x_seconds">%1$dث</string>
+    <string name="x_minutes">%1$dد</string>
+    <string name="x_hours">%1$dس</string>
+    <string name="x_days">%1$dيـ</string>
+    <string name="x_weeks">%1$dأ</string>
+    <string name="x_weeks_days">%1$dأ
+        %2$dيـ
+        </string>
+    <string name="x_months">%1$dش</string>
+    <string name="x_months_weeks">%1$dش
+        %2$dأ
+    </string>
+    <string name="x_years">%1$dس</string>
+    <string name="x_years_months">%1$dس
+        %2$dش</string>
 
 </resources>