github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2024-10-06 09:32:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-9479: Fixing the conditionals again, we should be more vigilant on the gradle versions.

Browse Source
This commit is contained in:
Joe Bowser 2015-12-07 15:03:02 -08:00
parent 03777067cd
commit 70bc7b39b7
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/templates/project/build.gradle
View File

@ -30,20 +30,10 @@ buildscript {
// installed version of Gradle. This dependency is documented at // installed version of Gradle. This dependency is documented at
// http://tools.android.com/tech-docs/new-build-system/version-compatibility // http://tools.android.com/tech-docs/new-build-system/version-compatibility
// and https://issues.apache.org/jira/browse/CB-8143 // and https://issues.apache.org/jira/browse/CB-8143
if (gradle.gradleVersion >= "2.2") { dependencies {
dependencies { classpath 'com.android.tools.build:gradle:1.5.0'
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+'
}
} }
} }
// Allow plugins to declare Maven dependencies via build-extras.gradle. // Allow plugins to declare Maven dependencies via build-extras.gradle.
repositories { repositories {
@ -51,7 +41,7 @@ repositories {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '2.2.1' gradleVersion = '2.8'
} }
// Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties. // Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties.

2
framework/build.gradle
View File

@ -24,7 +24,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.0.0+' classpath 'com.android.tools.build:gradle:1.5.0'
} }
} }