summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Bendowski <bendowski@google.com>2015-09-22 20:03:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-22 20:03:53 +0000
commit0d6df2e677af2004794528c61957d53d13fc4c9e (patch)
tree5b4ff07b0bcb99ab2952c8fad96507bcc8d79807
parentee7e2ce57021d57dde6887a751bf3dc3f2ab03eb (diff)
parentc987cda8e1307eb292e48f30256e4161c9eb04f4 (diff)
downloadvolley-0d6df2e677af2004794528c61957d53d13fc4c9e.tar.gz
am c987cda8: am 60e68e02: am 6a5192be: Merge "Retry: Specify test dependecies in rules.gradle"
* commit 'c987cda8e1307eb292e48f30256e4161c9eb04f4': Retry: Specify test dependecies in rules.gradle
-rw-r--r--build.gradle6
-rw-r--r--rules.gradle9
2 files changed, 14 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle
index 83acd6d..9f973c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,12 +19,16 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.2.3'
+ classpath 'com.android.tools.build:gradle:1.3.1'
}
}
apply plugin: 'com.android.library'
+repositories {
+ jcenter()
+}
+
android {
compileSdkVersion 22
buildToolsVersion = '22.0.1'
diff --git a/rules.gradle b/rules.gradle
index 40508d0..04dd681 100644
--- a/rules.gradle
+++ b/rules.gradle
@@ -1,3 +1,12 @@
// See build.gradle for an explanation of what this file is.
apply plugin: 'com.android.library'
+
+// 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 "org.robolectric:robolectric:3.0"
+ }
+}