You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2014/01/17 16:02:16 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-cli
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli
Conflicts:
package.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/40089a1e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/40089a1e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/40089a1e
Branch: refs/heads/master
Commit: 40089a1e25fbe4c0825344cb14dbc1fc9af600a8
Parents: 293e281 d3bb7d9
Author: Braden Shepherdson <br...@gmail.com>
Authored: Thu Jan 16 17:43:27 2014 -0500
Committer: Braden Shepherdson <br...@gmail.com>
Committed: Thu Jan 16 17:43:27 2014 -0500
----------------------------------------------------------------------
.npmignore | 3 +-
README.md | 18 +++---
RELEASENOTES.md | 13 +++++
cordova.js | 8 ++-
e2e/create.spec.js | 18 +-----
e2e/hooker.spec.js | 6 +-
e2e/platform.spec.js | 4 +-
package.json | 25 +++------
spec/cli.spec.js | 2 +-
spec/create.spec.js | 56 ++-----------------
spec/lazy_load.spec.js | 11 ++--
spec/metadata/blackberry_parser.spec.js | 1 -
spec/metadata/ios_parser.spec.js | 2 +-
spec/platform.spec.js | 5 +-
spec/serve.spec.js | 1 -
spec/util.spec.js | 21 +++++--
src/cli.js | 11 ++--
src/config.js | 74 ++++++++++++++-----------
src/create.js | 40 ++------------
src/hooker.js | 27 +++++----
src/lazy_load.js | 32 +++++------
src/metadata/ios_parser.js | 2 +-
src/platform.js | 16 +++++-
src/plugin.js | 41 +++++++++-----
src/prepare.js | 3 -
src/ripple.js | 52 -----------------
src/util.js | 38 +++++++++----
templates/hooks-README.md | 83 ++++++++++++++++++++++++++++
28 files changed, 317 insertions(+), 296 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/40089a1e/package.json
----------------------------------------------------------------------
diff --cc package.json
index de0d033,f02a548..57bb2e3
--- a/package.json
+++ b/package.json
@@@ -28,28 -28,19 +28,19 @@@
"cli"
],
"dependencies": {
- "colors": ">=0.6.0",
"elementtree": "0.1.5",
- "plugman": "0.17.x",
- "plist": "0.4.x",
+ "plugman": "0.18.0",
+ "plist-with-patches": "0.5.x",
- "xcode": "0.6.5",
+ "xcode": "0.6.6",
- "express": "3.0.0",
- "shelljs": "0.1.2",
- "ncallbacks": "1.0.0",
- "request": "2.22.0",
- "ripple-emulator": "0.9.18",
- "semver": "1.1.0",
- "glob": "3.2.x",
- "follow-redirects": "0.0.x",
- "prompt": "0.2.7",
+ "shelljs": "0.1.x",
+ "request": "~2.21.0",
+ "semver": "2.0.x",
"tar": "0.1.x",
- "open": "0.0.3",
- "npm": "1.3.x",
+ "npmconf": "0.1.x",
"q": "~0.9",
"optimist": "0.6.0",
- "jshint": "~1.1.0",
"mime": "~1.2.11",
- "lodash": "~2.4.0"
+ "underscore":"1.4.4"
},
"devDependencies": {
"jasmine-node": "1.8.x"