commit 97db916daf1b2b664763936a8ae26a8001331e34
author Hal Canary <halcanary@google.com> Fri Feb 15 17:02:38 2019 -0500
committer Hal Canary <halcanary@google.com> Tue Feb 19 15:41:49 2019 +0000
tree 223bc93c37069e213681e5b21a3918070957ba84
parent 14848961000e7d91e810871cf00fcf3d4920be4b

SkQP: android.support.test -> androidx.test

Change-Id: I8f9cb8130162235754ecb390d3ebbe33fc526cf6
Reviewed-on: https://skia-review.googlesource.com/c/193161
Reviewed-by: Hal Canary <halcanary@google.com>
Cherry-Pick: 2ccdd2bc1d01566210bcba5fbac2a4bf31f15845
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/193178
Reviewed-by: Derek Sollenberger <djsollen@google.com>

platform_tools/android/apps/skqp/build.gradle

diff --git a/platform_tools/android/apps/skqp/build.gradle b/platform_tools/android/apps/skqp/build.gradle
index 8d0d956..991e671 100644
--- a/platform_tools/android/apps/skqp/build.gradle
+++ b/platform_tools/android/apps/skqp/build.gradle
@@ -8,7 +8,7 @@
 
 dependencies {
     implementation 'com.android.support:design:26.+'
-    implementation 'com.android.support.test:runner:0.5'
+    implementation 'androidx.test:runner:1.1.0'
 }
 
 android {

platform_tools/android/apps/skqp/src/main/AndroidManifest.xml

diff --git a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
index 0459522..f978635 100644
--- a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
+++ b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
@@ -29,6 +29,6 @@
       </activity>
       <uses-library android:name="android.test.runner" />
   </application>
-  <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+  <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                    android:targetPackage="org.skia.skqp"></instrumentation>
 </manifest>

platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java

diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
index 7827f3e..8e360c8 100644
--- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
+++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java
@@ -10,8 +10,8 @@
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.content.res.Resources;
-import android.support.test.InstrumentationRegistry;
 import android.util.Log;
+import androidx.test.InstrumentationRegistry;
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;