diff options
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | android/java/MapboxGLAndroidSDK/build.gradle | 8 | ||||
| -rw-r--r-- | android/java/MapboxGLAndroidSDK/gradle.properties | 2 | ||||
| -rw-r--r-- | android/java/MapboxGLAndroidSDKTestApp/build.gradle | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index b2dae3cf00..2f50535cc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,35 +31,35 @@ matrix: - os: linux env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release android: - components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + components: [ 'build-tools-22.0.1', 'android-22', 'extra' ] addons: apt: packages: [ 'lib32stdc++6' ] - os: linux env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Debug android: - components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + components: [ 'build-tools-22.0.1', 'android-22', 'extra' ] addons: apt: packages: [ 'lib32stdc++6' ] - os: linux env: FLAVOR=android ANDROID_ABI=arm-v8 BUILDTYPE=Release android: - components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + components: [ 'build-tools-22.0.1', 'android-22', 'extra' ] addons: apt: packages: [ 'lib32stdc++6' ] - os: linux env: FLAVOR=android ANDROID_ABI=x86 BUILDTYPE=Release android: - components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + components: [ 'build-tools-22.0.1', 'android-22', 'extra' ] addons: apt: packages: [ 'lib32stdc++6' ] - os: linux env: FLAVOR=android ANDROID_ABI=mips BUILDTYPE=Release android: - components: [ 'build-tools-22.0.0', 'android-22', 'extra' ] + components: [ 'build-tools-22.0.1', 'android-22', 'extra' ] addons: apt: packages: [ 'lib32stdc++6' ] diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle index 901aa6d9d7..f0659b8c7b 100644 --- a/android/java/MapboxGLAndroidSDK/build.gradle +++ b/android/java/MapboxGLAndroidSDK/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.3' + classpath 'com.android.tools.build:gradle:1.2.2' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0' } } @@ -29,9 +29,9 @@ repositories { dependencies { compile 'commons-validator:commons-validator:1.4.1' - compile 'com.android.support:support-annotations:22.0.0' - compile 'com.android.support:support-v4:22.0.0' - compile 'com.squareup.okhttp:okhttp:2.2.0' + compile 'com.android.support:support-annotations:22.1.1' + compile 'com.android.support:support-v4:22.1.1' + compile 'com.squareup.okhttp:okhttp:2.3.0' } android { diff --git a/android/java/MapboxGLAndroidSDK/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties index 79e2dadca7..8ba98ea4f1 100644 --- a/android/java/MapboxGLAndroidSDK/gradle.properties +++ b/android/java/MapboxGLAndroidSDK/gradle.properties @@ -14,7 +14,7 @@ POM_DEVELOPER_NAME=Mapbox ANDROID_MIN_SDK=8 ANDROID_BUILD_TARGET_SDK_VERSION=22 -ANDROID_BUILD_TOOLS_VERSION=22.0.0 +ANDROID_BUILD_TOOLS_VERSION=22.0.1 ANDROID_BUILD_SDK_VERSION=22 POM_NAME=Mapbox GL Android SDK diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 7cdd4fc916..5f2db91d7e 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.3' + classpath 'com.android.tools.build:gradle:1.2.2' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0' } } @@ -31,7 +31,7 @@ gradle.projectsEvaluated { android { compileSdkVersion 22 - buildToolsVersion "22.0.0" + buildToolsVersion "22.0.1" repositories { mavenCentral() @@ -74,9 +74,9 @@ dependencies { compile(project(':MapboxGLAndroidSDK')) { transitive = true } - compile 'com.android.support:support-annotations:22.0.0' - compile 'com.android.support:support-v4:22.0.0' - compile 'com.android.support:appcompat-v7:22.0.0' + compile 'com.android.support:support-annotations:22.1.1' + compile 'com.android.support:support-v4:22.1.1' + compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.mapzen.android:lost:1.0.0' } |