summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2018-09-03 12:30:01 +0200
committerTobrun <tobrun@mapbox.com>2018-09-03 13:53:13 +0200
commitaf0de6e015e803c33c1d24e25b34bea4778ecd20 (patch)
tree025c4bf7f5d177594fe859c349f2c9bdbed92ec6
parent59ebe022bcca7c915932aa5f5ec7334ce68b6949 (diff)
downloadqtlocation-mapboxgl-af0de6e015e803c33c1d24e25b34bea4778ecd20.tar.gz
[android] - add Keep annotations to abstract components
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java1
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java2
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/build.gradle4
3 files changed, 6 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java
index 5535e20923..5de90b1d67 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java
@@ -5,6 +5,7 @@ import com.mapbox.mapboxsdk.Mapbox;
import java.util.concurrent.locks.ReentrantLock;
+@Keep
public class NativeHttpRequest implements HttpResponder {
private final HttpRequest httpRequest = Mapbox.getModuleProvider().createHttpRequest();
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java
index c5b5eec393..fe443b81aa 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java
@@ -1,5 +1,6 @@
package com.mapbox.mapboxsdk.log;
+import android.support.annotation.Keep;
import android.util.Log;
/**
@@ -9,6 +10,7 @@ import android.util.Log;
* Alternative implementations can be set with {@link #setLoggerDefinition(LoggerDefinition)}.
* </p>
*/
+@Keep
public final class Logger {
private static final LoggerDefinition DEFAULT = new LoggerDefinition() {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index b4709930eb..cf0a8ed66e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -34,12 +34,14 @@ android {
buildTypes {
debug {
- testCoverageEnabled = true
+ testCoverageEnabled true
minifyEnabled false
+ shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
release {
minifyEnabled true
+ shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}