From 930833627fcc9fe9e3fb50dc5afda48002a109a0 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 3 Jul 2018 10:11:53 -0700
Subject: [PATCH] Use androidx test runner in gradle configuration

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=203141421
---
 constants.gradle          | 2 +-
 library/core/build.gradle | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/constants.gradle b/constants.gradle
index 5544173a3c..bbe1b7ff3f 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -33,7 +33,7 @@ project.ext {
     robolectricVersion = '3.7.1'
     autoValueVersion = '1.6'
     checkerframeworkVersion = '2.5.0'
-    testRunnerVersion = '1.0.2'
+    testRunnerVersion = '1.1.0-alpha3'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/library/core/build.gradle b/library/core/build.gradle
index d4d3692dfc..947972392f 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -64,16 +64,15 @@ dependencies {
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion
     androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion
-    androidTestImplementation 'com.android.support.test:runner:' + testRunnerVersion
-    androidTestUtil 'com.android.support.test:orchestrator:' + testRunnerVersion
+    androidTestImplementation 'androidx.test:runner:' + testRunnerVersion
+    androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
+    androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
     testImplementation 'com.google.truth:truth:' + truthVersion
     testImplementation 'junit:junit:' + junitVersion
     testImplementation 'org.mockito:mockito-core:' + mockitoVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
     testAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
-    androidTestImplementation 'com.google.auto.value:auto-value-annotations:' + autoValueVersion
-    androidTestAnnotationProcessor 'com.google.auto.value:auto-value:' + autoValueVersion
 }
 
 ext {