diff options
| author | Nick Korostelev <nkorsote@google.com> | 2014-07-14 16:44:39 -0700 |
|---|---|---|
| committer | Nick Korostelev <nkorsote@google.com> | 2014-07-14 16:47:43 -0700 |
| commit | 8e713340c732b1b0c7b6712578dd8462ad2d1002 (patch) | |
| tree | 310684e01bdb9f86961b3e5efc850ff0282ada06 /build.gradle | |
| parent | 191f8c8707a105d683fa0fa3ff6f645633f1d463 (diff) | |
| download | junit-8e713340c732b1b0c7b6712578dd8462ad2d1002.tar.gz | |
Switched gradle Hamcrest dependency to use prebuilts version
to allow Gradle resolve conflicting dependencies and avoid multi dex errors.
Change-Id: I4a5c7f19d2d7c1707c186579abdd303d9e715f94
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index 6e0a62e..9ed97d0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,9 @@ apply plugin: 'java' +repositories { + maven { url '../../prebuilts/tools/common/m2/repository' } +} + configurations { // similar to 'default', export compile-time dependencies host.extendsFrom(hostCompile) @@ -32,9 +36,9 @@ sourceSets { dependencies { targetCompile getAndroidPrebuilt('4') - targetCompile project(':hamcrest') + targetCompile 'org.hamcrest:hamcrest-core:1.1' - hostCompile project(':hamcrest') + hostCompile 'org.hamcrest:hamcrest-core:1.1' } task targetJar(type: Jar) { |