diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-29 13:02:45 +0100 |
|---|---|---|
| committer | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-29 13:25:54 +0100 |
| commit | f1327b3269a8fe42a316302d3179e537c91b596f (patch) | |
| tree | b8aa93c0a79c009d72be674392985ef86c24914f | |
| parent | f1db2a7aae4720cce0c1042d077fb5789d6862f8 (diff) | |
| download | qtlocation-mapboxgl-f1327b3269a8fe42a316302d3179e537c91b596f.tar.gz | |
[android] reference GMS proguard fix, temporary jacoco proguard fix
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/proguard-rules.pro | 3 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/proguard-rules.pro | 3 |
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 { *; } |