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/09 19:01:48 UTC
[1/2] cordova-lib git commit: CB-12773: fixed incorrect plugin
version fetching issue
Repository: cordova-lib
Updated Branches:
refs/heads/7.0.x 5a4c43c26 -> aa1284bd5
CB-12773: fixed incorrect plugin version fetching issue
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/877818ec
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/877818ec
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/877818ec
Branch: refs/heads/7.0.x
Commit: 877818ec06752e938253c1c439e43276f17e6afd
Parents: 5a4c43c
Author: Steve Gill <st...@gmail.com>
Authored: Tue May 9 18:52:08 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Tue May 9 19:59:52 2017 +0100
----------------------------------------------------------------------
cordova-lib/src/cordova/plugin.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/877818ec/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js
index e76f479..b90a4d5 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -391,6 +391,7 @@ function determinePluginTarget(projectRoot, cfg, target, fetchOptions) {
}
// Require project pkgJson.
var pkgJsonPath = path.join(projectRoot, 'package.json');
+ var cordovaVersion = pkgJson.version;
if(fs.existsSync(pkgJsonPath)) {
pkgJson = cordova_util.requireNoCache(pkgJsonPath);
}
@@ -457,7 +458,7 @@ function determinePluginTarget(projectRoot, cfg, target, fetchOptions) {
return (shouldUseNpmInfo ? registry.info([id])
.then(function(pluginInfo) {
- return getFetchVersion(projectRoot, pluginInfo, pkgJson.version);
+ return getFetchVersion(projectRoot, pluginInfo, cordovaVersion);
}) : Q(null))
.then(function(fetchVersion) {
return fetchVersion ? (id + '@' + fetchVersion) : target;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-lib git commit: CB-12769: updated release notes for
7.0.1
Posted by st...@apache.org.
CB-12769: updated release notes for 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/aa1284bd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/aa1284bd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/aa1284bd
Branch: refs/heads/7.0.x
Commit: aa1284bd565cda72b57255ed1e84222612816dec
Parents: 877818e
Author: Steve Gill <st...@gmail.com>
Authored: Tue May 9 20:01:23 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Tue May 9 20:01:35 2017 +0100
----------------------------------------------------------------------
cordova-lib/RELEASENOTES.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/aa1284bd/cordova-lib/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/cordova-lib/RELEASENOTES.md b/cordova-lib/RELEASENOTES.md
index 1438dee..b42c9f6 100644
--- a/cordova-lib/RELEASENOTES.md
+++ b/cordova-lib/RELEASENOTES.md
@@ -21,6 +21,7 @@
# Cordova-lib Release Notes
### 7.0.1 (May 08, 2017)
+* [CB-12773](https://issues.apache.org/jira/browse/CB-12773): fixed incorrect plugin version fetching issue
* [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`
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org