mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 17:32:51 +08:00
CB-7512 Change gradle android plugins from 0.10 -> 0.12
This commit is contained in:
parent
090822eb41
commit
00f6d30e08
2
bin/templates/cordova/lib/build.js
vendored
2
bin/templates/cordova/lib/build.js
vendored
@ -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') {
|
||||
|
@ -29,7 +29,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:0.10.+'
|
||||
classpath 'com.android.tools.build:gradle:0.12.0+'
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -116,5 +116,5 @@ String getAndroidSdkDir() {
|
||||
}
|
||||
|
||||
cordovaSdkVersion = getProjectTarget("android-19")
|
||||
cordovaBuildToolsVersion = latestBuildToolsAvailable("19.0.0")
|
||||
cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")
|
||||
|
||||
|
@ -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.+'
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user