Skip to content

Commit

Permalink
Release 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Balcan authored Feb 5, 2019
2 parents 22b67dd + d743d64 commit f0f6be5
Show file tree
Hide file tree
Showing 647 changed files with 13,620 additions and 6,257 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
/build
/captures
.externalNativeBuild
/app/dhis_keystore.jks
/app/dhis_keystore.jks
dhis2-rule-engine/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "dhis2-rule-engine"]
path = dhis2-rule-engine
url = https://github.com/Balcan/dhis2-rule-engine.git
107 changes: 79 additions & 28 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'io.fabric'
//apply from: rootProject.file("plugins/android-paperwork.gradle")

def libraries = rootProject.ext.libraries
def versions = rootProject.ext.versions
Expand All @@ -21,6 +20,13 @@ repositories {

android {

testOptions {
unitTests {
includeAndroidResources = true
returnDefaultValues = true
}
}

lintOptions {
checkReleaseBuilds false
abortOnError false
Expand All @@ -34,15 +40,19 @@ android {
targetSdkVersion versions.sdk
versionCode versions.vCode
versionName versions.vName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
multiDexEnabled true

setProperty("archivesBaseName","dhis2-v"+versionName)
setProperty("archivesBaseName", "dhis2-v" + versionName)

buildConfigField "String", "SDK_VERSION", "\"" + libraries.dhis2sdk + "\""
}

testOptions {
unitTests.returnDefaultValues = true
}

configurations.all*.exclude module: 'jsr305'


Expand Down Expand Up @@ -89,6 +99,24 @@ android {
}
}

/* flavorDimensions "default"
productFlavors {
dhis{
applicationId "com.dhis2"
archivesBaseName = "dhis"
dimension "default"
versionCode versions.vCode
versionName versions.vName
}
PSI {
applicationId "org.psi.dhis2"
archivesBaseName = "PSI"
dimension "default"
versionCode 1
versionName "1.0.3"
}
}*/

compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down Expand Up @@ -116,33 +144,40 @@ android {
}
}

sonarqube {
properties {
property "sonar.language", "java"
}
}

dependencies {

implementation project(":customFab")
implementation project(":dhis2-rule-engine")
// implementation project(":dhis2-rule-engine")
implementation project(":viewpagerdotsindicator")

//region SUPPORT LIBRARIES
implementation "com.android.support:appcompat-v7:${libraries.support}"
implementation "com.android.support:support-annotations:${libraries.support}"
implementation "com.android.support:cardview-v7:${libraries.support}"
implementation "com.android.support:design:${libraries.support}"
implementation "com.android.support:support-v4:${libraries.support}"

implementation "com.android.support:multidex:${libraries.multidex}"
implementation "com.android.support.constraint:constraint-layout:${libraries.constraintlayout}"
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
implementation 'androidx.annotation:annotation:1.0.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.1.0-alpha02'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'

implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
//endregion

//region DHIS2 LIBRARIES
implementation("org.hisp.dhis:android-core:${libraries.dhis2sdk}") {
exclude group: "org.hisp.dhis", module: "core-rules"
}

implementation("org.hisp.dhis:android-rules:${libraries.dhis2sdk}") {
exclude group: "com.google.code.findbugs", module: "jsr305"
exclude group: "org.hisp.dhis", module: "core-rules"
}
/* implementation("org.hisp.dhis:android-rules:${libraries.dhis2sdk}") {
exclude group: "com.google.code.findbugs", module: "jsr305"
exclude group: "org.hisp.dhis", module: "core-rules"
}*/

// implementation"org.hisp.dhis.rules:rule-engine:${libraries.ruleEngine}"
implementation "org.hisp.dhis.rules:rule-engine:${libraries.ruleEngine}"
//endregion

//region UI LIBRARIES
Expand All @@ -169,18 +204,19 @@ dependencies {

//region DAGGER
implementation "com.google.dagger:dagger:${libraries.dagger}"
annotationProcessor "com.google.dagger:dagger-compiler:${libraries.dagger}"
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
kapt "com.google.dagger:dagger-compiler:${libraries.dagger}"
//endregion

//region GOOGLE AUTO VALUE
// Google's auto-value. Annotations are used only during compilation time, as well as
// annotation processor which hoops up into compilation process
compileOnly "com.google.auto.value:auto-value:${libraries.autovalue}"
api "com.google.auto.value:auto-value:${libraries.autovalue}"
annotationProcessor "com.google.auto.value:auto-value:${libraries.autovalue}"

// Extension which generates mappers for work with cursors
annotationProcessor "com.gabrielittner.auto.value:auto-value-cursor:${libraries.autovaluecursor}"
annotationProcessor "com.ryanharter.auto.value:auto-value-parcel:${libraries.autovalueparcel}"
kapt "com.gabrielittner.auto.value:auto-value-cursor:${libraries.autovaluecursor}"
kapt "com.ryanharter.auto.value:auto-value-parcel:${libraries.autovalueparcel}"
//endregion

//region BRITEDATABASE
Expand All @@ -202,13 +238,13 @@ dependencies {
// Jake Wharton libraries
//timber
implementation "com.jakewharton.timber:timber:${libraries.timber}"

//GSON
implementation 'com.google.code.gson:gson:2.8.2'

//JOB SCHEDULER
implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
implementation ("android.arch.work:work-runtime:1.0.0-alpha10"){
implementation("android.arch.work:work-runtime:1.0.0-alpha10") {
exclude group: 'com.google.guava', module: 'listenablefuture'

}
Expand All @@ -218,17 +254,25 @@ dependencies {
transitive = true
}

//FIREBASE
implementation 'com.google.firebase:firebase-core:16.0.1'

//Test

implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', {
exclude group: 'com.android.support', module: 'support-annotations'
exclude group: 'com.google.code.findbugs'

})

testImplementation 'junit:junit:4.12'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
testImplementation 'org.robolectric:robolectric:4.1'
testImplementation "org.robolectric:shadows-multidex:4.0.1"
testImplementation group: 'org.mockito', name: 'mockito-all', version: '1.8.4'
/* androidTestImplementation 'com.google.dagger:dagger:2.14.1'
androidTestImplementation 'com.google.dagger:dagger-compiler:2.14.1'*/

implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
Expand All @@ -248,19 +292,26 @@ dependencies {
implementation 'com.github.faruktoptas:FancyShowCaseView:1.0.0'

//Lottie animations
implementation 'com.airbnb.android:lottie:2.5.4'
implementation 'com.airbnb.android:lottie:2.8.0'

//Glide load images
implementation 'com.github.bumptech.glide:glide:4.7.1'
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
implementation "com.tbuonomo.andrui:viewpagerdotsindicator:${libraries.indicatordots}"
implementation 'com.github.bumptech.glide:glide:4.8.0'
kapt 'com.github.bumptech.glide:compiler:4.8.0'

//Paperwork
implementation "hu.supercluster:paperwork:${libraries.paperwork}"

implementation group: 'com.google.guava', name: 'guava', version: '24.1-jre'

implementation 'cat.ereza:customactivityoncrash:2.2.0'

implementation "com.google.android.gms:play-services-analytics:${libraries.analytics}"

implementation "com.github.pwittchen:rxbiometric:0.1.0"

implementation "de.adorsys.android:securestoragelibrary:${libraries.latestSecureStorageVersion}"
}

apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'com.google.gms.google-services'
107 changes: 107 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
{
"project_info": {
"project_number": "82834045260",
"firebase_url": "https://dhis2-android-capture-ap-50d48.firebaseio.com",
"project_id": "dhis2-android-capture-ap-50d48",
"storage_bucket": "dhis2-android-capture-ap-50d48.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:82834045260:android:d9ac84187601a4ea",
"android_client_info": {
"package_name": "com.dhis2"
}
},
"oauth_client": [
{
"client_id": "82834045260-i38idvbdli854997vl4lddn7p71381n5.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.dhis2",
"certificate_hash": "239ae0a8259b8fff7fd03fad696690a457b067a8"
}
},
{
"client_id": "82834045260-f2lgs43899r9ic0aqi7qk2bk2praeg00.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.dhis2",
"certificate_hash": "bd61679cdfeda8fc4e4f70bb52693c02b0798005"
}
},
{
"client_id": "82834045260-lf3eea7b3vvudbseh1tk9jok2cjkhjda.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCgcIq1LdwcUCq9nOgtSg3OPCs9qLsa2YY"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "82834045260-lf3eea7b3vvudbseh1tk9jok2cjkhjda.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:82834045260:android:9f732326b0b9e7c6",
"android_client_info": {
"package_name": "com.dhis2.debug"
}
},
"oauth_client": [
{
"client_id": "82834045260-gmppg0u4uuuith1fteqj3ff97u8vum89.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.dhis2.debug",
"certificate_hash": "bd61679cdfeda8fc4e4f70bb52693c02b0798005"
}
},
{
"client_id": "82834045260-lf3eea7b3vvudbseh1tk9jok2cjkhjda.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCgcIq1LdwcUCq9nOgtSg3OPCs9qLsa2YY"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "82834045260-lf3eea7b3vvudbseh1tk9jok2cjkhjda.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
30 changes: 0 additions & 30 deletions app/src/androidTest/java/org/dhis2/ExampleInstrumentedTest.java

This file was deleted.

Loading

0 comments on commit f0f6be5

Please sign in to comment.