summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--platform/android/MapboxGLAndroidSDK/build.gradle1
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/build.gradle1
-rw-r--r--platform/android/build.gradle2
-rw-r--r--platform/android/gradle/dependencies.gradle3
-rw-r--r--platform/android/gradle/wrapper/gradle-wrapper.properties4
m---------platform/android/vendor/mapbox-events-android0
m---------platform/android/vendor/mapbox-gestures-android0
m---------platform/android/vendor/mapbox-java0
8 files changed, 4 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index 25008de919..724242e35f 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -22,7 +22,6 @@ dependencies {
android {
compileSdkVersion androidVersions.compileSdkVersion
- buildToolsVersion androidVersions.buildToolsVersion
defaultConfig {
minSdkVersion androidVersions.minSdkVersion
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index a2a8bee22b..386361520d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion androidVersions.compileSdkVersion
- buildToolsVersion androidVersions.buildToolsVersion
defaultConfig {
applicationId "com.mapbox.mapboxsdk.testapp"
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index b932188e77..f1d88e3dc6 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath 'com.android.tools.build:gradle:3.3.0'
classpath dependenciesList.licensesPlugin
classpath dependenciesList.kotlinPlugin
}
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index 664d79ca90..1a55f1ee55 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -4,7 +4,6 @@ ext {
minSdkVersion : 14,
targetSdkVersion : 27,
compileSdkVersion: 27,
- buildToolsVersion: '28.0.3'
]
versions = [
@@ -19,7 +18,7 @@ ext {
robolectric : '3.8',
timber : '4.7.1',
okhttp : '3.11.0',
- kotlin : '1.2.51',
+ kotlin : '1.3.11',
licenses : '0.8.41',
lint : '26.1.3',
gms : '16.0.0'
diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties
index 84af82d181..ff890c2349 100644
--- a/platform/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platform/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 14 12:12:39 CEST 2018
+#Sun Jan 20 13:53:14 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/platform/android/vendor/mapbox-events-android b/platform/android/vendor/mapbox-events-android
-Subproject 1e733ba20b9f0e5c2ec4ab624b84f87eaa5b9a8
+Subproject 20c31407f259961db0602137a52f33ba5e580dd
diff --git a/platform/android/vendor/mapbox-gestures-android b/platform/android/vendor/mapbox-gestures-android
-Subproject 796b778043d026eada8f6f02ba393db2d3b0027
+Subproject 9d105dce2a495d1605fbab75829d33278ae7318
diff --git a/platform/android/vendor/mapbox-java b/platform/android/vendor/mapbox-java
-Subproject 0791fa4f00efac2e3f9f95ed061b248580e9cf3
+Subproject 22a324ffc37389cebee20aa49e83c08c13221a9