summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-11-29 13:02:45 +0100
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2018-11-29 19:26:21 +0100
commit99fd16503141f4c1bddfec60c681a72dd9d5e7f9 (patch)
treeb8aa93c0a79c009d72be674392985ef86c24914f
parenta4b20e0939b22708ac421915a5316d4e53677873 (diff)
downloadqtlocation-mapboxgl-99fd16503141f4c1bddfec60c681a72dd9d5e7f9.tar.gz
[android] reference GMS proguard fix, temporary jacoco proguard fix
-rw-r--r--platform/android/MapboxGLAndroidSDK/proguard-rules.pro3
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro3
2 files changed, 6 insertions, 0 deletions
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 { *; }