Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Thrivepk branch for merge to master #375

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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/
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
57 changes: 44 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,30 +1,61 @@
configure(allprojects) { project ->
buildscript {
repositories {
jcenter()
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
mavenLocal()
buildscript {
System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'

dependencies {
classpath 'com.android.tools.build:gradle:2.3.2'
//classpath 'com.google.gms:google-services:3.0.0'
}
}

allprojects {
repositories {
jcenter()
maven { url "$rootDir/repo/" }
maven { url = 'https://oss.sonatype.org/content/groups/public' }
maven {
url "${projectDir}/opensrp-app/../libs/"
}
maven {
url "${projectDir}/opensrp-app-it/../libs/"
}
mavenLocal()
}
}

configurations.all {
transitive = true
}

//configure(allprojects) { project ->
// buildscript {
// System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'
//
// repositories {
// jcenter()
// mavenCentral()
// maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
// mavenLocal()
// }
// }
//}

project.ext.preDexLibs = !project.hasProperty('disablePreDex')

subprojects {
/*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';
ext.androidAnnotationsAPIVersion = '3.0.1';

repositories {
jcenter()
mavenCentral()
maven { url "${projectDir}/libs/" }
maven { url "http://nexus.motechproject.org/content/repositories/drishti" }
@@ -49,7 +80,7 @@ subprojects {
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
}
}
}
}*/

apply plugin : 'java'
apply plugin : 'build-dashboard'
2 changes: 1 addition & 1 deletion gradle-app.setting
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 6 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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-3.3-all.zip
2 changes: 1 addition & 1 deletion hs_err_pid22668.log
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions hs_err_pid22795.log
Original file line number Diff line number Diff line change
@@ -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
5 changes: 0 additions & 5 deletions opensrp-app/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -16,13 +16,8 @@
<uses-feature
android:name="android.hardware.camera"
android:required="false"/>
<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="16"/>

<application
android:label="@string/app_name"
android:icon="@drawable/opensrp_logo"
android:clearTaskOnLaunch="true"
android:largeHeap="true">

Loading