Skip to content

Commit 83b1914

Browse files
author
Langston Smith
authored
Switching all plugins to AndroidX (#1100)
1 parent cc88baa commit 83b1914

155 files changed

Lines changed: 546 additions & 488 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
minSdkVersion androidVersions.minSdkVersion
1111
targetSdkVersion androidVersions.targetSdkVersion
1212
applicationId "com.mapbox.mapboxsdk.plugins.testapp"
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
vectorDrawables.useSupportLibrary = true
1515
}
1616

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,30 @@
44
import android.content.Context;
55
import android.net.ConnectivityManager;
66
import android.net.NetworkInfo;
7-
import android.support.test.espresso.Espresso;
8-
import android.support.test.espresso.IdlingRegistry;
9-
import android.support.test.espresso.IdlingResourceTimeoutException;
10-
import android.support.test.espresso.ViewInteraction;
11-
import android.support.test.rule.ActivityTestRule;
12-
import com.mapbox.mapboxsdk.maps.MapboxMap;
137

8+
import com.mapbox.mapboxsdk.maps.MapboxMap;
149
import com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction;
1510
import com.mapbox.mapboxsdk.plugins.annotation.WaitAction;
1611
import com.mapbox.mapboxsdk.plugins.utils.OnMapReadyIdlingResource;
12+
1713
import junit.framework.Assert;
14+
1815
import org.junit.After;
1916
import org.junit.Before;
2017
import org.junit.Rule;
2118
import org.junit.rules.TestName;
19+
20+
import androidx.test.espresso.Espresso;
21+
import androidx.test.espresso.IdlingRegistry;
22+
import androidx.test.espresso.IdlingResourceTimeoutException;
23+
import androidx.test.espresso.ViewInteraction;
24+
import androidx.test.rule.ActivityTestRule;
2225
import timber.log.Timber;
2326

24-
import static android.support.test.espresso.Espresso.onView;
25-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
26-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
27-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
27+
import static androidx.test.espresso.Espresso.onView;
28+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
29+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
30+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
2831

2932
public abstract class BaseActivityTest {
3033

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// This file is generated
66
package com.mapbox.mapboxsdk.plugins.gen.<%- subPackage %>;
77

8-
import android.support.test.runner.AndroidJUnit4;
8+
import androidx.test.ext.junit.runners.AndroidJUnit4;
99

1010
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;
1111
import com.mapbox.mapboxsdk.plugins.testapp.activity.<%- subPackage %>.<%- activity %>;

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package com.mapbox.mapboxsdk.plugins.annotation;
44

5-
import android.support.test.runner.AndroidJUnit4;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import com.mapbox.mapboxsdk.geometry.LatLng;
88
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package com.mapbox.mapboxsdk.plugins.annotation;
44

55
import android.graphics.PointF;
6-
import android.support.test.runner.AndroidJUnit4;
6+
import androidx.test.ext.junit.runners.AndroidJUnit4;
77

88
import com.mapbox.mapboxsdk.geometry.LatLng;
99
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package com.mapbox.mapboxsdk.plugins.annotation;
44

5-
import android.support.test.runner.AndroidJUnit4;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import com.mapbox.mapboxsdk.geometry.LatLng;
88
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package com.mapbox.mapboxsdk.plugins.annotation;
44

55
import android.graphics.PointF;
6-
import android.support.test.runner.AndroidJUnit4;
6+
import androidx.test.ext.junit.runners.AndroidJUnit4;
77

88
import com.mapbox.mapboxsdk.geometry.LatLng;
99
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package com.mapbox.mapboxsdk.plugins.annotation;
44

5-
import android.support.test.runner.AndroidJUnit4;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import com.mapbox.mapboxsdk.geometry.LatLng;
88
import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity;

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package com.mapbox.mapboxsdk.plugins.annotation;
44

55
import android.graphics.PointF;
6-
import android.support.test.runner.AndroidJUnit4;
6+
import androidx.test.ext.junit.runners.AndroidJUnit4;
77

88
import com.mapbox.mapboxsdk.geometry.LatLng;
99
import com.mapbox.mapboxsdk.plugins.BaseActivityTest;

‎app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package com.mapbox.mapboxsdk.plugins.annotation;
22

3-
import android.support.test.espresso.UiController;
4-
import android.support.test.espresso.ViewAction;
53
import android.view.View;
4+
65
import com.mapbox.mapboxsdk.maps.MapboxMap;
6+
77
import org.hamcrest.Matcher;
88

9-
import static android.support.test.espresso.Espresso.onView;
10-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
11-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
9+
import androidx.test.espresso.UiController;
10+
import androidx.test.espresso.ViewAction;
11+
12+
import static androidx.test.espresso.Espresso.onView;
13+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
14+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
1215

1316
public class MapboxMapAction implements ViewAction {
1417

0 commit comments

Comments
 (0)