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 2017/05/08 14:29:39 UTC
[1/8] cordova-lib git commit: CB-12747 Incremented package version to
-dev
Repository: cordova-lib
Updated Branches:
refs/heads/7.0.x 46defeb86 -> 5a4c43c26
refs/heads/master 4c497ab45 -> be7f7ac6d
CB-12747 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/471f16c9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/471f16c9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/471f16c9
Branch: refs/heads/7.0.x
Commit: 471f16c90a1d94284850b98c94a01cf95640e0cd
Parents: 46defeb
Author: Steve Gill <st...@gmail.com>
Authored: Tue May 2 02:05:19 2017 +0200
Committer: Steve Gill <st...@gmail.com>
Committed: Tue May 2 02:05:19 2017 +0200
----------------------------------------------------------------------
cordova-lib/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/471f16c9/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 69d288d..0f0ba72 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -3,7 +3,7 @@
"name": "cordova-lib",
"license": "Apache-2.0",
"description": "Apache Cordova tools core lib and API",
- "version": "7.0.0",
+ "version": "7.0.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
[6/8] cordova-lib git commit: CB-12769 Updated version and
RELEASENOTES.md for release 7.0.1
Posted by st...@apache.org.
CB-12769 Updated version and RELEASENOTES.md for release 7.0.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/5a4c43c2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/5a4c43c2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/5a4c43c2
Branch: refs/heads/7.0.x
Commit: 5a4c43c2690a2aa728664401d7a89ae4e1d9371d
Parents: 4c497ab
Author: Steve Gill <st...@gmail.com>
Authored: Mon May 8 16:20:30 2017 +0200
Committer: Steve Gill <st...@gmail.com>
Committed: Mon May 8 16:20:30 2017 +0200
----------------------------------------------------------------------
cordova-lib/RELEASENOTES.md | 4 ++++
cordova-lib/package.json | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5a4c43c2/cordova-lib/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/cordova-lib/RELEASENOTES.md b/cordova-lib/RELEASENOTES.md
index bf837fa..1438dee 100644
--- a/cordova-lib/RELEASENOTES.md
+++ b/cordova-lib/RELEASENOTES.md
@@ -20,6 +20,10 @@
-->
# Cordova-lib Release Notes
+### 7.0.1 (May 08, 2017)
+* [CB-12769](https://issues.apache.org/jira/browse/CB-12769): updated `cordova-create` dependency to 1.1.1
+* [CB-12757](https://issues.apache.org/jira/browse/CB-12757): if there's a plugin dependency in `package.json`, use that one for `config.xml`
+
### 7.0.0 (May 02, 2017)
* [CB-12747](https://issues.apache.org/jira/browse/CB-12747): updated pinned platforms
* [CB-12705](https://issues.apache.org/jira/browse/CB-12705): Modified `(before|after)_plugin_(uninstall|install)` to always expect existence of plugin field
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5a4c43c2/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 0f0ba72..d1aab2c 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -3,7 +3,7 @@
"name": "cordova-lib",
"license": "Apache-2.0",
"description": "Apache Cordova tools core lib and API",
- "version": "7.0.1-dev",
+ "version": "7.0.1",
"repository": {
"type": "git",
"url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git"
@@ -19,7 +19,7 @@
"dependencies": {
"aliasify": "^2.1.0",
"cordova-common": "2.0.3",
- "cordova-create": "1.1.0",
+ "cordova-create": "~1.1.0",
"cordova-fetch": "1.1.0",
"cordova-js": "4.2.1",
"cordova-serve": "^1.0.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/8] cordova-lib git commit: CB-12747 Incremented package version to
-dev
Posted by st...@apache.org.
CB-12747 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/c51b8f86
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c51b8f86
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c51b8f86
Branch: refs/heads/7.0.x
Commit: c51b8f860a83221db970bd5a27b7fde447cee976
Parents: 4fed7da
Author: Steve Gill <st...@gmail.com>
Authored: Tue May 2 02:05:33 2017 +0200
Committer: Steve Gill <st...@gmail.com>
Committed: Tue May 2 02:05:33 2017 +0200
----------------------------------------------------------------------
cordova-common/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c51b8f86/cordova-common/package.json
----------------------------------------------------------------------
diff --git a/cordova-common/package.json b/cordova-common/package.json
index 568e90a..dd84f86 100644
--- a/cordova-common/package.json
+++ b/cordova-common/package.json
@@ -3,7 +3,7 @@
"name": "cordova-common",
"description": "Apache Cordova tools and platforms shared routines",
"license": "Apache-2.0",
- "version": "2.0.3",
+ "version": "2.0.4-dev",
"repository": {
"type": "git",
"url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/8] cordova-lib git commit: CB-12747 Incremented package version to
-dev
Posted by st...@apache.org.
CB-12747 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/4fed7dad
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/4fed7dad
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/4fed7dad
Branch: refs/heads/7.0.x
Commit: 4fed7dad6e79dd7f7a3b6d18b5ab6e95d8d3612a
Parents: 471f16c
Author: Steve Gill <st...@gmail.com>
Authored: Tue May 2 02:05:27 2017 +0200
Committer: Steve Gill <st...@gmail.com>
Committed: Tue May 2 02:05:27 2017 +0200
----------------------------------------------------------------------
cordova-fetch/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4fed7dad/cordova-fetch/package.json
----------------------------------------------------------------------
diff --git a/cordova-fetch/package.json b/cordova-fetch/package.json
index 393e51f..753f83e 100644
--- a/cordova-fetch/package.json
+++ b/cordova-fetch/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-fetch",
- "version": "1.1.0",
+ "version": "1.1.1-dev",
"description": "Apache Cordova fetch module. Fetches from git and npm.",
"main": "index.js",
"repository": {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[7/8] cordova-lib git commit: CB-12769 Updated version and
RELEASENOTES.md for release 7.0.1
Posted by st...@apache.org.
CB-12769 Updated version and RELEASENOTES.md for release 7.0.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/5a4c43c2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/5a4c43c2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/5a4c43c2
Branch: refs/heads/master
Commit: 5a4c43c2690a2aa728664401d7a89ae4e1d9371d
Parents: 4c497ab
Author: Steve Gill <st...@gmail.com>
Authored: Mon May 8 16:20:30 2017 +0200
Committer: Steve Gill <st...@gmail.com>
Committed: Mon May 8 16:20:30 2017 +0200
----------------------------------------------------------------------
cordova-lib/RELEASENOTES.md | 4 ++++
cordova-lib/package.json | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5a4c43c2/cordova-lib/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/cordova-lib/RELEASENOTES.md b/cordova-lib/RELEASENOTES.md
index bf837fa..1438dee 100644
--- a/cordova-lib/RELEASENOTES.md
+++ b/cordova-lib/RELEASENOTES.md
@@ -20,6 +20,10 @@
-->
# Cordova-lib Release Notes
+### 7.0.1 (May 08, 2017)
+* [CB-12769](https://issues.apache.org/jira/browse/CB-12769): updated `cordova-create` dependency to 1.1.1
+* [CB-12757](https://issues.apache.org/jira/browse/CB-12757): if there's a plugin dependency in `package.json`, use that one for `config.xml`
+
### 7.0.0 (May 02, 2017)
* [CB-12747](https://issues.apache.org/jira/browse/CB-12747): updated pinned platforms
* [CB-12705](https://issues.apache.org/jira/browse/CB-12705): Modified `(before|after)_plugin_(uninstall|install)` to always expect existence of plugin field
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/5a4c43c2/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 0f0ba72..d1aab2c 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -3,7 +3,7 @@
"name": "cordova-lib",
"license": "Apache-2.0",
"description": "Apache Cordova tools core lib and API",
- "version": "7.0.1-dev",
+ "version": "7.0.1",
"repository": {
"type": "git",
"url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git"
@@ -19,7 +19,7 @@
"dependencies": {
"aliasify": "^2.1.0",
"cordova-common": "2.0.3",
- "cordova-create": "1.1.0",
+ "cordova-create": "~1.1.0",
"cordova-fetch": "1.1.0",
"cordova-js": "4.2.1",
"cordova-serve": "^1.0.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/8] cordova-lib git commit: Empty commit to prod the CI after
cordova-7 release of tools to npm
Posted by st...@apache.org.
Empty commit to prod the CI after cordova-7 release of tools to npm
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/3db0f074
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/3db0f074
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/3db0f074
Branch: refs/heads/7.0.x
Commit: 3db0f074f3b1ebe6641d7dcc23b1569334275970
Parents: c51b8f8
Author: Shazron Abdullah <sh...@gmail.com>
Authored: Thu May 4 16:08:26 2017 -0700
Committer: Shazron Abdullah <sh...@gmail.com>
Committed: Thu May 4 16:08:26 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[8/8] cordova-lib git commit: CB-12769 Incremented package version to
-dev
Posted by st...@apache.org.
CB-12769 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/be7f7ac6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/be7f7ac6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/be7f7ac6
Branch: refs/heads/master
Commit: be7f7ac6d6b6f2444972c5100c7b97bd023c25e7
Parents: 5a4c43c
Author: Steve Gill <st...@gmail.com>
Authored: Mon May 8 16:28:53 2017 +0200
Committer: Steve Gill <st...@gmail.com>
Committed: Mon May 8 16:28:53 2017 +0200
----------------------------------------------------------------------
cordova-lib/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/be7f7ac6/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index d1aab2c..7fe1f11 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -3,7 +3,7 @@
"name": "cordova-lib",
"license": "Apache-2.0",
"description": "Apache Cordova tools core lib and API",
- "version": "7.0.1",
+ "version": "7.0.2-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
[5/8] cordova-lib git commit: CB-12757 : if there's a plugin
dependency in pkgJson, use that one for config
Posted by st...@apache.org.
CB-12757 : if there's a plugin dependency in pkgJson, use that one for config
This closes #552
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/4c497ab4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/4c497ab4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/4c497ab4
Branch: refs/heads/7.0.x
Commit: 4c497ab45847b038eb5f65427d4343745c65c4ed
Parents: 3db0f07
Author: Audrey So <au...@apache.org>
Authored: Thu May 4 10:08:47 2017 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Mon May 8 12:41:00 2017 +0200
----------------------------------------------------------------------
cordova-lib/integration-tests/pkgJson.spec.js | 2 +-
cordova-lib/src/cordova/plugin.js | 53 ++++++++++++----------
2 files changed, 29 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4c497ab4/cordova-lib/integration-tests/pkgJson.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/integration-tests/pkgJson.spec.js b/cordova-lib/integration-tests/pkgJson.spec.js
index e97372f..9e85d08 100644
--- a/cordova-lib/integration-tests/pkgJson.spec.js
+++ b/cordova-lib/integration-tests/pkgJson.spec.js
@@ -91,7 +91,7 @@ describe('plugin end-to-end', function() {
configPlugins = cfg2.getPluginIdList();
configPlugin = cfg2.getPlugin(configPlugins);
expect(configPlugins.length).toEqual(1);
- expect(configPlugin).toEqual({ name: 'cordova-plugin-device', spec: '~1.1.2', variables: {} });
+ expect(configPlugin).toEqual({ name: 'cordova-plugin-device', spec: '^1.1.2', variables: {} });
}).then(function() {
// And now remove it with --save.
return cordova.raw.plugin('rm', pluginId, {'save':true, 'fetch':true});
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4c497ab4/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js
index 6c59818..e76f479 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -205,8 +205,29 @@ module.exports = function plugin(command, targets, opts) {
.thenResolve(pluginInfo);
})
.then(function(pluginInfo){
+ var pkgJson;
+ var pkgJsonPath = path.join(projectRoot,'package.json');
+
// save to config.xml
if(saveToConfigXmlOn(config_json, opts)){
+ // If statement to see if pkgJsonPath exists in the filesystem
+ if(fs.existsSync(pkgJsonPath)) {
+ // Delete any previous caches of require(package.json)
+ pkgJson = cordova_util.requireNoCache(pkgJsonPath);
+ }
+ // If package.json exists, the plugin object and plugin name
+ // will be added to package.json if not already there.
+ if(pkgJson) {
+ pkgJson.cordova = pkgJson.cordova || {};
+ pkgJson.cordova.plugins = pkgJson.cordova.plugins || {};
+ // Plugin and variables are added.
+ pkgJson.cordova.plugins[pluginInfo.id] = opts.cli_variables;
+ events.emit('log','Adding '+pluginInfo.id+ ' to package.json');
+
+ // Write to package.json
+ fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 4), 'utf8');
+ }
+
var src = parseSource(target, opts);
var attributes = {
name: pluginInfo.id
@@ -218,10 +239,14 @@ module.exports = function plugin(command, targets, opts) {
var ver = '~' + pluginInfo.version;
// Scoped packages need to have the package-spec along with the version
var parsedSpec = pluginSpec.parse(target);
- if (parsedSpec.scope) {
- attributes.spec = parsedSpec.package + '@' + ver;
+ if(pkgJson && pkgJson.dependencies && pkgJson.dependencies[pluginInfo.id]){
+ attributes.spec = pkgJson.dependencies[pluginInfo.id];
} else {
- attributes.spec = ver;
+ if (parsedSpec.scope) {
+ attributes.spec = parsedSpec.package + '@' + ver;
+ } else {
+ attributes.spec = ver;
+ }
}
}
xml = cordova_util.projectConfig(projectRoot);
@@ -231,28 +256,6 @@ module.exports = function plugin(command, targets, opts) {
cfg.write();
events.emit('results', 'Saved plugin info for "' + pluginInfo.id + '" to config.xml');
-
- var pkgJson;
- var pkgJsonPath = path.join(projectRoot,'package.json');
-
- // If statement to see if pkgJsonPath exists in the filesystem
- if(fs.existsSync(pkgJsonPath)) {
- // Delete any previous caches of require(package.json)
- pkgJson = cordova_util.requireNoCache(pkgJsonPath);
- }
-
- // If package.json exists, the plugin object and plugin name
- // will be added to package.json if not already there.
- if (!pkgJson) {
- return;
- }
- pkgJson.cordova = pkgJson.cordova || {};
- pkgJson.cordova.plugins = pkgJson.cordova.plugins || {};
- // Plugin and variables are added.
- pkgJson.cordova.plugins[pluginInfo.id] = opts.cli_variables;
- events.emit('log','Adding '+pluginInfo.id+ ' to package.json');
- // Write to package.json
- fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 4), 'utf8');
}
});
}, Q());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org