diff options
| author | Colin Cross <ccross@android.com> | 2017-12-13 02:48:52 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-12-13 02:48:52 +0000 |
| commit | 46216d0e61318e7af168e9e903ef8d943bb49b2e (patch) | |
| tree | 0a3c2652a2f4641674611a17c5426f8b56ba21f3 /library/self.gradle | |
| parent | ba1332d1b4dd525a2ef313246482708cb2016052 (diff) | |
| download | setupwizard-46216d0e61318e7af168e9e903ef8d943bb49b2e.tar.gz | |
Revert "Changes needed to upgrade to new gradle version"
This reverts commit ba1332d1b4dd525a2ef313246482708cb2016052.
Reason for revert: Broke taimen builds in master
Change-Id: Iffffadbacae8c6c69907dcecc447f958cf6ce909
Diffstat (limited to 'library/self.gradle')
| -rw-r--r-- | library/self.gradle | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/library/self.gradle b/library/self.gradle index a3e5334..69f9654 100644 --- a/library/self.gradle +++ b/library/self.gradle @@ -13,12 +13,12 @@ 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.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' + 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' } } @@ -38,12 +38,12 @@ android.sourceSets { java.srcDirs = ['test/robotest/src'] dependencies { - 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' + 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' // Workaround for https://github.com/robolectric/robolectric/issues/2566 - testImplementation 'org.khronos:opengl-api:gl1.1-android-2.1_r1' + testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1' } } @@ -51,9 +51,6 @@ 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 |