public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-7512 Change gradle android plugins from 0.10 -> 0.12

Browse Source
This commit is contained in:
Andrew Grieve 2014-09-16 13:00:27 -04:00
parent 090822eb41
commit 00f6d30e08
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/templates/cordova/lib/build.js vendored
View File

@ -236,7 +236,7 @@ var builders = {
// Find the recently-generated output APK files
// Gradle can generate multiple output files; return all of them.
getOutputFiles: function(build_type) {
var binDir = path.join(ROOT, 'build', 'apk');
var binDir = path.join(ROOT, 'build', 'outputs', 'apk');
var candidates = find_files(binDir, function(candidate) {
// Need to choose between release and debug .apk.
if (build_type === 'debug') {

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

@ -29,7 +29,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.10.+'
classpath 'com.android.tools.build:gradle:0.12.0+'
}
}
@ -109,7 +109,7 @@ def getProjectList() {
def matcher = pattern.matcher(manifestFile.getText())
def projects = []
while (matcher.find()) {
projects.add(":" + matcher.group(2).replace("/",":"))
projects.add(":" + matcher.group(2).replace("/",":"))
}
return projects
}

2
bin/templates/project/cordova.gradle
View File

@ -116,5 +116,5 @@ String getAndroidSdkDir() {
}
cordovaSdkVersion = getProjectTarget("android-19")
cordovaBuildToolsVersion = latestBuildToolsAvailable("19.0.0")
cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")

7
framework/build.gradle
View File

@ -25,7 +25,12 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.10.+'
// This should be updated with each cordova-android release.
// It can affect things like where the .apk is generated.
// It also dictates what the minimum android build-tools version
// that you need (Set in bin/templates/project/cordova.gradle).
// Be sure to also update the value in bin/templates/project.
classpath 'com.android.tools.build:gradle:0.12.+'
}
}