diff options
Diffstat (limited to 'app/build.gradle')
-rw-r--r-- | app/build.gradle | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/build.gradle b/app/build.gradle index 1295a81dc..2e4b1da7d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ dependencies { compile 'com.android.support:support-v4:20.0.0' compile 'com.android.support:appcompat-v7:20.0.0' compile 'org.apache.commons:commons-lang3:3.3.2' - compile ('org.shredzone.flattr4j:flattr4j-core:2.10') { + compile('org.shredzone.flattr4j:flattr4j-core:2.10') { exclude group: 'org.apache.httpcomponents', module: 'httpcore' exclude group: 'org.apache.httpcomponents', module: 'httpclient' exclude group: 'org.json', module: 'json' @@ -23,9 +23,8 @@ dependencies { compile 'commons-io:commons-io:2.4' compile 'com.nineoldandroids:library:2.4.0' compile project('dslv:library') - compile 'com.jayway.android.robotium:robotium-solo:5.2.1' - compile ("com.doomonafireball.betterpickers:library:1.5.2") { + compile('com.doomonafireball.betterpickers:library:1.5.2') { exclude group: 'com.android.support', module: 'support-v4' } compile 'org.jsoup:jsoup:1.7.3' @@ -33,6 +32,7 @@ dependencies { compile 'com.squareup.okhttp:okhttp:2.0.0' compile 'com.squareup.okhttp:okhttp-urlconnection:2.0.0' compile 'com.squareup.okio:okio:1.0.0' + compile project(':core') } android { |