Merge branch 'master' into 4.0.x (gradle version for Android Studio)

This commit is contained in:
Andrew Grieve 2014-12-22 11:25:59 -05:00
commit 20cd4f806a

View File

@ -35,7 +35,11 @@ buildscript {
// installed version of Gradle. This dependency is documented at
// http://tools.android.com/tech-docs/new-build-system/version-compatibility
// and https://issues.apache.org/jira/browse/CB-8143
if (gradle.gradleVersion >= "2.1") {
if (gradle.gradleVersion >= "2.2") {
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0+'
}
} else if (gradle.gradleVersion >= "2.1") {
dependencies {
classpath 'com.android.tools.build:gradle:0.14.0+'
}