summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorOsana Babayan <32496536+osana@users.noreply.github.com>2018-04-05 11:38:02 -0400
committerGitHub <noreply@github.com>2018-04-05 11:38:02 -0400
commit275d753e91501345e00c23166f0c67ccf8741155 (patch)
tree9fde4f869d7e26536ced1b70dfbe5d1f00b48c8f /platform
parentc50a74d1c28eac946f7a2d9ab6ad2a956ffdde97 (diff)
downloadqtlocation-mapboxgl-275d753e91501345e00c23166f0c67ccf8741155.tar.gz
[android] updated mapbox-sdk-services to 3.0.1 (#11593)
* [android] updated mapbox-sdk-services to 3.0.1 * [android] - downgrade tooling for MAS-3.0.1
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/proguard-rules.pro6
-rw-r--r--platform/android/gradle/dependencies.gradle2
2 files changed, 5 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
index ce6e1709a0..83bd7df835 100644
--- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
+++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
@@ -13,6 +13,7 @@
-dontnote okhttp3.**
# config for mapbox-android-telemetry:3.0.0-beta.1
+-keep class com.mapbox.android.telemetry.** { *; }
-dontwarn com.mapbox.android.core.location.MockLocationEngine
-dontwarn com.mapbox.android.core.location.MockLocationEngine$LocationUpdateRunnable
-dontwarn java.awt.Color
@@ -20,7 +21,7 @@
-dontwarn org.conscrypt.OpenSSLProvider
-dontwarn org.conscrypt.Conscrypt
-# config for mapbox-sdk-geojson:3.0.0-beta.3
+# config for mapbox-sdk-geojson:3.0.1
-keep class com.mapbox.geojson.** { *; }
-keep class com.google.gson.** { *; }
-dontnote com.google.gson.internal.UnsafeAllocator
@@ -38,4 +39,5 @@
-dontnote com.google.protobuf.ExtensionRegistry
-dontnote com.google.protobuf.Extension
-dontnote android.net.**
--dontnote org.apache.http.** \ No newline at end of file
+-dontnote org.apache.http.**
+-dontwarn com.sun.xml.internal.ws.spi.db.** \ No newline at end of file
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index 7a226da284..f9409866b5 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -8,7 +8,7 @@ ext {
]
versions = [
- mapboxServices : '3.0.0-beta.4',
+ mapboxServices : '3.0.1',
mapboxTelemetry: '3.0.0-beta.4',
mapboxGestures : '0.2.0',
supportLib : '25.4.0',