From d22d8a6c9b3e6efa12f1fbcc57d6795e1479df40 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Mon, 17 Oct 2016 14:50:25 +0200 Subject: 6700 proguard update (#6718) * [android] - include net package in proguard config, added the default EnclosingMethod disable warning and fixed up typo. * update test app dependency leak canary to do a proguard release build, replaced keep support lib classes by dontwarn following Google guidelines, remove outdated/obsolete square configuration --- platform/android/MapboxGLAndroidSDK/proguard-rules.pro | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'platform/android/MapboxGLAndroidSDK/proguard-rules.pro') diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro index ddd7730ac4..96f7bb95f3 100644 --- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro @@ -1,7 +1,7 @@ # By default, the flags in this file are appended to flags specified # in ../sdk/tools/proguard/proguard-android.txt, # contents of this file will be appended into proguard-android.txt --keepattributes Signature, *Annotation* +-keepattributes Signature, *Annotation*, EnclosingMethod # Square okio, ignoring warnings, # see https://github.com/square/okio/issues/60 @@ -10,7 +10,7 @@ # Gesture package -keep class almeros.android.multitouch.gesturedetectors.** { *; } -# Package: annotations +# Package annotations -keep class com.mapbox.mapboxsdk.annotations.** { *; } # Package camera @@ -25,6 +25,9 @@ # Package maps -keep class com.mapbox.mapboxsdk.maps.** { *; } +# Package net +-keep class com.mapbox.mapboxsdk.net.** { *; } + # Package offline -keep class com.mapbox.mapboxsdk.offline.** { *; } -- cgit v1.2.1