Updated Branches: refs/heads/master2 7ddd05ff2 -> 5f841a8d8
2.9.1. [CB-4073] Qualified express dependency with minor version. [CB-4058] Removed ripple emulator as dependency until windows issues can be resolved. Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/5f841a8d Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/5f841a8d Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/5f841a8d Branch: refs/heads/master2 Commit: 5f841a8d8d44f90621e6222dd4eabb886193586b Parents: 7ddd05f Author: Fil Maj <[email protected]> Authored: Wed Jul 3 11:38:19 2013 -0700 Committer: Fil Maj <[email protected]> Committed: Wed Jul 3 11:38:19 2013 -0700 ---------------------------------------------------------------------- bin/cordova | 5 ++++- cordova.js | 1 - package.json | 7 +++---- src/plugin.js | 4 ++-- src/ripple.js | 1 - 5 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5f841a8d/bin/cordova ---------------------------------------------------------------------- diff --git a/bin/cordova b/bin/cordova index fc7fbb4..d42ed91 100755 --- a/bin/cordova +++ b/bin/cordova @@ -1,6 +1,7 @@ #!/usr/bin/env node var tokens = process.argv.slice(2, process.argv.length), - cordova= require('../cordova'); + cordova= require('../cordova'), + plugman= require('plugman'); var cmd, version = false, verbose = false, current; @@ -27,6 +28,8 @@ cordova.on('results', console.log); if (verbose) { cordova.on('log', console.log); cordova.on('warn', console.warn); + plugman.on('log', console.log); + plugman.on('warn', console.warn); } if (version) { http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5f841a8d/cordova.js ---------------------------------------------------------------------- diff --git a/cordova.js b/cordova.js index 94d5aec..1efeecf 100644 --- a/cordova.js +++ b/cordova.js @@ -47,7 +47,6 @@ module.exports = { plugin: require('./src/plugin'), plugins: require('./src/plugin'), serve: require('./src/serve'), - ripple: require('./src/ripple'), on: function() { cordova_events.on.apply(cordova_events, arguments); }, http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5f841a8d/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index 663835b..253f9d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cordova", - "version": "2.9.0", + "version": "2.9.1", "preferGlobal": "true", "description": "Cordova command line interface tool", "main": "cordova", @@ -30,10 +30,10 @@ "dependencies": { "colors":">=0.6.0", "elementtree":"0.1.3", - "plugman":"0.7.14", + "plugman":"0.8.2", "plist":"0.4.x", "xcode":"0.5.1", - "express":"3.0", + "express":"3.0.0", "shelljs":"0.1.2", "ncallbacks":"1.0.0", "request":"2.12.x", @@ -42,7 +42,6 @@ "follow-redirects":"0.0.x", "prompt":"0.2.7", "tar":"0.1.x", - "ripple-emulator":">=0.9.15", "open": "0.0.3" }, "devDependencies": { http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5f841a8d/src/plugin.js ---------------------------------------------------------------------- diff --git a/src/plugin.js b/src/plugin.js index a3f5478..ca43e35 100644 --- a/src/plugin.js +++ b/src/plugin.js @@ -24,8 +24,8 @@ var cordova_util = require('./util'), platforms = require('../platforms'), n = require('ncallbacks'), hooker = require('./hooker'), - events = require('./events'), - plugman = require('plugman'); + plugman = require('plugman'), + events = require('./events'); module.exports = function plugin(command, targets, callback) { var projectRoot = cordova_util.isCordova(process.cwd()); http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/5f841a8d/src/ripple.js ---------------------------------------------------------------------- diff --git a/src/ripple.js b/src/ripple.js index ddbf297..9be7752 100644 --- a/src/ripple.js +++ b/src/ripple.js @@ -1,4 +1,3 @@ - /** Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
