Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Dependencies bump, snapshot version update #13536

Merged
merged 2 commits into from
Feb 13, 2019
Merged

Dependencies bump, snapshot version update #13536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5365182
[android] - bump dependencies and tooling
tobrun Dec 11, 2018
c402a40
[android] - update codebase for Roboelectric v4.x
tobrun Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions platform/android/MapboxGLAndroidSDK/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions platform/android/MapboxGLAndroidSDK/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions ...pboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/attribution/AttributionParseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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\">&copy; Mapbox</a> <a href=\"http://www.openstreetmap.org/about/\" target=\"_blank\">&copy; OpenStreetMap</a> <a class=\"mapbox-improve-map\" href=\"https://apps.mapbox.com/feedback/\" target=\"_blank\">Improve this map</a>\n";
Expand Down
12 changes: 5 additions & 7 deletions platform/android/gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ ext {
constraintLayout: '1.1.2',
espresso : '3.0.2',
testRunner : '1.0.2',
leakCanary : '1.6.1',
leakCanary : '1.6.2',
junit : '4.12',
mockito : '2.23.4',
mockk : '1.9',
robolectric : '3.8',
robolectric : '4.1',
timber : '4.7.1',
okhttp : '3.11.0',
okhttp : '3.12.0',
kotlin : '1.3.11',
licenses : '0.8.41',
lint : '26.1.3',
licenses : '0.8.42',
lint : '26.1.4',
gms : '16.0.0',
reLinker : '1.3.1'
]
Expand All @@ -33,8 +33,6 @@ ext {
mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${versions.mapboxServices}",
mapboxAndroidTelemetry : "com.mapbox.mapboxsdk:mapbox-android-telemetry:${versions.mapboxTelemetry}",
mapboxAndroidGestures : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}",

// for testApp
mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}",

junit : "junit:junit:${versions.junit}",
Expand Down