Merge branch 'v2.0.x' =x V2.0.6

This commit is contained in:
Graham Jones
2016-08-08 18:11:47 +01:00
37 changed files with 1793 additions and 271 deletions

View File

@@ -25,7 +25,7 @@ android {
dependencies {
compile files('libs/mpandroidchartlibrary-2-0-7.jar')
compile 'com.getpebble:pebblekit:3.0.0@aar'
compile 'com.getpebble:pebblekit:3.1.0@aar'
// Unit testing dependencies
testCompile 'junit:junit:4.12'
// Set this dependency if you want to use Mockito
@@ -34,6 +34,9 @@ dependencies {
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'
//compile files('libs/JTransforms-3.1-with-dependencies.jar')
compile 'org.apache.commons:commons-math3:3.6.1'
}
repositories {