Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8C5B0200CF3 for ; Wed, 30 Aug 2017 07:44:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8ADE216848E; Wed, 30 Aug 2017 05:44:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DC24D1682FF for ; Wed, 30 Aug 2017 07:44:55 +0200 (CEST) Received: (qmail 80337 invoked by uid 500); 30 Aug 2017 05:44:55 -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 80319 invoked by uid 99); 30 Aug 2017 05:44:55 -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; Wed, 30 Aug 2017 05:44:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3900CF5543; Wed, 30 Aug 2017 05:44:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Wed, 30 Aug 2017 05:44:56 -0000 Message-Id: <81b361d1b5c04cafa82cb3530837c9cd@git.apache.org> In-Reply-To: <939d6d84d1f04bdea83bfc1256bae2b0@git.apache.org> References: <939d6d84d1f04bdea83bfc1256bae2b0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] cordova-common git commit: CB-13145: removed uncessary check in getFramework archived-at: Wed, 30 Aug 2017 05:44:56 -0000 CB-13145: removed uncessary check in getFramework Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/b30d8991 Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/b30d8991 Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/b30d8991 Branch: refs/heads/master Commit: b30d8991ed65ea7ef5a159d0a7218daf846edc92 Parents: 00577f8 Author: Steve Gill Authored: Tue Aug 29 22:36:53 2017 -0700 Committer: Steve Gill Committed: Tue Aug 29 22:42:42 2017 -0700 ---------------------------------------------------------------------- spec/PluginInfo/PluginInfo.spec.js | 6 ------ src/PluginInfo/PluginInfo.js | 5 ----- 2 files changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-common/blob/b30d8991/spec/PluginInfo/PluginInfo.spec.js ---------------------------------------------------------------------- diff --git a/spec/PluginInfo/PluginInfo.spec.js b/spec/PluginInfo/PluginInfo.spec.js index 5fdaf87..e7a7c4f 100644 --- a/spec/PluginInfo/PluginInfo.spec.js +++ b/spec/PluginInfo/PluginInfo.spec.js @@ -64,10 +64,4 @@ describe('PluginInfo', function () { var result = p.getFrameworks('android', {cli_variables: { FCM_VERSION: '9.0.0' }}); expect(result[2].src).toBe('com.google.firebase:firebase-messaging:9.0.0'); }); - - it('Test 004: framework src uses default variable', function () { - var p = new PluginInfo(path.join(pluginsDir, 'org.test.src')); - var result = p.getFrameworks('android', {}); - expect(result[2].src).toBe('com.google.firebase:firebase-messaging:11.0.1'); - }); }); http://git-wip-us.apache.org/repos/asf/cordova-common/blob/b30d8991/src/PluginInfo/PluginInfo.js ---------------------------------------------------------------------- diff --git a/src/PluginInfo/PluginInfo.js b/src/PluginInfo/PluginInfo.js index 4cb5307..4d77cbc 100644 --- a/src/PluginInfo/PluginInfo.js +++ b/src/PluginInfo/PluginInfo.js @@ -312,11 +312,6 @@ function PluginInfo (dirname) { var src = el.attrib.src; if (options) { var vars = options.cli_variables || {}; - if (Object.keys(vars).length === 0) { - // get variable defaults from plugin.xml for removal - vars = self.getPreferences(platform); - } - var regExp; // Iterate over plugin variables. // Replace them in framework src if they exist --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org