summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-05-06 08:46:50 +1000
committerLeith Bade <leith@mapbox.com>2015-05-06 20:48:11 +1000
commit8e1654ca13b6c8485c3c505c7a1f81ba833d7540 (patch)
tree481d2d6d0a878ce332c40d6679ba8a1433fc9552 /android
parentfd099593dc0a8fe8cb156fa22bf3739a7c325036 (diff)
downloadqtlocation-mapboxgl-8e1654ca13b6c8485c3c505c7a1f81ba833d7540.tar.gz
Update to lastest Android SDK
Diffstat (limited to 'android')
-rw-r--r--android/java/MapboxGLAndroidSDK/build.gradle8
-rw-r--r--android/java/MapboxGLAndroidSDK/gradle.properties2
-rw-r--r--android/java/MapboxGLAndroidSDKTestApp/build.gradle10
3 files changed, 10 insertions, 10 deletions
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'
}