aboutsummaryrefslogtreecommitdiff
path: root/rules.gradle
diff options
context:
space:
mode:
authorAnonymous <no-reply@google.com>2017-08-08 12:42:44 -0700
committerJeff Davidson <jpd@google.com>2017-08-08 12:51:12 -0700
commitcc4c86984e7c6d0de90ea4362506fc5ca857bc68 (patch)
tree840682988d908a367eadc4d2231bde1e43134333 /rules.gradle
parent3a1232594eb627e9e59b22406816648a55a3f2ae (diff)
downloadvolley-cc4c86984e7c6d0de90ea4362506fc5ca857bc68.tar.gz
Import of Volley from GitHub to AOSP. - 27f4207774f7a0b59168f5b3b53d8c0c3841de64 Merge pull request #71 from google/fix-visibility by Jeff Davidson <jpd236@cornell.edu>android-o-iot-preview-5o-iot-preview-5
- e1d75bc49fff2f43b4304688f22ccb57f0c2782c Merge pull request #66 from joebowbeer/dbc_overflow by Jeff Davidson <jpd236@cornell.edu> - d40b75f52f0f8e3467d63294142610a040ff8cd5 Merge pull request #64 from xyhuangjinfu/master by Jeff Davidson <jpd236@cornell.edu> - aafd2e5d1279d68cd2c39b02a915e501974daf2f Merge pull request #52 from joebowbeer/dbc by Jeff Davidson <jpd236@cornell.edu> - baefc4e4f7ad42ce84972716486928ab77b413fc Merge pull request #23 from google/javadoc-fixes by Jeff Davidson <jpd236@cornell.edu> - dea97629925acea8942c06a7ff52938eba5dc78c Merge pull request #39 from google/publish by Jeff Davidson <jpd236@cornell.edu> - f52e1e0d4a18c8e3e7004a3d60c8cbec9a04f3d4 Merge pull request #38 from SamuelYvon/master by Jeff Davidson <jpd236@cornell.edu> - f0ab9a527d3a525325139026a7da0318b506abb4 Merge pull request #41 from LappleApple/patch-1 by Jeff Davidson <jpd236@cornell.edu> - a444f81d099179ab7c5fa5f460262a206125cd37 Merge pull request #18 from Ericliu001/master by Jeff Davidson <jpd236@cornell.edu> GitOrigin-RevId: 27f4207774f7a0b59168f5b3b53d8c0c3841de64 Change-Id: Idf47e2b8caff4c0d4a3f00a5d8c22878e36c59ba
Diffstat (limited to 'rules.gradle')
-rw-r--r--rules.gradle14
1 files changed, 3 insertions, 11 deletions
diff --git a/rules.gradle b/rules.gradle
index c7c0f70..af81ac2 100644
--- a/rules.gradle
+++ b/rules.gradle
@@ -14,17 +14,9 @@ android {
// Check if the android plugin version supports unit testing.
if (configurations.findByName("testCompile")) {
dependencies {
- testCompile "junit:junit:4.10"
- testCompile "org.mockito:mockito-core:1.9.5"
+ testCompile "junit:junit:4.12"
+ testCompile "org.hamcrest:hamcrest-library:1.3"
+ testCompile "org.mockito:mockito-core:2.2.29"
testCompile "org.robolectric:robolectric:3.0"
}
}
-
-// TODO(#4): Remove this once Javadoc errors are fixed
-if (JavaVersion.current().isJava8Compatible()) {
- allprojects {
- tasks.withType(Javadoc) {
- options.addStringOption('Xdoclint:none', '-quiet')
- }
- }
-}