You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/09/16 19:04:13 UTC
[3/5] android commit: CB-7512 Change gradle android plugins from 0.10
-> 0.12
CB-7512 Change gradle android plugins from 0.10 -> 0.12
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/00f6d30e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/00f6d30e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/00f6d30e
Branch: refs/heads/4.0.x
Commit: 00f6d30e081c6a81ad0fb2aeb437f3840a73f39c
Parents: 090822e
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 16 13:00:27 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 16 13:00:27 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 2 +-
bin/templates/project/build.gradle | 4 ++--
bin/templates/project/cordova.gradle | 2 +-
framework/build.gradle | 7 ++++++-
4 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/00f6d30e/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index df2448c..585b7af 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -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') {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/00f6d30e/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index e3468d8..e76634f 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -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
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/00f6d30e/bin/templates/project/cordova.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index 6c7d0ab..ba73c93 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -116,5 +116,5 @@ String getAndroidSdkDir() {
}
cordovaSdkVersion = getProjectTarget("android-19")
-cordovaBuildToolsVersion = latestBuildToolsAvailable("19.0.0")
+cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/00f6d30e/framework/build.gradle
----------------------------------------------------------------------
diff --git a/framework/build.gradle b/framework/build.gradle
index 59e1ae7..6ca284d 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -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.+'
}
}