commit 88fc88b6544fad2a112361d66b2f21b2bcea77da
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 28 20:52:56 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 28 20:52:56 2017 +0000
tree ab681b3ce94d06e9356fa307ae93c8d3b34c3f6f
parent f851da79cc455e5365ce66dbbd89d99255f7267f
parent 6fb3bf6041b20c608a0ed2e10d21ad4c6dd424c6

Merge "MediaRouter: Use correct library in testing" into oc-support-26.0-dev

buildSrc/dependencies.gradle

diff --git a/buildSrc/dependencies.gradle b/buildSrc/dependencies.gradle
index 5cf3ae6..c71f344 100644
--- a/buildSrc/dependencies.gradle
+++ b/buildSrc/dependencies.gradle
@@ -25,6 +25,7 @@
 libs.espresso_core = 'com.android.support.test.espresso:espresso-core:2.3-alpha'
 libs.espresso_contrib = 'com.android.support.test.espresso:espresso-contrib:2.3-alpha'
 libs.jacoco = 'org.jacoco:org.jacoco.core:0.7.8'
+libs.test_rules = 'com.android.support.test:rules:0.6-alpha'
 
 def androidPluginVersionOverride = System.getenv("GRADLE_PLUGIN_VERSION")
 

v7/mediarouter/build.gradle

diff --git a/v7/mediarouter/build.gradle b/v7/mediarouter/build.gradle
index 093c6c5..f971a0b 100644
--- a/v7/mediarouter/build.gradle
+++ b/v7/mediarouter/build.gradle
@@ -11,7 +11,7 @@
     androidTestCompile (libs.espresso_core) {
         exclude module: 'support-annotations'
     }
-    androidTestCompile libs.mockito_core
+    androidTestCompile libs.test_rules
 }
 
 android {