diff options
| author | Leith Bade <leith@mapbox.com> | 2015-10-16 18:02:57 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-10-16 18:31:44 +1100 |
| commit | ceb67bbc77bf5f4bd58e40fa9579e21c26548ebd (patch) | |
| tree | 1e0a515f4fac817392df7d05b220dac2152ce48e | |
| parent | 6a1b9b31a6e1bd23c92176bd5bb9aabadf79b4d1 (diff) | |
| download | qtlocation-mapboxgl-ceb67bbc77bf5f4bd58e40fa9579e21c26548ebd.tar.gz | |
[android] Update to Android support library v23.1.0
Also OkHTTP to 2.5.0
Fixes #2639
| -rw-r--r-- | android/java/MapboxGLAndroidSDK/build.gradle | 8 | ||||
| -rw-r--r-- | android/java/MapboxGLAndroidSDKTestApp/build.gradle | 15 |
2 files changed, 12 insertions, 11 deletions
diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle index 1f7c7d1ed4..7ff49e594e 100644 --- a/android/java/MapboxGLAndroidSDK/build.gradle +++ b/android/java/MapboxGLAndroidSDK/build.gradle @@ -18,10 +18,10 @@ repositories { } dependencies { - compile 'com.android.support:support-annotations:23.0.1' - compile 'com.android.support:support-v4:23.0.1' - compile 'com.android.support:design:23.0.1' - compile 'com.squareup.okhttp:okhttp:2.4.0' + compile 'com.android.support:support-annotations:23.1.0' + compile 'com.android.support:support-v4:23.1.0' + compile 'com.android.support:design:23.1.0' + compile 'com.squareup.okhttp:okhttp:2.5.0' compile 'com.mapzen.android:lost:1.0.1' } diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 8f3b7fb125..013a45c0d8 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -77,19 +77,20 @@ dependencies { compile(project(':MapboxGLAndroidSDK')) { transitive = true } - compile 'com.android.support:support-annotations:23.0.1' - compile 'com.android.support:support-v4:23.0.1' - compile 'com.android.support:appcompat-v7:23.0.1' - compile 'com.android.support:design:23.0.1' + compile 'com.android.support:support-annotations:23.1.0' + compile 'com.android.support:support-v4:23.1.0' + compile 'com.android.support:appcompat-v7:23.1.0' + compile 'com.android.support:design:23.1.0' compile('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') { transitive = true; } // Testing dependencies testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-core:1.+' - androidTestCompile 'com.android.support.test:runner:0.4' - androidTestCompile 'com.android.support.test:rules:0.4' + testCompile 'org.mockito:mockito-core:1.10.19' + androidTestCompile 'com.android.support:support-annotations:23.1.0' + androidTestCompile 'com.android.support.test:runner:0.4.1' + androidTestCompile 'com.android.support.test:rules:0.4.1' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' } |