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 2015/03/03 09:30:58 UTC

[01/11] cordova-lib git commit: added license headers

Repository: cordova-lib
Updated Branches:
  refs/heads/CB-8551 c063fdec7 -> 45af7f84f


added license headers


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

Branch: refs/heads/CB-8551
Commit: e4d0f097c0ac4603f9bb39b39d3ebe350a449c9a
Parents: 608977d
Author: Steve Gill <st...@gmail.com>
Authored: Fri Feb 27 11:03:34 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Feb 27 11:03:34 2015 -0800

----------------------------------------------------------------------
 cordova-lib/src/plugman/init-defaults.js | 19 +++++++++++++++++++
 cordova-lib/src/util/unpack.js           | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e4d0f097/cordova-lib/src/plugman/init-defaults.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/init-defaults.js b/cordova-lib/src/plugman/init-defaults.js
index 5e03349..493d094 100644
--- a/cordova-lib/src/plugman/init-defaults.js
+++ b/cordova-lib/src/plugman/init-defaults.js
@@ -1,3 +1,22 @@
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+ 
+    http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+ **/
+
 /* global dirname */
 /* global config */
 /* global package */

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e4d0f097/cordova-lib/src/util/unpack.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/util/unpack.js b/cordova-lib/src/util/unpack.js
index 33fc564..aea29cb 100644
--- a/cordova-lib/src/util/unpack.js
+++ b/cordova-lib/src/util/unpack.js
@@ -1,3 +1,22 @@
+/**
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
 // commands for packing and unpacking tarballs
 // this file is used by lib/cache.js
 


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


[06/11] cordova-lib git commit: CB-7827 Add support for `android-activityName` within `config.xml` (close #171)

Posted by st...@apache.org.
CB-7827 Add support for `android-activityName` within `config.xml` (close #171)

Requires cordova-android@4.0.0


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

Branch: refs/heads/CB-8551
Commit: 264f5e8c5761478406dd4f171fa71ac8fafdb3f9
Parents: 96595cf
Author: Connor Pearson <cj...@gmail.com>
Authored: Sun Feb 22 15:46:23 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 2 10:02:25 2015 -0500

----------------------------------------------------------------------
 cordova-lib/src/configparser/ConfigParser.js | 3 +++
 cordova-lib/src/cordova/platform.js          | 8 ++++++++
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/264f5e8c/cordova-lib/src/configparser/ConfigParser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/configparser/ConfigParser.js b/cordova-lib/src/configparser/ConfigParser.js
index fafc76f..213432f 100644
--- a/cordova-lib/src/configparser/ConfigParser.js
+++ b/cordova-lib/src/configparser/ConfigParser.js
@@ -108,6 +108,9 @@ ConfigParser.prototype = {
     android_packageName: function() {
         return this.doc.getroot().attrib['android-packageName'];
     },
+    android_activityName: function() {
+	return this.doc.getroot().attrib['android-activityName'];
+    },
     ios_CFBundleIdentifier: function() {
         return this.doc.getroot().attrib['ios-CFBundleIdentifier'];
     },

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/264f5e8c/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index a7bd1e4..c599734 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -532,12 +532,20 @@ function getCreateArgs(platDetails, projectRoot, cfg, template_dir, opts) {
     // We need to normalize the name to NFD form since iOS uses NFD unicode form
     var name = platDetails.platform == 'ios' ? unorm.nfd(cfg.name()) : cfg.name();
     args.push(output, pkg, name);
+
+    var activityName = cfg.android_activityName();
+    if (activityName && platDetails.platform === 'android' && semver.gte(platDetails.version, '4.0.0-dev')) {
+        activityName = activityName.replace(/\W/g, '');
+        args.push('--activity-name', activityName);
+    }
+
     if (template_dir) {
         args.push(template_dir);
     }
     if (opts.link) {
         args.push('--link');
     }
+
     return args;
 }
 


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


[05/11] cordova-lib git commit: Add org.apache.cordova.test-framework to plugman publish whitelist

Posted by st...@apache.org.
Add org.apache.cordova.test-framework to plugman publish whitelist


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

Branch: refs/heads/CB-8551
Commit: 96595cff2cc771bd44e9e999d52fa7f6dfa7ef6c
Parents: 4c0fec7
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Feb 17 21:20:08 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 2 09:58:42 2015 -0500

----------------------------------------------------------------------
 cordova-lib/src/plugman/registry/whitelist.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/96595cff/cordova-lib/src/plugman/registry/whitelist.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/registry/whitelist.js b/cordova-lib/src/plugman/registry/whitelist.js
index 57c5587..bbd39ff 100644
--- a/cordova-lib/src/plugman/registry/whitelist.js
+++ b/cordova-lib/src/plugman/registry/whitelist.js
@@ -36,5 +36,6 @@ module.exports = [
     'org.apache.cordova.camera',
     'org.apache.cordova.device-motion',
     'org.apache.cordova.battery-status',
-    'org.apache.cordova.statusbar'
+    'org.apache.cordova.statusbar',
+    'org.apache.cordova.test-framework'
 ];


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


[07/11] cordova-lib git commit: Close pull requests: close #147, close #141, close #161

Posted by st...@apache.org.
Close pull requests: close #147, close #141, close #161


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

Branch: refs/heads/CB-8551
Commit: 473cef959531913a6173dbd41d8253595df6ef1d
Parents: 264f5e8
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Mar 2 10:05:38 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 2 10:05:38 2015 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



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


[03/11] cordova-lib git commit: CB-8555 Incremented package version to -dev

Posted by st...@apache.org.
CB-8555 Incremented package version to -dev


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

Branch: refs/heads/CB-8551
Commit: 0c74228c93cf6405962345da04e3d5db88b94878
Parents: c4fbb6a
Author: Steve Gill <st...@gmail.com>
Authored: Fri Feb 27 13:06:47 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Feb 27 13:06:47 2015 -0800

----------------------------------------------------------------------
 cordova-lib/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/0c74228c/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index d1dc02d..c61329c 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -2,7 +2,7 @@
   "author": "Apache Software Foundation",
   "name": "cordova-lib",
   "description": "Apache Cordova tools core lib and API",
-  "version": "4.3.0",
+  "version": "4.3.1-dev",
   "repository": {
     "type": "git",
     "url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git"


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


[04/11] cordova-lib git commit: CB-8577 - Read plugin variables from correct tag

Posted by st...@apache.org.
CB-8577 - Read plugin variables from correct tag

Reads the plugin variables from param, instead of the erroneous variable tag

github: close #174


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

Branch: refs/heads/CB-8551
Commit: 4c0fec7d30df238cfc4c834a4235b2c8fcf330ad
Parents: 0c74228
Author: Gorkem Ercan <go...@gmail.com>
Authored: Sun Mar 1 19:28:31 2015 -0500
Committer: Gorkem Ercan <go...@gmail.com>
Committed: Sun Mar 1 20:09:47 2015 -0500

----------------------------------------------------------------------
 cordova-lib/spec-cordova/test-config.xml     | 2 +-
 cordova-lib/src/configparser/ConfigParser.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4c0fec7d/cordova-lib/spec-cordova/test-config.xml
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/test-config.xml b/cordova-lib/spec-cordova/test-config.xml
index 9f2490d..21d91ab 100644
--- a/cordova-lib/spec-cordova/test-config.xml
+++ b/cordova-lib/spec-cordova/test-config.xml
@@ -32,7 +32,7 @@
     <!-- Features -->
     <feature name="A feature with preference">
         <param name="id" value="org.apache.cordova.featurewithvars"/>
-        <variable name="var" value="varvalue"/>
+        <param name="var" value="varvalue"/>
     </feature>
     <feature name="A feature with url">
         <param name="id" value="org.apache.cordova.featurewithurl" />

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4c0fec7d/cordova-lib/src/configparser/ConfigParser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/configparser/ConfigParser.js b/cordova-lib/src/configparser/ConfigParser.js
index 05292a6..fafc76f 100644
--- a/cordova-lib/src/configparser/ConfigParser.js
+++ b/cordova-lib/src/configparser/ConfigParser.js
@@ -334,7 +334,7 @@ ConfigParser.prototype = {
         );
 
         // Iterate preferences
-        result.variables = processChildren('variable');
+        result.variables = processChildren('param');
 
         return result;
 


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


[02/11] cordova-lib git commit: CB-8555 Updated version and RELEASENOTES.md for release 4.3.0

Posted by st...@apache.org.
CB-8555 Updated version and RELEASENOTES.md for release 4.3.0


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

Branch: refs/heads/CB-8551
Commit: c4fbb6a3e15b52ec69d535b6c21958091ca14a7e
Parents: e4d0f09
Author: Steve Gill <st...@gmail.com>
Authored: Fri Feb 27 13:04:58 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Feb 27 13:04:58 2015 -0800

----------------------------------------------------------------------
 cordova-lib/RELEASENOTES.md | 75 ++++++++++++++++++++++++++++++++++++++--
 cordova-lib/package.json    |  4 +--
 2 files changed, 75 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c4fbb6a3/cordova-lib/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/cordova-lib/RELEASENOTES.md b/cordova-lib/RELEASENOTES.md
index 78d8875..5574d8d 100644
--- a/cordova-lib/RELEASENOTES.md
+++ b/cordova-lib/RELEASENOTES.md
@@ -20,6 +20,79 @@
 -->
 # Cordova-lib Release Notes
 
+### 4.3.0 (Feb 27, 2015)
+* updated pinned versions of ios to 3.8.0 and android to 3.7.1
+* CB-8524 Switched to the latest Windows release
+* changed createpackage.json keyword to ecosystem:cordova
+* CB-8448 add support for activities
+* CB-8482 rename: platformId -> platformName
+* CB-8482: Update engine syntax within config.xml
+* Organize save logic some more
+* --save flag for plugins
+* fix for test after prepare changes
+* restore plugins and platforms on prepare
+* CB-8472 Can't find config.xml error installing browser platform after plugin.  (close #167)
+* CB-8469 android: Call into platform's build.js after `plugin add` so that Android Studio will work without needing an explicit command-line build first
+* CB-8123 Fix JSHINT issue.
+* CB-8123 Fix path handling so tests work on any platform.
+* CB-8123 Rename further windows platform related files.
+* CB-8123 Rename windows platform related files.
+* CB-8123 Plugin references can target specific windows platforms.
+* CB-8420 Make `cordova plugin add FOO` use version from config.xml (close #162)
+* CB-8239 Fix `cordova platform add PATH` when PATH is relative and CWD != project root
+* CB-8227 CB8237 CB-8238 Add --save flag and autosave to 'cordova platform add', 'cordova platform remove' and 'cordova platform update'
+* CB-8409 compile: bubble failures
+* CB-8239 Fix "platform update" should ignore `<cdv:engine>` (close #159)
+* CB-8390 android: Make `<framework custom=false>` work with Gradle
+* CB-8416 updated plugman publish to temporarily rename existing package.json files
+* CB-8416: added `plugman createpackagejson .` command to create a package.json from plugin.xml
+* CB-6973 add spec-plugman to npm run jshint
+* CB-6973 fix spec-plugman jshint failures
+* CB-6973 have base rules in jshintrc for spec-plugman
+* CB-8377 Fixed <runs> tag parsing (close #156)
+* CB-5696 find ios project directory using the xcode project file (close #151)
+* CB-8373 android: Add gradle references to project.properties rather than build.gradle
+* CB-8370 Make "plugman publish" without args default to CWD
+* Fix publish type-error introduced in recent commit 15adc1b9fcc069438f5
+* CB-8366 android: Remove empty `<framework>` directory upon uninstall
+* CB-6973 Enable JSHint for spec-cordova
+* CB-8239 Add support for git urls to 'cordova platform add' (close #148)
+* CB-8358 Add `--link` for `platform add` and `platform update`
+* CB-6973 remove base rules from individual files in src
+* CB-6973 have base rules in .jshintrc file
+* Add shims to undo breaking change in a20b3ae3 (didn't realize PluginInfo was exported)
+* CB-8354 Add --link support for iOS source and header files
+* Make all ad-hoc plugin.xml parsing use PluginInfo instead
+* Make all usages of PluginInfo use PluginInfoProvider instead
+* Add PluginInfoProvider for better caching of PluginInfo
+* CB-8284 revert npm dependency due to issues with registry
+* CB-8223 Expose config.xml in the Browser platform (close #149)
+* CB-8168 --list support for cordova-lib (close #145)
+* [Amazon] Improve error message when `<source-file>` is missing `target-dir`
+* refactor: Make addUninstalledPluginToPrepareQueue take pluginId rather than dirName
+* Chnage plugman test plugins to have IDs as directory names
+* Make all test plugin IDs unique
+* Empty out contents of plugin test files (and delete some unused ones)
+* CB-4789 refactor: Remove config_changes.get/set_platform_json in favour of PlatformJson
+* CB-8319 Remove config_changes module from plugman's public API
+* CB-8314 Speed up Travis CI (close #150)
+* refactor: Extract PlatformJson and munge-util into separate modules
+* refactor: Move ConfigFile and ConfigKeeper into their own files
+* CB-8285 Fix regression caused by c49eaa86c92b (PluginInfo's are cached, don't change them)
+* CB-8208 Made CI systems to get cordova-js dependency from gihub (close #146)
+* CB-8285 Don't create .fetch.json files within plugin directories
+* CB-8286 Never persist value of create --link-to within .cordova/config.json
+* CB-8288 Don't set config.setAutoPersist() in cordova.create
+* Fix create spec sometimes failing because it's deleted its own tmp directory
+* CB-8153 generate cordova_plugins.json for browserify based projects
+* CB-8043 CB-6462 CB-6105 Refactor orientation preference support (close #128)
+* FirefoxOS parser: allow passing in a ConfigParser object
+* Parsers: extend base parser with helper functions
+* CB-8244 android: Have `plugin add --link` create symlinks for `<source-file>`, `<framework>`, etc 
+* CB-8244 Pass options object to platform handlers in plugman (commit attempt #2)
+* CB-8226 'cordova platform add' : Look up version in config.xml if no version specified
+* Delete root .npmignore, since there's no node module there
+
 ### 4.2.0 (Jan 06, 2015)
 * `ConfigParser`: refactor `getPreference()`
 * Parsers: add base parser (parser.js) and make platform parsers inherit from it
@@ -316,5 +389,3 @@
 
 ### 0.21.1
 Initial release v0.21.1 (picks up from the same version number as plugman was).
-
-

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c4fbb6a3/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 434b4a0..d1dc02d 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -2,7 +2,7 @@
   "author": "Apache Software Foundation",
   "name": "cordova-lib",
   "description": "Apache Cordova tools core lib and API",
-  "version": "4.2.1-dev",
+  "version": "4.3.0",
   "repository": {
     "type": "git",
     "url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git"
@@ -18,7 +18,7 @@
   "engineStrict": true,
   "dependencies": {
     "bplist-parser": "0.0.6",
-    "cordova-js": "3.7.3",
+    "cordova-js": "3.8.0",
     "d8": "0.4.4",
     "dep-graph": "1.1.0",
     "elementtree": "0.1.5",


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


[11/11] cordova-lib git commit: fixed merge conflict in package.json

Posted by st...@apache.org.
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/45af7f84
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/45af7f84
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/45af7f84

Branch: refs/heads/CB-8551
Commit: 45af7f84f040190f63b4d708cef5216c4bd825a8
Parents: c063fde 7e225f3
Author: Steve Gill <st...@gmail.com>
Authored: Tue Mar 3 00:30:24 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Mar 3 00:30:24 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/whitelist.js |  3 +-
 cordova-lib/src/util/unpack.js                | 19 ++++++
 11 files changed, 133 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/45af7f84/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/45af7f84/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------


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


[10/11] cordova-lib git commit: added defaults.json to npmignore

Posted by st...@apache.org.
added defaults.json to npmignore


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

Branch: refs/heads/CB-8551
Commit: 7e225f351db750ac101b4d567a6761037d294b4d
Parents: 99f981a
Author: Steve Gill <st...@gmail.com>
Authored: Mon Mar 2 14:25:51 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Mon Mar 2 14:25:57 2015 -0800

----------------------------------------------------------------------
 cordova-lib/.npmignore | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7e225f35/cordova-lib/.npmignore
----------------------------------------------------------------------
diff --git a/cordova-lib/.npmignore b/cordova-lib/.npmignore
index b499363..ac145d5 100644
--- a/cordova-lib/.npmignore
+++ b/cordova-lib/.npmignore
@@ -2,3 +2,4 @@ spec-cordova
 spec-plugman
 spec
 coverage
+src/plugman/defaults.json


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


[09/11] cordova-lib git commit: CB-8457 Ignore version specifier when running hooks (close #165)

Posted by st...@apache.org.
CB-8457 Ignore version specifier when running hooks (close #165)


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

Branch: refs/heads/CB-8551
Commit: 99f981a3adc903bd454d6f01410dc350d85a8ed3
Parents: d7c2468
Author: Connor Pearson <cj...@gmail.com>
Authored: Wed Feb 11 19:50:32 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 2 10:11:38 2015 -0500

----------------------------------------------------------------------
 cordova-lib/src/hooks/HooksRunner.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/99f981a3/cordova-lib/src/hooks/HooksRunner.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/hooks/HooksRunner.js b/cordova-lib/src/hooks/HooksRunner.js
index 4191efd..0eaa04d 100644
--- a/cordova-lib/src/hooks/HooksRunner.js
+++ b/cordova-lib/src/hooks/HooksRunner.js
@@ -67,6 +67,7 @@ HooksRunner.prototype.prepareOptions = function(opts) {
     opts.projectRoot = this.projectRoot;
     opts.cordova = opts.cordova || {};
     opts.cordova.platforms = opts.cordova.platforms || opts.platforms || cordovaUtil.listPlatforms(opts.projectRoot);
+    opts.cordova.platforms = opts.cordova.platforms.map(function(platform) { return platform.split('@')[0]; } );
     opts.cordova.plugins = opts.cordova.plugins || opts.plugins || cordovaUtil.findPlugins(path.join(opts.projectRoot, 'plugins'));
 
     try {
@@ -225,4 +226,4 @@ function extractSheBangInterpreter(fullpath) {
     if (shMatch)
         hookCmd = shMatch[1];
     return hookCmd;
-}
\ No newline at end of file
+}


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


[08/11] cordova-lib git commit: CB-8578 `cordova plugin add ` should be able to restore urls and folders in addition to versions. (close #173)

Posted by st...@apache.org.
CB-8578 `cordova plugin add <plugin>` should be able to restore urls and folders in addition to versions. (close #173)


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

Branch: refs/heads/CB-8551
Commit: d7c2468a97a7fc2fb7c54c0e9be0c35473848f35
Parents: 473cef9
Author: Omar Mefire <om...@microsoft.com>
Authored: Fri Feb 27 20:03:38 2015 -0800
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 2 10:10:30 2015 -0500

----------------------------------------------------------------------
 cordova-lib/src/cordova/plugin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d7c2468a/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js
index 77175bd..dfca0d8 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -298,8 +298,8 @@ module.exports = function plugin(command, targets, opts) {
 };
 
 function getVersionFromConfigFile(plugin, cfg){
-    var feature = cfg.getFeature(plugin);
-    return feature && feature.params.version; 
+    var feature = cfg.getFeature(plugin); 
+    return feature && (feature.params.url || feature.params.installPath || feature.params.version);
 }
 
 function list(projectRoot, hooksRunner) {


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