summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2019-01-31 14:21:11 +0100
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2019-02-01 13:07:00 +0100
commit43dc191f54504ef0d93ae7627e1aa01e2e3f117a (patch)
tree52969d1b854e5173787b43957be3d76714e9fe9d /platform/android
parent9c7b6f1fa7722e8e50aeec90a3c989ebe336066c (diff)
downloadqtlocation-mapboxgl-43dc191f54504ef0d93ae7627e1aa01e2e3f117a.tar.gz
[android] bump gestures library to v0.4.0
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/MapboxGLAndroidSDK/build.gradle5
-rw-r--r--platform/android/gradle/dependencies.gradle2
m---------platform/android/vendor/mapbox-gestures-android0
3 files changed, 2 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index 12be290175..77502da240 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -6,10 +6,7 @@ dependencies {
lintChecks project(":MapboxGLAndroidSDKLint")
api dependenciesList.mapboxAndroidTelemetry
api dependenciesList.mapboxJavaGeoJSON
- api (dependenciesList.mapboxAndroidGestures) {
- // workaround until https://github.com/mapbox/mapbox-gestures-android/issues/50 is released
- exclude group: 'com.jakewharton.timber', module: 'timber'
- }
+ api dependenciesList.mapboxAndroidGestures
implementation dependenciesList.mapboxJavaTurf
implementation dependenciesList.supportAppcompatV7
implementation dependenciesList.supportAnnotations
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index 032ecc4fa6..c730da3100 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -9,7 +9,7 @@ ext {
versions = [
mapboxServices : '4.3.0',
mapboxTelemetry : '4.2.0',
- mapboxGestures : '0.3.0',
+ mapboxGestures : '0.4.0',
supportLib : '27.1.1',
constraintLayout: '1.1.2',
espresso : '3.0.2',
diff --git a/platform/android/vendor/mapbox-gestures-android b/platform/android/vendor/mapbox-gestures-android
-Subproject 5d2bcdc6d2e30d002d65f38fd2726b094e086c4
+Subproject d70cf3bf1b0b8f7ae3fbf76bd3ed2704aa33da2