From 4baee63d8eaa98bec0de2f1ed64888feee93ec53 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Tue, 16 Feb 2016 09:20:09 +0100 Subject: [android] #3750 - update proguard library for 4.0.0 release (maps package) + update for leak canary. --- platform/android/MapboxGLAndroidSDK/proguard-rules.pro | 7 +++++-- platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro | 10 ++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro index 85754a75a5..98647f5518 100644 --- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro @@ -15,8 +15,11 @@ # Package: http -keep class com.mapbox.mapboxsdk.http.** { *; } -# Package views --keep class com.mapbox.mapboxsdk.views.** { *; } +# Package maps +-keep class com.mapbox.mapboxsdk.maps.** { *; } + +# Package telemetry +-keep class com.mapbox.mapboxsdk.telemetry.** { *; } # Package layers -keep class com.mapbox.mapboxsdk.layers.** { *; } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro index c6445ac6a4..255a724744 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro @@ -1,8 +1,6 @@ # Mapbox ProGuard configuration is handled in the SDK - -keep class android.support.** { *; } - --dontwarn retrofit.** --keep class retrofit.** { *; } --keepattributes Signature --keepattributes Exceptions \ No newline at end of file +-dontwarn com.squareup.** +-dontwarn com.retrofit.** +-dontwarn java.lang.** +-dontwarn org.codehaus.** \ No newline at end of file -- cgit v1.2.1