Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[android] updated mapbox-sdk-services to 3.0.1 #11593

Merged
merged 2 commits into from
Apr 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions platform/android/MapboxGLAndroidSDK/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
-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
-dontwarn com.mapzen.android.lost.api**
-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
Expand All @@ -38,4 +39,5 @@
-dontnote com.google.protobuf.ExtensionRegistry
-dontnote com.google.protobuf.Extension
-dontnote android.net.**
-dontnote org.apache.http.**
-dontnote org.apache.http.**
-dontwarn com.sun.xml.internal.ws.spi.db.**
2 changes: 1 addition & 1 deletion platform/android/gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down