Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 90D7B19C5A for ; Tue, 15 Mar 2016 17:48:35 +0000 (UTC) Received: (qmail 16054 invoked by uid 500); 15 Mar 2016 17:48:35 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 15951 invoked by uid 500); 15 Mar 2016 17:48:35 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 15842 invoked by uid 99); 15 Mar 2016 17:48:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Mar 2016 17:48:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CE4D4DFA41; Tue, 15 Mar 2016 17:48:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rknoll@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cordova-lib git commit: CB-10880: Remove plugin pinning Date: Tue, 15 Mar 2016 17:48:34 +0000 (UTC) Repository: cordova-lib Updated Branches: refs/heads/master 0386ac2cd -> d779242e8 CB-10880: Remove plugin pinning This closes #409 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/d779242e Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/d779242e Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/d779242e Branch: refs/heads/master Commit: d779242e8acd31231c3be98a941624ad89a5a67c Parents: 0386ac2 Author: Richard Knoll Authored: Thu Mar 10 18:59:53 2016 -0800 Committer: Richard Knoll Committed: Tue Mar 15 10:40:07 2016 -0700 ---------------------------------------------------------------------- cordova-lib/package.json | 24 ------------------------ cordova-lib/src/cordova/plugin.js | 8 +++----- 2 files changed, 3 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d779242e/cordova-lib/package.json ---------------------------------------------------------------------- diff --git a/cordova-lib/package.json b/cordova-lib/package.json index 1d452fa..3e0fadb 100644 --- a/cordova-lib/package.json +++ b/cordova-lib/package.json @@ -16,30 +16,6 @@ "node": ">=0.9.9" }, "engineStrict": true, - "cordovaPlugins": { - "cordova-plugin-battery-status": "~1.1.1", - "cordova-plugin-camera": "~2.1.0", - "cordova-plugin-console": "~1.0.2", - "cordova-plugin-contacts": "~2.0.1", - "cordova-plugin-device": "~1.1.1", - "cordova-plugin-device-motion": "~1.2.0", - "cordova-plugin-device-orientation": "~1.0.2", - "cordova-plugin-dialogs": "~1.2.0", - "cordova-plugin-file": "~4.1.0", - "cordova-plugin-file-transfer": "~1.5.0", - "cordova-plugin-geolocation": "~2.1.0", - "cordova-plugin-globalization": "~1.0.2", - "cordova-plugin-inappbrowser": "~1.2.0", - "cordova-plugin-legacy-whitelist": "~1.1.1", - "cordova-plugin-media": "~2.1.0", - "cordova-plugin-media-capture": "~1.2.0", - "cordova-plugin-network-information": "~1.2.0", - "cordova-plugin-splashscreen": "~3.1.0", - "cordova-plugin-statusbar": "~2.1.0", - "cordova-plugin-test-framework": "~1.1.1", - "cordova-plugin-vibration": "~2.1.0", - "cordova-plugin-whitelist": "~1.2.1" - }, "dependencies": { "aliasify": "^1.7.2", "cordova-app-hello-world": "3.10.0", http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d779242e/cordova-lib/src/cordova/plugin.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index a5398a0..46b84be 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -326,8 +326,6 @@ function determinePluginTarget(projectRoot, cfg, target, fetchOptions) { return getFetchVersion(projectRoot, pluginInfo, pkgJson.version); }) .then(function(fetchVersion) { - // Fallback to pinned version if available - fetchVersion = fetchVersion || pkgJson.cordovaPlugins[id]; return fetchVersion ? (id + '@' + fetchVersion) : target; }); } @@ -588,7 +586,7 @@ function getFetchVersion(projectRoot, pluginInfo, cordovaVersion) { }); } else { // If we have no engine, we want to fall back to the default behavior - events.emit('verbose', 'No plugin engine info found or not using registry, falling back to latest or pinned version'); + events.emit('verbose', 'No plugin engine info found or not using registry, falling back to latest version'); return Q(null); } } @@ -706,7 +704,7 @@ function determinePluginVersionToFetch(pluginInfo, pluginMap, platformMap, cordo } // No version of the plugin is satisfied. In this case, we fall back to - // fetching latest or pinned versions, but also output a warning + // fetching the latest version, but also output a warning var latestFailedReqs = versions.length > 0 ? getFailedRequirements(engine[versions[0]], pluginMap, platformMap, cordovaVersion) : []; // If the upper bound is greater than latest, we need to combine its engine @@ -728,7 +726,7 @@ function determinePluginVersionToFetch(pluginInfo, pluginMap, platformMap, cordo } listUnmetRequirements(name, latestFailedReqs); - events.emit('warn', 'Current project does not satisfy the engine requirements specified by any version of ' + name + '. Fetching latest or pinned version of plugin anyway (may be incompatible)'); + events.emit('warn', 'Current project does not satisfy the engine requirements specified by any version of ' + name + '. Fetching latest version of plugin anyway (may be incompatible)'); // No constraints were satisfied return null; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org