You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/11/12 01:38:48 UTC
[1/2] android commit: CB-5349: fixed regression in update script
Updated Branches:
refs/heads/3.2.x fce9be7b0 -> 1febd0259
CB-5349: fixed regression in update script
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/499efecd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/499efecd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/499efecd
Branch: refs/heads/3.2.x
Commit: 499efecd7f157822c0f631f4557db36641f4e2ce
Parents: fb3fb41
Author: Steven Gill <st...@gmail.com>
Authored: Mon Nov 11 16:32:34 2013 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Nov 11 16:36:24 2013 -0800
----------------------------------------------------------------------
bin/lib/create.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/499efecd/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 7b015ac..c569669 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -181,10 +181,10 @@ exports.createProject = function(project_path, package_name, project_name, proje
// Returns a promise.
exports.updateProject = function(projectPath) {
+ var version = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim();
// Check that requirements are met and proper targets are installed
return check_reqs.run()
.then(function() {
- var version = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim();
var target_api = check_reqs.get_target();
return ensureJarIsBuilt(version, target_api);
}).then(function() {
[2/2] android commit: Merge branch '3.2.x' of
https://git-wip-us.apache.org/repos/asf/cordova-android into 3.2.x
Posted by st...@apache.org.
Merge branch '3.2.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 3.2.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/1febd025
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/1febd025
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/1febd025
Branch: refs/heads/3.2.x
Commit: 1febd02592a527bc014a10763ada68e25ddf6284
Parents: 499efec fce9be7
Author: Steven Gill <st...@gmail.com>
Authored: Mon Nov 11 16:38:05 2013 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Nov 11 16:38:05 2013 -0800
----------------------------------------------------------------------
test/proguard.cfg | 17 +++++++++++++++++
test/res/values/strings.xml | 18 ++++++++++++++++++
2 files changed, 35 insertions(+)
----------------------------------------------------------------------