diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-10 13:20:03 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-02-10 13:24:37 +0000 |
| commit | df1e6ab408c12b3254ffa8f4b706c9ee99d61bf1 (patch) | |
| tree | 25951f62aa5f6dd5a6a0dfd6599225e909cc42a0 /build.gradle | |
| parent | f30738e41ac44c2db3552798392d7f2db04b3451 (diff) | |
| parent | 6c78e499ac77a4e62ff5092c039f403d6685aae5 (diff) | |
| download | volley-df1e6ab408c12b3254ffa8f4b706c9ee99d61bf1.tar.gz | |
resolved conflicts for merge of 6c78e499 to master
Change-Id: If2a1d6d8b7be71f450310ffa3c0cc9b35b563a02
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/build.gradle b/build.gradle index ab168af..c250dbf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,16 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.8.+' + } +} + apply plugin: 'android-library' android { - compileSdkVersion 17 + compileSdkVersion 19 buildToolsVersion = '19.0.1' sourceSets { @@ -20,12 +29,8 @@ android { } - instrumentTest { - assets.srcDirs = ["tests/assets"] - res.srcDirs = ["tests/res"] - resources.srcDirs = ["tests/src"] - java.srcDirs = ["tests/src"] - } + instrumentTest.setRoot('tests') + instrumentTest.java.srcDirs = ['tests/src'] } lintOptions { // TODO: fix errors and reenable. |