cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [1/2] cordova-lib git commit: fixed merge conflict in package.json
Date Tue, 03 Mar 2015 08:48:15 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/CB-8551 45af7f84f -> f74768834


fixed merge conflict in package.json


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/d49159b7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/d49159b7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/d49159b7

Branch: refs/heads/CB-8551
Commit: d49159b783909bee31858eb92279253698c9ec9d
Parents: c063fde 7e225f3
Author: Steve Gill <stevengill97@gmail.com>
Authored: Tue Mar 3 00:30:24 2015 -0800
Committer: Steve Gill <stevengill97@gmail.com>
Committed: Tue Mar 3 00:41:15 2015 -0800

----------------------------------------------------------------------
 cordova-lib/.npmignore                        |  1 +
 cordova-lib/RELEASENOTES.md                   | 75 +++++++++++++++++++++-
 cordova-lib/package.json                      |  4 +-
 cordova-lib/spec-cordova/test-config.xml      |  2 +-
 cordova-lib/src/configparser/ConfigParser.js  |  5 +-
 cordova-lib/src/cordova/platform.js           |  8 +++
 cordova-lib/src/cordova/plugin.js             |  4 +-
 cordova-lib/src/hooks/HooksRunner.js          |  3 +-
 cordova-lib/src/plugman/init-defaults.js      | 19 ++++++
 cordova-lib/src/plugman/registry/registry.js  |  2 +-
 cordova-lib/src/plugman/registry/whitelist.js |  3 +-
 cordova-lib/src/util/unpack.js                | 19 ++++++
 12 files changed, 134 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d49159b7/cordova-lib/package.json
----------------------------------------------------------------------
diff --cc cordova-lib/package.json
index 4bca7d5,c61329c..b7eb682
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@@ -18,8 -18,7 +18,8 @@@
    "engineStrict": true,
    "dependencies": {
      "bplist-parser": "0.0.6",
-     "cordova-js": "3.7.3",
+     "cordova-js": "3.8.0",
 +    "cordova-registry-mapper": "0.0.2",
      "d8": "0.4.4",
      "dep-graph": "1.1.0",
      "elementtree": "0.1.5",

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d49159b7/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d49159b7/cordova-lib/src/plugman/registry/registry.js
----------------------------------------------------------------------
diff --cc cordova-lib/src/plugman/registry/registry.js
index fb574b5,680027d..743f8e8
--- a/cordova-lib/src/plugman/registry/registry.js
+++ b/cordova-lib/src/plugman/registry/registry.js
@@@ -236,14 -241,6 +236,14 @@@ function initSettings(npm) 
          userconfig: path.resolve(plugmanConfigDir, 'config'),
          'cache-min': oneDay
      });
 +
 +    // if npm is true, use npm registry. 
-     // ~/.plugman/config overides the above cofig if it exists. 
++    // ~/.plugman/config overides the above config if it exists. 
 +    // Need to reset the registry value in settings 
 +    if(npm) {
 +        settings.registry = 'http://registry.npmjs.org';
 +    }
 +
      return Q(settings);
  }
  


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message