diff options
| author | Maurice Lam <yukl@google.com> | 2017-12-13 02:51:32 +0000 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2017-12-13 02:53:52 +0000 |
| commit | 66815fe66392bcbb12e2fc93bbf326a5c2d8782f (patch) | |
| tree | 91b258e0a4efeaf259405b0960d2eff6d21e5b0a /library/self.gradle | |
| parent | 46216d0e61318e7af168e9e903ef8d943bb49b2e (diff) | |
| download | setupwizard-66815fe66392bcbb12e2fc93bbf326a5c2d8782f.tar.gz | |
Revert "Revert "Changes needed to upgrade to new gradle version""
This reverts commit 46216d0e61318e7af168e9e903ef8d943bb49b2e.
Reason for revert: Roll forward
- Added ag/3351790 to the topic
Change-Id: I64990e558d3f77165ab3fe89006a02225b712257
Diffstat (limited to 'library/self.gradle')
| -rw-r--r-- | library/self.gradle | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/library/self.gradle b/library/self.gradle index 69f9654..a3e5334 100644 --- a/library/self.gradle +++ b/library/self.gradle @@ -13,12 +13,12 @@ android.sourceSets { res.srcDirs = ['test/instrumentation/res'] dependencies { - androidTestCompile 'com.android.support.test:rules:0.5' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'junit:junit:4.+' - androidTestCompile 'org.mockito:mockito-core:1.9.5' + androidTestImplementation 'com.android.support.test:rules:0.5' + androidTestImplementation 'com.android.support.test:runner:0.5' + androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' + androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' + androidTestImplementation 'junit:junit:4.+' + androidTestImplementation 'org.mockito:mockito-core:1.9.5' } } @@ -38,12 +38,12 @@ android.sourceSets { java.srcDirs = ['test/robotest/src'] dependencies { - testCompile 'org.robolectric:robolectric:3.4.2' - testCompile 'org.robolectric:framework:3.4.2' - testCompile 'junit:junit:4.+' - testCompile 'org.mockito:mockito-core:1.9.5' + testImplementation 'org.robolectric:robolectric:3.4.2' + testImplementation 'org.robolectric:framework:3.4.2' + testImplementation 'junit:junit:4.+' + testImplementation 'org.mockito:mockito-core:1.9.5' // Workaround for https://github.com/robolectric/robolectric/issues/2566 - testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1' + testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1' } } @@ -51,6 +51,9 @@ android.sourceSets { java.srcDirs = ['gingerbread/test/robotest/src', 'recyclerview/test/robotest/src'] } } + +android.testOptions.unitTests.includeAndroidResources = true + android.defaultConfig.testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" android.lintOptions { abortOnError true |