Repository: cordova-android Updated Branches: refs/heads/4.0.x 12bf07d56 -> b1bdf23d9
Switch default build type to gradle (4.0.x only) Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b1bdf23d Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b1bdf23d Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b1bdf23d Branch: refs/heads/4.0.x Commit: b1bdf23d9ce86fb5c8a9c8c28651a70bf9ff4d73 Parents: 12bf07d Author: Andrew Grieve <[email protected]> Authored: Wed Dec 3 10:12:31 2014 -0500 Committer: Andrew Grieve <[email protected]> Committed: Wed Dec 3 10:12:31 2014 -0500 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 2 +- framework/src/org/apache/cordova/CordovaActivity.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b1bdf23d/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 85a6e7c..54703ef 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -320,7 +320,7 @@ function parseOpts(options, resolvedTarget) { var ret = { buildType: 'debug', - buildMethod: process.env['ANDROID_BUILD'] || 'ant', + buildMethod: process.env['ANDROID_BUILD'] || 'gradle', arch: null }; http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b1bdf23d/framework/src/org/apache/cordova/CordovaActivity.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java index 5561c02..b993f37 100755 --- a/framework/src/org/apache/cordova/CordovaActivity.java +++ b/framework/src/org/apache/cordova/CordovaActivity.java @@ -21,6 +21,7 @@ package org.apache.cordova; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; +import java.util.Locale; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
