From 99fd16503141f4c1bddfec60c681a72dd9d5e7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Thu, 29 Nov 2018 13:02:45 +0100 Subject: [android] reference GMS proguard fix, temporary jacoco proguard fix --- platform/android/MapboxGLAndroidSDK/proguard-rules.pro | 3 +++ platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro | 3 +++ 2 files changed, 6 insertions(+) diff --git a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro index 159b5851e6..d84462229d 100644 --- a/platform/android/MapboxGLAndroidSDK/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDK/proguard-rules.pro @@ -39,3 +39,6 @@ # a large amount of users combine it with our SDK # we aren't able to provide a proguard config in that project (jar vs aar) -dontwarn com.sun.xml.internal.ws.spi.db.* + +# Temporary jacoco workaround - https://github.com/mapbox/mapbox-events-android/issues/302 +-dontwarn org.jacoco.** \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro index 6860246e1c..ed687ff76d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro +++ b/platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro @@ -8,4 +8,7 @@ -dontnote com.squareup.leakcanary.internal.** -dontnote gnu.trove.THashMap +# GMS +-dontnote com.google.android.gms.** + -keep class com.mapbox.mapboxsdk.testapp.model.customlayer.ExampleCustomLayer { *; } -- cgit v1.2.1