Merge branch 'V2.6_new' into V2.6 - Addes updated SMS sending code and network datasource passive

This commit is contained in:
Graham Jones
2018-12-27 09:48:37 +00:00
16 changed files with 209 additions and 44 deletions

View File

@@ -23,22 +23,23 @@ android {
}
dependencies {
compile files('libs/mpandroidchartlibrary-2-0-7.jar')
compile 'com.getpebble:pebblekit:3.1.0@aar'
implementation 'com.android.support:multidex:1.0.3'
implementation files('libs/mpandroidchartlibrary-2-0-7.jar')
implementation 'com.getpebble:pebblekit:3.1.0@aar'
// Unit testing dependencies
testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
// Set this dependency if you want to use Mockito
testCompile 'org.mockito:mockito-core:1.10.19'
testImplementation 'org.mockito:mockito-core:1.10.19'
// Set this dependency if you want to use Hamcrest matching
testCompile 'org.hamcrest:hamcrest-library:1.1'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:support-v4:22.2.1'
testImplementation 'org.hamcrest:hamcrest-library:1.1'
implementation 'com.android.support:appcompat-v7:22.2.1'
implementation 'com.android.support:support-v4:22.2.1'
//compile files('libs/JTransforms-3.1-with-dependencies.jar')
compile 'org.apache.commons:commons-math3:3.6.1'
implementation 'org.apache.commons:commons-math3:3.6.1'
// google play services used for location finding for SMS alerts.
compile 'com.google.android.gms:play-services-location:10.0.0'
compile 'com.google.android.gms:play-services:10.0.1'
compile 'com.github.wendykierp:JTransforms:3.0'
implementation 'com.google.android.gms:play-services:10.0.1'
implementation 'com.github.wendykierp:JTransforms:3.0'
implementation 'com.google.android.gms:play-services-location:10.0.0'
}