From 3f76907f92e2fff40c144e99da8e6fe6ec099a0c Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Tue, 12 Sep 2017 11:26:41 +0200 Subject: [android] - bump proguard config for OkHttp 3.8.0 --- platform/android/MapboxGLAndroidSDK/proguard-rules.pro | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1