summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-09-12 11:26:41 +0200
committerTobrun <tobrun@mapbox.com>2017-09-14 07:44:35 +0200
commit3f76907f92e2fff40c144e99da8e6fe6ec099a0c (patch)
tree99ed31cdfd49084aee70973d516cecee8fd8209c /platform
parent73c633e22b25f40b15dfa3033f666fd65a0bdebf (diff)
downloadqtlocation-mapboxgl-3f76907f92e2fff40c144e99da8e6fe6ec099a0c.tar.gz
[android] - bump proguard config for OkHttp 3.8.0
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/proguard-rules.pro7
1 files changed, 6 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
index 68edc12f35..b5a1d82c81 100644
--- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
+++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro
@@ -7,4 +7,9 @@
-keep interface com.mapbox.mapboxsdk.** { *; }
-keep class com.mapbox.services.android.telemetry.** { *; }
-keep class com.mapbox.services.commons.** { *;}
--keep class com.google.gson.** { *; } \ No newline at end of file
+-keep class com.google.gson.** { *; }
+
+# config for okhttp 3.8.0, https://github.com/square/okhttp/pull/3354
+-dontwarn okio.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault \ No newline at end of file