Update gradle dependencies and use updated Instrumentation classes.

Signed-off-by: Steven Shropshire <[email protected]>

Author: sarahkoop

DeviceAutomator/build.gradle

@@ -17,6 +17,12 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+
     lintOptions {
         warning 'InvalidPackage'
         textReport true
@@ -26,14 +32,15 @@ android {
 
 dependencies {
     api 'androidx.test.uiautomator:uiautomator:2.2.0'
-    api 'androidx.test:runner:1.2.0'
-    api 'androidx.test:rules:1.2.0'
-    api 'androidx.core:core:1.1.0'
+    api 'androidx.test:runner:1.3.0'
+    api 'androidx.test:rules:1.3.0'
+    api 'androidx.core:core:1.3.1'
+    api 'androidx.test.ext:junit:1.1.2'
 
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
 
-    testImplementation 'org.robolectric:robolectric:3.8'
-    testImplementation 'org.mockito:mockito-core:2.8.47'
+    testImplementation 'org.robolectric:robolectric:4.3'
+    testImplementation 'org.mockito:mockito-core:2.28.2'
 }
 
 /* maven deploy + signing */

DeviceAutomator/src/main/java/com/lukekorth/deviceautomator/DeviceAutomator.java

@@ -1,9 +1,12 @@
 package com.lukekorth.deviceautomator;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.RemoteException;
+
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject;
@@ -14,9 +17,7 @@
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 
-import static androidx.test.InstrumentationRegistry.getContext;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.uiautomator.Until.hasObject;
 import static junit.framework.Assert.assertTrue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -121,7 +122,7 @@ public DeviceAutomator launchApp(String packageName) {
      * @return {@link DeviceAutomator} for method chaining.
      */
     public DeviceAutomator launchApp(String packageName, long timeout) {
-        return launchApp(getContext().getPackageManager().getLaunchIntentForPackage(packageName), timeout);
+        return launchApp(getInstrumentation().getContext().getPackageManager().getLaunchIntentForPackage(packageName), timeout);
     }
 
     /**
@@ -144,7 +145,7 @@ public DeviceAutomator launchApp(Intent intent) {
     public DeviceAutomator launchApp(Intent intent, long timeout) {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                 .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        getContext().startActivity(intent);
+        getInstrumentation().getContext().startActivity(intent);
 
         mDevice.wait(hasObject(By.pkg(intent.getPackage()).depth(0)), timeout);
 
@@ -279,8 +280,9 @@ public DeviceAutomator denyRuntimePermission(String permission) {
     }
 
     private void clickPermissionDialogButton(String permission, int buttonIndex) {
+        Context targetContext = ApplicationProvider.getApplicationContext();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-                ContextCompat.checkSelfPermission(getTargetContext(), permission) != PackageManager.PERMISSION_GRANTED) {
+                ContextCompat.checkSelfPermission(targetContext, permission) != PackageManager.PERMISSION_GRANTED) {
             try {
                 UiObject allowPermissions = mDevice.findObject(new UiSelector()
                         .clickable(true)