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 <[email protected]> Authored: Tue Aug 29 22:36:53 2017 -0700 Committer: Steve Gill <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
