diff --git a/api/build.gradle b/api/build.gradle index f1a45a56e..4b6f18c1c 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -1,12 +1,3 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' - } -} - apply plugin: 'com.android.library' repositories { @@ -32,13 +23,11 @@ android { } dependencies { - provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1' - compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.1' + provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2' + compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.2' compile group: 'com.android.support', name: 'support-v4', version: '19.1.+' compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7' - compile group: 'com.github.tony19', name: 'logback-android-core', version: '1.1.1-2' - compile group: 'com.github.tony19', name: 'logback-android-classic', version: '1.1.1-2' compile group: 'joda-time', name: 'joda-time', version: '2.3', transitive: false } diff --git a/astrid/build.gradle b/astrid/build.gradle index 1937f1c49..52787dde9 100644 --- a/astrid/build.gradle +++ b/astrid/build.gradle @@ -1,12 +1,3 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' - } -} - apply plugin: 'com.android.application' repositories { @@ -66,7 +57,7 @@ android.applicationVariants.all { variant -> } dependencies { - provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1' + provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2' compile group: 'com.android.support', name: 'appcompat-v7', version: '19.1.+' @@ -77,10 +68,18 @@ dependencies { compile group: 'com.rubiconproject.oss', name: 'jchronic', version: '0.2.6', transitive: false compile group: 'org.scala-saddle', name: 'google-rfc-2445', version: '20110304', transitive: false - compile group: 'com.google.apis', name: 'google-api-services-tasks', version: 'v1-rev33-1.18.0-rc' - compile group: 'com.google.api-client', name: 'google-api-client-android', version: '1.18.0-rc' - compile group: 'com.google.http-client', name: 'google-http-client-android', version: '1.18.0-rc' - compile group: 'com.google.http-client', name: 'google-http-client-gson', version: '1.18.0-rc' + compile(group: 'com.google.apis', name: 'google-api-services-tasks', version: 'v1-rev33-1.18.0-rc') { + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } + compile(group: 'com.google.api-client', name: 'google-api-client-android', version: '1.18.0-rc') { + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } + compile(group: 'com.google.http-client', name: 'google-http-client-gson', version: '1.18.0-rc') { + exclude group: 'org.apache.httpcomponents', module: 'httpclient' + } + + compile group: 'com.github.tony19', name: 'logback-android-classic', version: '1.1.1-2' + apk group: 'com.github.tony19', name: 'logback-android-core', version: '1.1.1-2' androidTestCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5', transitive: false androidTestCompile group: 'com.google.dexmaker', name: 'dexmaker', version: '1.1' diff --git a/build.gradle b/build.gradle index f32b4df70..a99e52675 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,13 @@ task wrapper(type: Wrapper) { gradleVersion = '1.12' } + +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.12.+' + } +}