Merge pull request #65 from OpenSRP/add-weight-for-height-calculation

Add weight for height Z-Score chart and calculations
opensrp · Mar 25, 2020 · 5982733 · 5982733
2 parents 52765bc + 85df604
commit 5982733
Show file tree

Hide file tree

Showing 27 changed files with 1,622 additions and 145 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: android
 # Setting sudo to required prevents Travis from testing the project in a Docker container.
 sudo: required
 jdk: oraclejdk8
-dist: precise
+dist: trusty
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -40,8 +40,10 @@ script:
   - ls -la
   # 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
+  - travis_wait ./gradlew clean --stacktrace
   #Run All tests Unit and Instrumentation
-  - travis_wait ./gradlew :opensrp-growth-monitoring:jacocoTestReport coveralls --stacktrace
+  - travis_wait ./gradlew :opensrp-growth-monitoring:jacocoTestReport --stacktrace
+  - travis_wait ./gradlew :opensrp-growth-monitoring:coveralls --stacktrace
 
 after_failure:
  - pandoc opensrp-growth-monitoring/build/reports/tests/index.html -t plain

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.1.19-SNAPSHOT
+VERSION_NAME=1.1.20-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Growth Monitoring Application

diff --git a/opensrp-growth-monitoring/build.gradle b/opensrp-growth-monitoring/build.gradle
@@ -87,12 +87,12 @@ allprojects {
 }
 
 dependencies {
-    implementation('org.smartregister:opensrp-client-core:1.8.26-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:1.9.2-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
     }
 
-    implementation('org.smartregister:opensrp-client-native-form:1.7.18-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:1.7.27-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }

diff --git a/opensrp-growth-monitoring/src/main/AndroidManifest.xml b/opensrp-growth-monitoring/src/main/AndroidManifest.xml
@@ -5,8 +5,6 @@
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
-        android:supportsRtl="true">
+        android:supportsRtl="true"></application>
 
-    </application>
-
-</manifest>
+</manifest>