diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2019-02-05 12:17:06 +0100 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2019-02-12 11:45:17 +0200 |
| commit | c402a40831db300f389d4ade2961fb255ec2d2b7 (patch) | |
| tree | 3bf7a0208189199abc50efdd8b212c3ac079028b | |
| parent | 53651825403e48739ce88715fcad9010a818ba67 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-build-adjustments.tar.gz | |
[android] - update codebase for Roboelectric v4.xupstream/tvn-build-adjustments
4 files changed, 9 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 77502da240..265bcf81ff 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -22,6 +22,10 @@ dependencies { android { compileSdkVersion androidVersions.compileSdkVersion + // Roboelectric 4.0 required config + // http://robolectric.org/migrating/#migrating-to-40 + testOptions.unitTests.includeAndroidResources = true + defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion diff --git a/platform/android/MapboxGLAndroidSDK/gradle.properties b/platform/android/MapboxGLAndroidSDK/gradle.properties index 65b16fb8dc..0dd023edac 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle.properties +++ b/platform/android/MapboxGLAndroidSDK/gradle.properties @@ -18,3 +18,7 @@ POM_PACKAGING=aar # Only build native dependencies for the current ABI # See https://code.google.com/p/android/issues/detail?id=221098#c20 android.buildOnlyTargetAbi=true + +# Roboelectric 4.0 required config for < Android Studio v3.3.0 +# http://robolectric.org/migrating/#migrating-to-40 +android.enableUnitTestBinaryResources=true
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java index cd58442e02..b72e85270d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java @@ -1,18 +1,15 @@ package com.mapbox.mapboxsdk.attribution; -import com.mapbox.mapboxsdk.BuildConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.Set; import static junit.framework.Assert.assertEquals; @RunWith(RobolectricTestRunner.class) -@Config(constants = BuildConfig.class) public class AttributionParseTest { private static final String STREETS_ATTRIBUTION = "<a href=\"https://www.mapbox.com/about/maps/\" target=\"_blank\">© Mapbox</a> <a href=\"http://www.openstreetmap.org/about/\" target=\"_blank\">© OpenStreetMap</a> <a class=\"mapbox-improve-map\" href=\"https://apps.mapbox.com/feedback/\" target=\"_blank\">Improve this map</a>\n"; diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index 01d3b66f9e..c9df677cb3 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -18,7 +18,7 @@ ext { junit : '4.12', mockito : '2.23.4', mockk : '1.9', - robolectric : '4.0.2', + robolectric : '4.1', timber : '4.7.1', okhttp : '3.12.0', kotlin : '1.3.11', |