MK : #295 - merged thrivepk branch

opensrp · Jan 18, 2017 · 8dd19a4 · 8dd19a4
1 parent 2421c1d
commit 8dd19a4
Show file tree

Hide file tree

Showing 310 changed files with 90,046 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,5 @@ project.properties
 .settings
 build/
 .gradle
-!opensrp-app/assets/web/build/
-!opensrp-app/assets/web/lib/enketo-core/build/
+!ei.opensrp-app/assets/web/build/
+!ei.opensrp-app/assets/web/lib/enketo-core/build/
diff --git a/.travis.yml b/.travis.yml
@@ -47,11 +47,11 @@ script:
   # Enable the line below once we get all the test passing, currently most of the tests are failing 
   # so we'll just if the project compiles 
   #- ./gradlew connectedAndroidTest
-  - ./gradlew opensrp-mcare:connectedAndroidTest -i --stacktrace
+  - ./gradlew ei.opensrp-mcare:connectedAndroidTest -i --stacktrace
 
 
 after_failure:
-- pandoc opensrp-mcare/build/reports/androidTests/connected/index.html -t plain
+- pandoc ei.opensrp-mcare/build/reports/androidTests/connected/index.html -t plain
 
 notifications:
   slack:

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Dristhi](opensrp-app/res/drawable-mdpi/login_logo.png)] (https://smartregister.atlassian.net/wiki/dashboard.action)
+[![Dristhi](ei.opensrp-app/res/drawable-mdpi/login_logo.png)] (https://smartregister.atlassian.net/wiki/dashboard.action)
 
 To run this project, you need to do this:
 ========================================
@@ -21,4 +21,4 @@ Login (for demo server):
 login-username - demotest,
 login-password - Demot123
 
-Check app.properties file in "drishti-app/asset/" folder to change the demo server url to your own instance of opensrp server. 
+Check app.properties file in "drishti-app/asset/" folder to change the demo server url to your own instance of ei.opensrp server.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,7 @@
 configure(allprojects) { project ->
     buildscript {
+        System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'
+
         repositories {
             jcenter()
             mavenCentral()
@@ -15,10 +17,10 @@ subprojects {
 
     group = 'org.ei.opensrp'
 
-    ext.androidToolsBuildGradle     = '21.1.2'
-    ext.androidBuildToolsVersion    = '21.1.2'
-    ext.androidMinSdkVersion        = 16
-    ext.androidCompileSdkVersion    = 21
+    ext.androidToolsBuildGradle     = "25.0.2"
+    ext.androidBuildToolsVersion    = "25.0.2"
+    ext.androidMinSdkVersion        = 19
+    ext.androidCompileSdkVersion    = 24
     ext.androidTargetSdkVersion     = 21
 
     ext.androidAnnotationsVersion = '3.0.1';

diff --git a/gradle-app.setting b/gradle-app.setting
@@ -9,7 +9,7 @@
   <setting name="setup-tab">
     <setting name="setup">
       <setting name="custom-gradle-executor"/>
-      <setting name="current-directory" value="/Users/user/Documents/SID/THRIVE/opensrp fork/dristhi-app"/>
+      <setting name="current-directory" value="/Users/user/Documents/SID/THRIVE/ei.opensrp fork/dristhi-app"/>
       <setting name="log-level" value="LIFECYCLE"/>
     </setting>
   </setting>

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 30 10:30:31 WITA 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
+#Mon Jan 09 15:48:09 PKT 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/hs_err_pid22668.log b/hs_err_pid22668.log
@@ -320,7 +320,7 @@ eaa80000-100000000 rw-p 00000000 00:00 0
 7fb030021000-7fb034000000 ---p 00000000 00:00 0 
 7fb034000000-7fb034021000 rw-p 00000000 00:00 0 
 7fb034021000-7fb038000000 ---p 00000000 00:00 0 
-7fb03b000000-7fb03b002000 r--s 0000c000 08:01 8258553                    /home/raihan/OpenSrpWorkSpace/opensrp-client/opensrp-app/libs/butterknife-7.0.1.jar
+7fb03b000000-7fb03b002000 r--s 0000c000 08:01 8258553                    /home/raihan/OpenSrpWorkSpace/ei.opensrp-client/ei.opensrp-app/libs/butterknife-7.0.1.jar
 7fb03b017000-7fb03b018000 rw-p 00000000 00:00 0 
 7fb03b018000-7fb03b01b000 ---p 00000000 00:00 0 
 7fb03b01b000-7fb03b119000 rw-p 00000000 00:00 0 

diff --git a/hs_err_pid22795.log b/hs_err_pid22795.log
@@ -292,7 +292,7 @@ eaa80000-100000000 rw-p 00000000 00:00 0
 7f9ec0021000-7f9ec4000000 ---p 00000000 00:00 0 
 7f9ec4000000-7f9ec4e74000 rw-p 00000000 00:00 0 
 7f9ec4e74000-7f9ec8000000 ---p 00000000 00:00 0 
-7f9ecb41e000-7f9ecb420000 r--s 0000c000 08:01 9582194                    /home/raihan/OpenSrpWorkSpace/opensrp-client/opensrp-mcare/build/intermediates/exploded-aar/org.ei.opensrp/opensrp-app/unspecified/jars/libs/butterknife-7.0.1.jar
+7f9ecb41e000-7f9ecb420000 r--s 0000c000 08:01 9582194                    /home/raihan/OpenSrpWorkSpace/ei.opensrp-client/ei.opensrp-mcare/build/intermediates/exploded-aar/org.org.ei.opensrp.core.widget.opensrp/ei.opensrp-app/unspecified/jars/libs/butterknife-7.0.1.jar
 7f9ecb420000-7f9ecb423000 ---p 00000000 00:00 0 
 7f9ecb423000-7f9ecb521000 rw-p 00000000 00:00 0 
 7f9ecb521000-7f9ecb524000 ---p 00000000 00:00 0 
@@ -309,7 +309,7 @@ eaa80000-100000000 rw-p 00000000 00:00 0
 7f9ecba29000-7f9ecbb27000 rw-p 00000000 00:00 0                          [stack:22832]
 7f9ecbb27000-7f9ecbb2a000 ---p 00000000 00:00 0 
 7f9ecbb2a000-7f9ecbc28000 rw-p 00000000 00:00 0                          [stack:22831]
-7f9ecbc28000-7f9ecbc2a000 r--s 0000c000 08:01 8258553                    /home/raihan/OpenSrpWorkSpace/opensrp-client/opensrp-app/libs/butterknife-7.0.1.jar
+7f9ecbc28000-7f9ecbc2a000 r--s 0000c000 08:01 8258553                    /home/raihan/OpenSrpWorkSpace/ei.opensrp-client/ei.opensrp-app/libs/butterknife-7.0.1.jar
 7f9ecbc3f000-7f9ecbc40000 rw-p 00000000 00:00 0 
 7f9ecbc40000-7f9ecbc48000 r--s 000a8000 08:01 7733561                    /home/raihan/android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar
 7f9ecbc48000-7f9ecbc4a000 r--s 0000d000 08:01 7733686                    /home/raihan/android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar

diff --git a/opensrp-app/AndroidManifest.xml b/opensrp-app/AndroidManifest.xml
@@ -16,9 +16,6 @@
     <uses-feature
             android:name="android.hardware.camera"
             android:required="false"/>
-    <uses-sdk
-            android:minSdkVersion="16"
-            android:targetSdkVersion="16"/>
 
     <application
             android:label="@string/app_name"

diff --git a/opensrp-app/build.gradle b/opensrp-app/build.gradle
@@ -6,14 +6,12 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:1.2.3"
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'org.apache.commons:commons-lang3:3.3.2'
-        classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'org.robolectric'
 
 android {
     compileSdkVersion androidCompileSdkVersion
@@ -50,7 +48,7 @@ android {
     defaultConfig {
         // multiDexEnabled = true
         //applicationId "org.ei.opensrp"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 21
         versionCode 1
         versionName "3.0.1"
@@ -99,17 +97,17 @@ task copyTestResources() {
             into dest
         }
     }
+    dependsOn 'assembleRelease'
 }
 
-assembleDebug.dependsOn(copyTestResources)
+// assembleDebug.dependsOn(copyTestResources)
 
 configurations.all {
     resolutionStrategy.force 'commons-codec:commons-codec:1.6'
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile "org.apache.httpcomponents:httpmime:4.2.3"
+    compile 'com.android.support:appcompat-v7:24.0.0'
     compile 'commons-io:commons-io:2.1'
     compile 'com.google.code.gson:gson:2.3'
     compile 'org.apache.commons:commons-lang3:3.1'
@@ -121,7 +119,6 @@ dependencies {
     compile 'ch.acra:acra:4.5.0'
     compile 'com.google.guava:guava:18.0'
     compile fileTree(include: ['*.jar'], dir: 'libs')
-
 }
 
 dependencies {
@@ -134,6 +131,7 @@ dependencies {
     testCompile('com.squareup:fest-android:1.0.+') { exclude module: 'support-v4' }
     testCompile 'org.robolectric:robolectric:2.4'
 }
+
 task clearJar(type: Delete) {
     delete 'build/libs/myCompiledLibrary.jar'
 }
@@ -185,4 +183,4 @@ gradle.projectsEvaluated {
         } catch (Exception e) {} // Just drop the exception
     }
 
-}
+}
diff --git a/opensrp-app/default.properties b/opensrp-app/default.properties
@@ -1,2 +1,2 @@
 # Project target.
-target=android-16
+target=android-21