summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2017-12-21 19:12:31 -0800
committerMaurice Lam <yukl@google.com>2017-12-22 14:40:31 -0800
commit9cd96c1c7b8ce846e1ba515ba98eb5548066b30b (patch)
tree329bf356d05e7bc2918771b34a9502387eb21e01
parent5153bc0ae2fbe31e66a83cd014df0e7f7a7b436f (diff)
downloadsetupwizard-9cd96c1c7b8ce846e1ba515ba98eb5548066b30b.tar.gz
Upgrade to new version of support-test libs
The new libraries fixes bugs with UiThreadTest, and also is also able to run Parameterized tests on continuous infrastructure. Test: Run forrest command (go/paste/5209188573642752) Bug: 70986599 Bug: 70986575 Change-Id: Idbb4513cfb7cb518d59c5c2c15c30230618c384d
-rw-r--r--library/self.gradle4
-rw-r--r--library/test/instrumentation/AndroidManifest.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/library/self.gradle b/library/self.gradle
index f455952..8a225c8 100644
--- a/library/self.gradle
+++ b/library/self.gradle
@@ -13,8 +13,8 @@ android.sourceSets {
res.srcDirs = ['test/instrumentation/res']
dependencies {
- androidTestImplementation 'com.android.support.test:rules:0.5'
- androidTestImplementation 'com.android.support.test:runner:0.5'
+ androidTestImplementation 'com.android.support.test:rules:1.0.0'
+ androidTestImplementation 'com.android.support.test:runner:1.0.0'
androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
androidTestImplementation 'junit:junit:4.+'
diff --git a/library/test/instrumentation/AndroidManifest.xml b/library/test/instrumentation/AndroidManifest.xml
index 44d923f..0cbc9c1 100644
--- a/library/test/instrumentation/AndroidManifest.xml
+++ b/library/test/instrumentation/AndroidManifest.xml
@@ -19,7 +19,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.android.setupwizardlib.test">
- <uses-sdk tools:overrideLibrary="android.support.test,android.app,android.support.test.rule" />
+ <uses-sdk tools:overrideLibrary="android.support.test.rules,android.support.test.runner" />
<application>
<activity android:name=".util.DrawingTestActivity" />