Skip to content

Commit

Permalink
CB-9479: Fixing the conditionals again, we should be more vigilant on…
Browse files Browse the repository at this point in the history
… the gradle versions.
  • Loading branch information
infil00p committed Dec 7, 2015
1 parent 0377706 commit 70bc7b3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
18 changes: 4 additions & 14 deletions bin/templates/project/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,18 @@ 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.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+'
}
} else {
dependencies {
classpath 'com.android.tools.build:gradle:0.12.0+'
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
}
}
}

// Allow plugins to declare Maven dependencies via build-extras.gradle.
repositories {
mavenCentral()
}

task wrapper(type: Wrapper) {
gradleVersion = '2.2.1'
gradleVersion = '2.8'
}

// Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties.
Expand Down
2 changes: 1 addition & 1 deletion framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.0.0+'
classpath 'com.android.tools.build:gradle:1.5.0'
}

}
Expand Down

0 comments on commit 70bc7b3

Please sign in to comment.