From 3eeb1074fe172ec8d986752645b5b730a881674d Mon Sep 17 00:00:00 2001 From: osana Date: Wed, 4 Apr 2018 10:04:43 -0400 Subject: [PATCH 1/2] [android] updated mapbox-sdk-services to 3.0.1 --- platform/android/MapboxGLAndroidSDK/proguard-rules.pro | 2 +- platform/android/gradle/dependencies.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro index ce6e1709a0d..4d66394345c 100644 --- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro @@ -20,7 +20,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 diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index 7a226da2843..f9409866b5f 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', From 552e0c71916216ed06c594eb2b8603c7ba768341 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 5 Apr 2018 11:09:48 +0200 Subject: [PATCH 2/2] [android] - downgrade tooling for MAS-3.0.1 --- platform/android/MapboxGLAndroidSDK/proguard-rules.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro index 4d66394345c..83bd7df835a 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 @@ -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