Migrate dependencies to androidx

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## TBD
+
+* Migrate dependencies to androidx
+  [#554](https://github.com/bugsnag/bugsnag-android/pull/554)
+
 ## 4.17.2 (2019-08-01)
 
 ### Bug fixes

bugsnag-android-core/src/androidTest/AndroidManifest.xml

@@ -10,7 +10,7 @@
   <application android:label="Bugsnag Android Tests"></application>
 
   <instrumentation
-    android:name="android.support.test.runner.AndroidJUnitRunner"
+    android:name="androidx.test.runner.AndroidJUnitRunner"
     android:targetPackage="com.bugsnag.android">
     <meta-data
       android:name="listener"

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AnrConfigTest.kt

@@ -1,6 +1,5 @@
 package com.bugsnag.android
 
-import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Test
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataOverrideTest.kt

@@ -1,6 +1,7 @@
 package com.bugsnag.android
 
-import android.support.test.InstrumentationRegistry
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import com.bugsnag.android.BugsnagTestUtils.mapToJson
 import org.junit.Assert.assertEquals
 import org.junit.Before
@@ -26,7 +27,7 @@ class AppDataOverrideTest {
         config.appVersion = "1.2.3"
         config.releaseStage = "test-stage"
 
-        val context = InstrumentationRegistry.getContext()
+        val context = ApplicationProvider.getApplicationContext<Context>()
         val packageManager = context.packageManager
         val obj = AppData(context, packageManager, config, sessionTracker)
         this.appData = obj.appData

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataSummaryTest.java

@@ -6,7 +6,7 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -34,7 +34,7 @@ public class AppDataSummaryTest {
      */
     @Before
     public void setUp() throws Exception {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         PackageManager packageManager = context.getPackageManager();
         Configuration config = new Configuration("api-key");
         AppData obj = new AppData(context, packageManager, config, sessionTracker);

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/AppDataTest.java

@@ -10,7 +10,8 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.test.core.app.ApplicationProvider;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -43,7 +44,7 @@ public void setUp() throws Exception {
         when(sessionTracker.isInForeground()).thenReturn(true);
         when(sessionTracker.getDurationInForegroundMs(anyLong())).thenReturn(500L);
 
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         PackageManager packageManager = context.getPackageManager();
         Configuration config = new Configuration("api-key");
         AppData obj = new AppData(context, packageManager, config, sessionTracker);

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeNotifyTest.kt

@@ -2,14 +2,11 @@ package com.bugsnag.android
 
 import org.junit.Assert.assertEquals
 
-import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.filters.SmallTest
 import com.bugsnag.android.BugsnagTestUtils.generateSessionTracker
 
 import org.junit.Test
-import org.junit.runner.RunWith
 
-@RunWith(AndroidJUnit4::class)
 @SmallTest
 class BeforeNotifyTest {
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeRecordBreadcrumbsTest.java

@@ -4,19 +4,15 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import java.util.HashMap;
 
-@RunWith(AndroidJUnit4.class)
 @SmallTest
 public class BeforeRecordBreadcrumbsTest {
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BeforeSendTest.java

@@ -4,16 +4,13 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.SmallTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
-@RunWith(AndroidJUnit4.class)
 @SmallTest
 public class BeforeSendTest {
 
@@ -42,7 +39,7 @@ public void deliver(@NonNull Report report,
                 lastReport = report;
             }
         });
-        client = new Client(InstrumentationRegistry.getContext(), config);
+        client = new Client(ApplicationProvider.getApplicationContext(), config);
     }
 
     @After

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BreadcrumbsTest.kt

@@ -3,21 +3,18 @@ package com.bugsnag.android
 import com.bugsnag.android.BreadcrumbType.MANUAL
 import org.junit.Assert.assertEquals
 
-import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.filters.SmallTest
 import com.bugsnag.android.BugsnagTestUtils.*
 
 import org.json.JSONException
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 
 import java.io.IOException
 import java.util.HashMap
 import java.util.Locale
 
-@RunWith(AndroidJUnit4::class)
 @SmallTest
 class BreadcrumbsTest {
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java

@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
+import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -46,7 +46,7 @@ static SharedPreferences getSharedPrefs(Context context) {
 
     static Client generateClient(Configuration config) {
         config.setDelivery(generateDelivery());
-        return new Client(InstrumentationRegistry.getTargetContext(), config);
+        return new Client(ApplicationProvider.getApplicationContext(), config);
     }
 
     static Client generateClient() {
@@ -69,12 +69,13 @@ static SessionTracker generateSessionTracker() {
     }
 
     static Connectivity generateConnectivity() {
-        return new ConnectivityCompat(InstrumentationRegistry.getContext(), null);
+        return new ConnectivityCompat(ApplicationProvider.getApplicationContext(), null);
     }
 
     @NonNull
     static SessionStore generateSessionStore() {
-        return new SessionStore(generateConfiguration(), InstrumentationRegistry.getContext());
+        Context applicationContext = ApplicationProvider.getApplicationContext();
+        return new SessionStore(generateConfiguration(), applicationContext);
     }
 
     @SuppressWarnings("deprecation")

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/CachedThreadTest.java

@@ -5,17 +5,14 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import java.io.IOException;
 
-@RunWith(AndroidJUnit4.class)
 @SmallTest
 public class CachedThreadTest {
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientConfigTest.java

@@ -5,17 +5,14 @@
 import static org.junit.Assert.assertFalse;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
-@RunWith(AndroidJUnit4.class)
 @SmallTest
 public class ClientConfigTest {
 
@@ -28,7 +25,7 @@ public class ClientConfigTest {
      */
     @Before
     public void setUp() throws Exception {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         config = new Configuration("api-key");
         client = new Client(context, config);
     }
@@ -101,7 +98,7 @@ public void testDefaultClientDelivery() {
 
     @Test
     public void testCustomDeliveryOverride() {
-        Context context = InstrumentationRegistry.getContext();
+        Context context = ApplicationProvider.getApplicationContext();
         config = BugsnagTestUtils.generateConfiguration();
         Delivery customDelivery = new Delivery() {
             @Override

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientNotifyTest.java

@@ -2,20 +2,17 @@
 
 import static org.junit.Assert.assertEquals;
 
-import android.support.annotation.NonNull;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-@RunWith(AndroidJUnit4.class)
 @SmallTest
 public class ClientNotifyTest {
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ClientTest.java

@@ -11,20 +11,17 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import java.util.Collection;
 import java.util.Map;
 
-@RunWith(AndroidJUnit4.class)
 @SmallTest
 public class ClientTest {
 
@@ -42,7 +39,7 @@ public class ClientTest {
      */
     @Before
     public void setUp() throws Exception {
-        context = InstrumentationRegistry.getContext();
+        context = ApplicationProvider.getApplicationContext();
         clearSharedPrefs();
         config = new Configuration("api-key");
     }

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ConcurrentCallbackTest.java

@@ -1,21 +1,18 @@
 package com.bugsnag.android;
 
-import android.support.annotation.NonNull;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+import androidx.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import java.util.Collection;
 
 /**
  * Ensures that if a callback is added or removed during iteration, a
  * {@link java.util.ConcurrentModificationException} is not thrown
  */
-@RunWith(AndroidJUnit4.class)
 @SmallTest
 public class ConcurrentCallbackTest {
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java

@@ -7,17 +7,13 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import java.util.Map;
 
-@RunWith(AndroidJUnit4.class)
 @SmallTest
 public class ConfigurationTest {
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/CustomException.java

@@ -1,6 +1,6 @@
 package com.bugsnag.android;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/DeliveryCompatTest.java

@@ -5,7 +5,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.junit.After;
 import org.junit.Before;