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/10/06 22:30:21 UTC
[01/12] cordova-common git commit: CB-13145: added variable replacing
to framework tag
Repository: cordova-common
Updated Branches:
refs/heads/2.1.x e6d8e6f06 -> e76dd52f6
refs/heads/CB-13145 8988dc809 -> 1fe84e338
refs/heads/master 623039ff6 -> 7f4e5d75b
CB-13145: added variable replacing to framework tag
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/8f8887e2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/8f8887e2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/8f8887e2
Branch: refs/heads/CB-13145
Commit: 8f8887e20241f2d54da9dd7a8a8cef784768a705
Parents: b4187f4
Author: Steve Gill <st...@gmail.com>
Authored: Thu Aug 17 17:18:12 2017 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Aug 22 14:37:13 2017 -0700
----------------------------------------------------------------------
src/PluginInfo/PluginInfo.js | 26 ++++++++++++++++++++++----
src/PluginManager.js | 2 +-
2 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/8f8887e2/src/PluginInfo/PluginInfo.js
----------------------------------------------------------------------
diff --git a/src/PluginInfo/PluginInfo.js b/src/PluginInfo/PluginInfo.js
index 75c96c1..5b088ca 100644
--- a/src/PluginInfo/PluginInfo.js
+++ b/src/PluginInfo/PluginInfo.js
@@ -306,15 +306,33 @@ function PluginInfo (dirname) {
return n.attrib.name;
});
};
- self.getFrameworks = function (platform) {
+
+ self.getFrameworks = function (platform, options) {
return _getTags(self._et, 'framework', platform, function (el) {
+ var src = el.attrib.src;
+ var vars = {};
+ if (options) {
+ 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
+ Object.keys(vars).forEach(function (name) {
+ regExp = new RegExp('\\$' + name, 'g');
+ src = src.replace(regExp, vars[name]);
+ });
+ }
var ret = {
itemType: 'framework',
type: el.attrib.type,
parent: el.attrib.parent,
custom: isStrTrue(el.attrib.custom),
embed: isStrTrue(el.attrib.embed),
- src: el.attrib.src,
+ src: src,
spec: el.attrib.spec,
weak: isStrTrue(el.attrib.weak),
versions: el.attrib.versions,
@@ -328,14 +346,14 @@ function PluginInfo (dirname) {
};
self.getFilesAndFrameworks = getFilesAndFrameworks;
- function getFilesAndFrameworks (platform) {
+ function getFilesAndFrameworks (platform, options) {
// Please avoid changing the order of the calls below, files will be
// installed in this order.
var items = [].concat(
self.getSourceFiles(platform),
self.getHeaderFiles(platform),
self.getResourceFiles(platform),
- self.getFrameworks(platform),
+ self.getFrameworks(platform, options),
self.getLibFiles(platform)
);
return items;
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/8f8887e2/src/PluginManager.js
----------------------------------------------------------------------
diff --git a/src/PluginManager.js b/src/PluginManager.js
index 7b8a0d4..b875d0e 100644
--- a/src/PluginManager.js
+++ b/src/PluginManager.js
@@ -92,7 +92,7 @@ PluginManager.prototype.doOperation = function (operation, plugin, options) {
var actions = new ActionStack();
// gather all files need to be handled during operation ...
- plugin.getFilesAndFrameworks(this.platform)
+ plugin.getFilesAndFrameworks(this.platform, options)
.concat(plugin.getAssets(this.platform))
.concat(plugin.getJsModules(this.platform))
// ... put them into stack ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[02/12] cordova-common git commit: Merge branch 'CB-13145' of
https://github.com/stevengill/cordova-common into CB-13145-steve
Posted by st...@apache.org.
Merge branch 'CB-13145' of https://github.com/stevengill/cordova-common into CB-13145-steve
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/3af9a17c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/3af9a17c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/3af9a17c
Branch: refs/heads/CB-13145
Commit: 3af9a17c92578194284698a358d7a5e84cfa0e30
Parents: 8f8887e 8988dc8
Author: Audrey So <au...@apache.org>
Authored: Tue Aug 22 17:40:39 2017 -0700
Committer: Audrey So <au...@apache.org>
Committed: Tue Aug 22 17:40:39 2017 -0700
----------------------------------------------------------------------
src/PluginInfo/PluginInfo.js | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/3af9a17c/src/PluginInfo/PluginInfo.js
----------------------------------------------------------------------
diff --cc src/PluginInfo/PluginInfo.js
index 5b088ca,4cb5307..e399488
--- a/src/PluginInfo/PluginInfo.js
+++ b/src/PluginInfo/PluginInfo.js
@@@ -6,9 -6,9 +6,7 @@@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
--
http://www.apache.org/licenses/LICENSE-2.0
--
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@@ -21,7 -21,7 +19,6 @@@
A class for holidng the information currently stored in plugin.xml
It should also be able to answer questions like whether the plugin
is compatible with a given engine version.
--
TODO (kamrik): refactor this to not use sync functions and return promises.
*/
@@@ -435,4 -436,4 +433,4 @@@ PluginInfo.PluginInfo = PluginInfo
PluginInfo.loadPluginsDir = function (dir) {
var PluginInfoProvider = require('./PluginInfoProvider');
return new PluginInfoProvider().getAllWithinSearchPath(dir);
--};
++};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[03/12] cordova-common git commit: CB-11968: Added support for
in config.xml
Posted by st...@apache.org.
CB-11968: Added support for <config-file> in config.xml
This closes #2
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/af5c6dcd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/af5c6dcd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/af5c6dcd
Branch: refs/heads/CB-13145
Commit: af5c6dcddda0f96062b4d327ee75009dc1214428
Parents: b4187f4
Author: Nikita Matrosov <v-...@microsoft.com>
Authored: Fri Jul 28 15:35:41 2017 +0300
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Aug 22 18:00:25 2017 -0700
----------------------------------------------------------------------
spec/ConfigChanges/ConfigChanges.spec.js | 20 +++++++++++++++
spec/ConfigParser/ConfigParser.spec.js | 6 ++++-
spec/fixtures/test-config.xml | 6 +++++
spec/fixtures/test-configfile.xml | 23 ++++++++++++++++++
src/ConfigChanges/ConfigChanges.js | 35 ++++++++++++++++-----------
src/ConfigParser/ConfigParser.js | 23 ++++++++++++++++++
6 files changed, 98 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/af5c6dcd/spec/ConfigChanges/ConfigChanges.spec.js
----------------------------------------------------------------------
diff --git a/spec/ConfigChanges/ConfigChanges.spec.js b/spec/ConfigChanges/ConfigChanges.spec.js
index 79e109a..ec7f250 100644
--- a/spec/ConfigChanges/ConfigChanges.spec.js
+++ b/spec/ConfigChanges/ConfigChanges.spec.js
@@ -45,6 +45,7 @@ var PluginInfo = require('../../src/PluginInfo/PluginInfo');
var ConfigParser = require('../../src/ConfigParser/ConfigParser');
var xml = path.join(__dirname, '../fixtures/test-config.xml');
var editconfig_xml = path.join(__dirname, '../fixtures/test-editconfig.xml');
+var configfile_xml = path.join(__dirname, '../fixtures/test-configfile.xml');
var cfg = new ConfigParser(xml);
// TODO: dont do fs so much
@@ -374,6 +375,25 @@ describe('config-changes module', function () {
expect(sdk.attrib['android:minSdkVersion']).toEqual('5');
expect(sdk.attrib['android:maxSdkVersion']).toBeUndefined();
});
+ it('should append new children to XML document tree', function () {
+ var configfile_cfg = new ConfigParser(configfile_xml);
+ var platformJson = PlatformJson.load(plugins_dir, 'android');
+ var munger = new configChanges.PlatformMunger('android', temp, platformJson, pluginInfoProvider);
+ munger.add_config_changes(configfile_cfg, true).save_all();
+ var am_xml = new et.ElementTree(et.XML(fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8')));
+ var activity = am_xml.find('./application/activity[@android:name="com.foo.Bar"]');
+ expect(activity).toBeDefined();
+ expect(activity.attrib['android:label']).toEqual('@string/app_name');
+ });
+ // testing the "after" attribute of the <config-file> tag in config.xml
+ it('should append new children to XML document tree in the correct order', function () {
+ var configfile_cfg = new ConfigParser(configfile_xml);
+ var platformJson = PlatformJson.load(plugins_dir, 'android');
+ var munger = new configChanges.PlatformMunger('android', temp, platformJson, pluginInfoProvider);
+ munger.add_config_changes(configfile_cfg, true).save_all();
+ var am_file = fs.readFileSync(path.join(temp, 'AndroidManifest.xml'), 'utf-8');
+ expect(am_file.indexOf('android:name="zoo"')).toBeLessThan(am_file.indexOf('android:name="com.foo.Bar"'));
+ });
it('should throw error for conflicting plugin config munge with config.xml config munge', function () {
shell.cp('-rf', editconfigplugin_two, plugins_dir);
var platformJson = PlatformJson.load(plugins_dir, 'android');
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/af5c6dcd/spec/ConfigParser/ConfigParser.spec.js
----------------------------------------------------------------------
diff --git a/spec/ConfigParser/ConfigParser.spec.js b/spec/ConfigParser/ConfigParser.spec.js
index 1075e83..2129565 100644
--- a/spec/ConfigParser/ConfigParser.spec.js
+++ b/spec/ConfigParser/ConfigParser.spec.js
@@ -245,10 +245,14 @@ describe('config.xml parser', function () {
var intents = cfg.getAllowIntents();
expect(intents.length).not.toEqual(0);
});
- it('it should read <edit-config> tag entries', function () {
+ it('Test 035: it should read <edit-config> tag entries', function () {
var editConfigs = cfg.getEditConfigs('android');
expect(editConfigs.length).not.toEqual(0);
});
+ it('Test 036: it should read <config-file> tag entries', function () {
+ var configFiles = cfg.getConfigFiles('android');
+ expect(configFiles.length).not.toEqual(0);
+ });
});
describe('static resources', function () {
var hasPlatformPropertyDefined = function (e) { return !!e.platform; };
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/af5c6dcd/spec/fixtures/test-config.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/test-config.xml b/spec/fixtures/test-config.xml
index 7969d64..5dd79e6 100644
--- a/spec/fixtures/test-config.xml
+++ b/spec/fixtures/test-config.xml
@@ -99,6 +99,12 @@
<edit-config file="AndroidManifest.xml" target="/manifest/uses-sdk" mode="remove">
<uses-sdk android:maxSdkVersion="24" />
</edit-config>
+ <config-file target="AndroidManifest.xml" parent="/manifest/application">
+ <activity android:name="com.foo.Foo" android:label="@string/app_name">
+ <intent-filter>
+ </intent-filter>
+ </activity>
+ </config-file>
</platform>
<platform name="windows">
<icon src="res/windows/logo.scale-200.png" target="logo.png"/>
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/af5c6dcd/spec/fixtures/test-configfile.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/test-configfile.xml b/spec/fixtures/test-configfile.xml
new file mode 100644
index 0000000..4ca15cd
--- /dev/null
+++ b/spec/fixtures/test-configfile.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8'?>
+<widget android-packageName="io.cordova.hellocordova.android" id="io.cordova.hellocordova" ios-CFBundleIdentifier="io.cordova.hellocordova.ios" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+ <name>Hello Cordova</name>
+ <description>
+ A sample Apache Cordova application that responds to the deviceready event.
+ </description>
+ <author email="dev@cordova.apache.org" href="http://cordova.io">
+ Apache Cordova Team
+ </author>
+ <content src="index.html" />
+ <access origin="*" />
+ <platform name="android">
+ <config-file parent="/manifest/application" target="AndroidManifest.xml">
+ <meta-data android:name="zoo" android:value="@string/kangaroo" />
+ </config-file>
+ <config-file target="AndroidManifest.xml" parent="/manifest/application" after="meta-data">
+ <activity android:name="com.foo.Bar" android:label="@string/app_name">
+ <intent-filter>
+ </intent-filter>
+ </activity>
+ </config-file>
+ </platform>
+</widget>
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/af5c6dcd/src/ConfigChanges/ConfigChanges.js
----------------------------------------------------------------------
diff --git a/src/ConfigChanges/ConfigChanges.js b/src/ConfigChanges/ConfigChanges.js
index f0cf8d9..e0af8a9 100644
--- a/src/ConfigChanges/ConfigChanges.js
+++ b/src/ConfigChanges/ConfigChanges.js
@@ -168,17 +168,24 @@ function add_config_changes (config, should_increment) {
var platform_config = self.platformJson.root;
var config_munge;
- var edit_config_changes = null;
+ var changes = [];
+
if (config.getEditConfigs) {
- edit_config_changes = config.getEditConfigs(self.platform);
+ var edit_config_changes = config.getEditConfigs(self.platform);
+ if (edit_config_changes) {
+ changes = changes.concat(edit_config_changes);
+ }
}
- if (!edit_config_changes || edit_config_changes.length === 0) {
- // There are no edit-config changes to add, return here
- return self;
- } else {
- var isConflictingInfo = is_conflicting(edit_config_changes, platform_config.config_munge, self, true /* always force overwrite other edit-config */);
+ if (config.getConfigFiles) {
+ var config_files_changes = config.getConfigFiles(self.platform);
+ if (config_files_changes) {
+ changes = changes.concat(config_files_changes);
+ }
+ }
+ if (changes && changes.length > 0) {
+ var isConflictingInfo = is_conflicting(changes, platform_config.config_munge, self, true /* always force overwrite other edit-config */);
if (isConflictingInfo.conflictFound) {
var conflict_munge;
var conflict_file;
@@ -200,10 +207,10 @@ function add_config_changes (config, should_increment) {
}
}
}
- // Add config.xml edit-config munges
- config_munge = self.generate_config_xml_munge(config, edit_config_changes, 'config.xml');
}
+ // Add config.xml edit-config and config-file munges
+ config_munge = self.generate_config_xml_munge(config, changes, 'config.xml');
self = munge_helper(should_increment, self, platform_config, config_munge);
// Move to installed/dependent_plugins
@@ -251,13 +258,11 @@ function reapply_global_munge () {
// generate_plugin_config_munge
// Generate the munge object from config.xml
PlatformMunger.prototype.generate_config_xml_munge = generate_config_xml_munge;
-function generate_config_xml_munge (config, edit_config_changes, type) {
-
+function generate_config_xml_munge (config, config_changes, type) {
var munge = { files: {} };
- var changes = edit_config_changes;
var id;
- if (!changes) {
+ if (!config_changes) {
return munge;
}
@@ -267,13 +272,15 @@ function generate_config_xml_munge (config, edit_config_changes, type) {
id = config.id;
}
- changes.forEach(function (change) {
+ config_changes.forEach(function (change) {
change.xmls.forEach(function (xml) {
// 1. stringify each xml
var stringified = (new et.ElementTree(xml)).write({xml_declaration: false});
// 2. add into munge
if (change.mode) {
mungeutil.deep_add(munge, change.file, change.target, { xml: stringified, count: 1, mode: change.mode, id: id });
+ } else {
+ mungeutil.deep_add(munge, change.target, change.parent, { xml: stringified, count: 1, after: change.after });
}
});
});
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/af5c6dcd/src/ConfigParser/ConfigParser.js
----------------------------------------------------------------------
diff --git a/src/ConfigParser/ConfigParser.js b/src/ConfigParser/ConfigParser.js
index ebaa2a3..e2c41bc 100644
--- a/src/ConfigParser/ConfigParser.js
+++ b/src/ConfigParser/ConfigParser.js
@@ -554,6 +554,29 @@ ConfigParser.prototype = {
return editConfig;
});
},
+
+ /* Get all config-file tags */
+ getConfigFiles: function (platform) {
+ var platform_tag = this.doc.find('./platform[@name="' + platform + '"]');
+ var platform_config_files = platform_tag ? platform_tag.findall('config-file') : [];
+
+ var config_files = this.doc.findall('config-file').concat(platform_config_files);
+
+ return config_files.map(function (tag) {
+ var configFile =
+ {
+ target: tag.attrib['target'],
+ parent: tag.attrib['parent'],
+ after: tag.attrib['after'],
+ xmls: tag.getchildren(),
+ // To support demuxing via versions
+ versions: tag.attrib['versions'],
+ deviceTarget: tag.attrib['device-target']
+ };
+ return configFile;
+ });
+ },
+
write: function () {
fs.writeFileSync(this.path, this.doc.write({indent: 4}), 'utf-8');
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[10/12] cordova-common git commit: CB-13380 Updated version and
RELEASENOTES.md for release 2.1.1
Posted by st...@apache.org.
CB-13380 Updated version and RELEASENOTES.md for release 2.1.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/e76dd52f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/e76dd52f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/e76dd52f
Branch: refs/heads/2.1.x
Commit: e76dd52f67f46f93d51ff7fa41df74482019a9e3
Parents: 623039f
Author: Steve Gill <st...@gmail.com>
Authored: Thu Oct 5 12:18:29 2017 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Oct 5 12:18:29 2017 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 4 ++++
package.json | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/e76dd52f/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5dc4460..89593ea 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,10 @@
-->
# Cordova-common Release Notes
+### 2.1.1 (Oct 04, 2017)
+* [CB-13145](https://issues.apache.org/jira/browse/CB-13145) added `getFrameworks` to unit tests
+* [CB-13145](https://issues.apache.org/jira/browse/CB-13145) added variable replacing to framework tag
+
### 2.1.0 (August 30, 2017)
* [CB-13145](https://issues.apache.org/jira/browse/CB-13145) added variable replacing to `framework` tag
* [CB-13211](https://issues.apache.org/jira/browse/CB-13211) Add `allows-arbitrary-loads-for-media` attribute parsing for `getAccesses`
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/e76dd52f/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 91290fd..cd5fa09 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"name": "cordova-common",
"description": "Apache Cordova tools and platforms shared routines",
"license": "Apache-2.0",
- "version": "2.1.1-dev",
+ "version": "2.1.1",
"repository": {
"type": "git",
"url": "https://github.com/apache/cordova-lib"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[05/12] cordova-common git commit: Merge branch 'CB-13145' of
https://github.com/stevengill/cordova-common into CB-13145-steve
Posted by st...@apache.org.
Merge branch 'CB-13145' of https://github.com/stevengill/cordova-common into CB-13145-steve
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/a4216009
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/a4216009
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/a4216009
Branch: refs/heads/CB-13145
Commit: a4216009e7bc7c18bccaff1bf8091d7c72b72aea
Parents: 3af9a17 7f38f6b
Author: Audrey So <au...@apache.org>
Authored: Fri Aug 25 11:52:42 2017 -0700
Committer: Audrey So <au...@apache.org>
Committed: Fri Aug 25 11:52:42 2017 -0700
----------------------------------------------------------------------
spec/ConfigChanges/ConfigChanges.spec.js | 20 +++++++++++++++
spec/ConfigParser/ConfigParser.spec.js | 6 ++++-
spec/fixtures/test-config.xml | 6 +++++
spec/fixtures/test-configfile.xml | 23 ++++++++++++++++++
src/ConfigChanges/ConfigChanges.js | 35 ++++++++++++++++-----------
src/ConfigParser/ConfigParser.js | 23 ++++++++++++++++++
6 files changed, 98 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[11/12] cordova-common git commit: CB-13380 Updated version and
RELEASENOTES.md for release 2.1.1
Posted by st...@apache.org.
CB-13380 Updated version and RELEASENOTES.md for release 2.1.1
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/e76dd52f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/e76dd52f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/e76dd52f
Branch: refs/heads/master
Commit: e76dd52f67f46f93d51ff7fa41df74482019a9e3
Parents: 623039f
Author: Steve Gill <st...@gmail.com>
Authored: Thu Oct 5 12:18:29 2017 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Oct 5 12:18:29 2017 -0700
----------------------------------------------------------------------
RELEASENOTES.md | 4 ++++
package.json | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/e76dd52f/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 5dc4460..89593ea 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,10 @@
-->
# Cordova-common Release Notes
+### 2.1.1 (Oct 04, 2017)
+* [CB-13145](https://issues.apache.org/jira/browse/CB-13145) added `getFrameworks` to unit tests
+* [CB-13145](https://issues.apache.org/jira/browse/CB-13145) added variable replacing to framework tag
+
### 2.1.0 (August 30, 2017)
* [CB-13145](https://issues.apache.org/jira/browse/CB-13145) added variable replacing to `framework` tag
* [CB-13211](https://issues.apache.org/jira/browse/CB-13211) Add `allows-arbitrary-loads-for-media` attribute parsing for `getAccesses`
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/e76dd52f/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 91290fd..cd5fa09 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"name": "cordova-common",
"description": "Apache Cordova tools and platforms shared routines",
"license": "Apache-2.0",
- "version": "2.1.1-dev",
+ "version": "2.1.1",
"repository": {
"type": "git",
"url": "https://github.com/apache/cordova-lib"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[07/12] cordova-common git commit: CB-13231 Incremented package
version to -dev
Posted by st...@apache.org.
CB-13231 Incremented package version to -dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/3d4602af
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/3d4602af
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/3d4602af
Branch: refs/heads/2.1.x
Commit: 3d4602af9c69727fe6cefdb5dbec74fa56ad2b51
Parents: e6d8e6f
Author: Audrey So <au...@apache.org>
Authored: Wed Aug 30 15:07:22 2017 -0700
Committer: Audrey So <au...@apache.org>
Committed: Wed Aug 30 15:07:22 2017 -0700
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/3d4602af/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index a065bb8..91290fd 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"name": "cordova-common",
"description": "Apache Cordova tools and platforms shared routines",
"license": "Apache-2.0",
- "version": "2.1.0",
+ "version": "2.1.1-dev",
"repository": {
"type": "git",
"url": "https://github.com/apache/cordova-lib"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[06/12] cordova-common git commit: CB-13145 : added getFrameworks to
unit test
Posted by st...@apache.org.
CB-13145 : added getFrameworks to unit test
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/1fe84e33
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/1fe84e33
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/1fe84e33
Branch: refs/heads/CB-13145
Commit: 1fe84e338c0687c6e8f2809fbc83bc60dd89a1a3
Parents: a421600
Author: Audrey So <au...@apache.org>
Authored: Fri Aug 25 13:26:40 2017 -0700
Committer: Audrey So <au...@apache.org>
Committed: Fri Aug 25 16:06:30 2017 -0700
----------------------------------------------------------------------
spec/PluginInfo/PluginInfo.spec.js | 27 +++++-
spec/fixtures/plugins/org.test.src/plugin.xml | 102 +++++++++++++++++++++
src/PluginInfo/PluginInfo.js | 2 +-
3 files changed, 127 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/1fe84e33/spec/PluginInfo/PluginInfo.spec.js
----------------------------------------------------------------------
diff --git a/spec/PluginInfo/PluginInfo.spec.js b/spec/PluginInfo/PluginInfo.spec.js
index f35147d..5fdaf87 100644
--- a/spec/PluginInfo/PluginInfo.spec.js
+++ b/spec/PluginInfo/PluginInfo.spec.js
@@ -19,14 +19,22 @@
var PluginInfo = require('../../src/PluginInfo/PluginInfo');
var path = require('path');
-
var pluginsDir = path.join(__dirname, '../fixtures/plugins');
describe('PluginInfo', function () {
it('Test 001 : should read a plugin.xml file', function () {
/* eslint-disable no-unused-vars */
- var p, prefs, assets, deps, configFiles, infos, srcFiles;
- var headerFiles, libFiles, resourceFiles;
+ var p;
+ var prefs;
+ var assets;
+ var deps;
+ var configFiles;
+ var infos;
+ var srcFiles;
+ var headerFiles;
+ var libFiles;
+ var resourceFiles;
+ var getFrameworks;
expect(function () {
p = new PluginInfo(path.join(pluginsDir, 'ChildBrowser'));
prefs = p.getPreferences('android');
@@ -37,6 +45,7 @@ describe('PluginInfo', function () {
srcFiles = p.getSourceFiles('android');
headerFiles = p.getHeaderFiles('android');
libFiles = p.getLibFiles('android');
+ getFrameworks = p.getFrameworks('android');
resourceFiles = p.getResourceFiles('android');
}).not.toThrow();
expect(p).toBeDefined();
@@ -49,4 +58,16 @@ describe('PluginInfo', function () {
new PluginInfo('/non/existent/dir'); /* eslint no-new : 0 */
}).toThrow();
});
+
+ it('Test 003: replace framework src', function () {
+ var p = new PluginInfo(path.join(pluginsDir, 'org.test.src'));
+ 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/1fe84e33/spec/fixtures/plugins/org.test.src/plugin.xml
----------------------------------------------------------------------
diff --git a/spec/fixtures/plugins/org.test.src/plugin.xml b/spec/fixtures/plugins/org.test.src/plugin.xml
new file mode 100644
index 0000000..6d1aa91
--- /dev/null
+++ b/spec/fixtures/plugins/org.test.src/plugin.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:amazon="http://schemas.android.com/apk/lib/com.amazon.device.ads" xmlns:rim="http://www.blackberry.com/ns/widgets" id="phonegap-plugin-push" version="2.0.0">
+ <name>PushPlugin</name>
+ <description>
+ This plugin allows your application to receive push notifications on Android, iOS and Windows devices.
+ Android uses Firebase Cloud Messaging.
+ iOS uses Apple APNS Notifications.
+ Windows uses Microsoft WNS Notifications.
+ </description>
+ <license>MIT</license>
+ <js-module src="www/push.js" name="PushNotification">
+ <clobbers target="PushNotification"/>
+ </js-module>
+ <engines>
+ <engine name="cordova" version=">=7.0.0"/>
+ <engine name="cordova-android" version=">=6.2.1"/>
+ <engine name="cordova-ios" version=">=4.4.0"/>
+ </engines>
+
+ <platform name="android">
+ <feature name="PushNotification">
+ <param name="android-package" value="com.adobe.phonegap.push.PushPlugin"/>
+ </feature>
+ <config-file target="AndroidManifest.xml" parent="/manifest">
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK"/>
+ <uses-permission android:name="android.permission.VIBRATE"/>
+ </config-file>
+ <preference name="FCM_VERSION" default="11.0.1" />
+<config-file target="res/xml/config.xml" parent="/*">
+<string>$FCM_VERSION</string>
+</config-file>
+ <config-file target="AndroidManifest.xml" parent="/manifest/application">
+ <activity android:name="com.adobe.phonegap.push.PushHandlerActivity" android:exported="true" android:permission="${applicationId}.permission.PushHandlerActivity"/>
+ <receiver android:name="com.adobe.phonegap.push.BackgroundActionButtonHandler"/>
+ <receiver android:name="com.adobe.phonegap.push.PushDismissedHandler"/>
+ <service android:name="com.adobe.phonegap.push.FCMService">
+ <intent-filter>
+ <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+ </intent-filter>
+ </service>
+ <service android:name="com.adobe.phonegap.push.PushInstanceIDListenerService">
+ <intent-filter>
+ <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+ </intent-filter>
+ </service>
+ </config-file>
+ <framework src="com.android.support:support-v13:25.1.0"/>
+ <framework src="me.leolin:ShortcutBadger:1.1.17@aar"/>
+ <framework src="com.google.firebase:firebase-messaging:$FCM_VERSION"/>
+ <framework src="push.gradle" custom="true" type="gradleReference"/>
+ <source-file src="src/android/com/adobe/phonegap/push/FCMService.java" target-dir="src/com/adobe/phonegap/push/"/>
+ <source-file src="src/android/com/adobe/phonegap/push/PushConstants.java" target-dir="src/com/adobe/phonegap/push/"/>
+ <source-file src="src/android/com/adobe/phonegap/push/PushHandlerActivity.java" target-dir="src/com/adobe/phonegap/push/"/>
+ <source-file src="src/android/com/adobe/phonegap/push/PushInstanceIDListenerService.java" target-dir="src/com/adobe/phonegap/push/"/>
+ <source-file src="src/android/com/adobe/phonegap/push/PushPlugin.java" target-dir="src/com/adobe/phonegap/push/"/>
+ <source-file src="src/android/com/adobe/phonegap/push/PermissionUtils.java" target-dir="src/com/adobe/phonegap/push/"/>
+ <source-file src="src/android/com/adobe/phonegap/push/BackgroundActionButtonHandler.java" target-dir="src/com/adobe/phonegap/push/"/>
+ <source-file src="src/android/com/adobe/phonegap/push/PushDismissedHandler.java" target-dir="src/com/adobe/phonegap/push/"/>
+ </platform>
+
+ <platform name="browser">
+ <js-module src="www/browser/push.js" name="BrowserPush">
+ <clobbers target="PushNotification"/>
+ </js-module>
+ <asset src="src/browser/ServiceWorker.js" target="ServiceWorker.js"/>
+ <asset src="src/browser/manifest.json" target="manifest.json"/>
+ </platform>
+ <platform name="ios">
+ <config-file target="config.xml" parent="/*">
+ <feature name="PushNotification">
+ <param name="ios-package" value="PushPlugin"/>
+ </feature>
+ </config-file>
+ <config-file target="*-Info.plist" parent="UIBackgroundModes">
+ <array>
+ <string>remote-notification</string>
+ </array>
+ </config-file>
+ <config-file target="*-Debug.plist" parent="aps-environment">
+ <string>development</string>
+ </config-file>
+ <config-file target="*-Release.plist" parent="aps-environment">
+ <string>production</string>
+ </config-file>
+ <source-file src="src/ios/AppDelegate+notification.m"/>
+ <source-file src="src/ios/PushPlugin.m"/>
+ <header-file src="src/ios/AppDelegate+notification.h"/>
+ <header-file src="src/ios/PushPlugin.h"/>
+ <framework src="FirebaseMessaging" type="podspec" spec="~> 2.0.0"/>
+ </platform>
+ <platform name="windows">
+ <hook type="after_plugin_install" src="hooks/windows/setToastCapable.js"/>
+ <js-module src="src/windows/PushPluginProxy.js" name="PushPlugin">
+ <runs/>
+ </js-module>
+ <config-file target="config.xml" parent="/*">
+ <preference name="WindowsToastCapable" value="true"/>
+ </config-file>
+ </platform>
+</plugin>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/1fe84e33/src/PluginInfo/PluginInfo.js
----------------------------------------------------------------------
diff --git a/src/PluginInfo/PluginInfo.js b/src/PluginInfo/PluginInfo.js
index e399488..55227e7 100644
--- a/src/PluginInfo/PluginInfo.js
+++ b/src/PluginInfo/PluginInfo.js
@@ -433,4 +433,4 @@ PluginInfo.PluginInfo = PluginInfo;
PluginInfo.loadPluginsDir = function (dir) {
var PluginInfoProvider = require('./PluginInfoProvider');
return new PluginInfoProvider().getAllWithinSearchPath(dir);
-};
\ No newline at end of file
+};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[08/12] cordova-common git commit: CB-13145: added variable replacing
to framework tag
Posted by st...@apache.org.
CB-13145: added variable replacing to framework tag
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/c38a2209
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/c38a2209
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/c38a2209
Branch: refs/heads/2.1.x
Commit: c38a22093ca60373571b62525d54655a25c26dcf
Parents: 3d4602a
Author: Steve Gill <st...@gmail.com>
Authored: Thu Aug 17 17:18:12 2017 -0700
Committer: Audrey So <au...@apache.org>
Committed: Mon Sep 25 10:49:40 2017 -0700
----------------------------------------------------------------------
src/PluginInfo/PluginInfo.js | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/c38a2209/src/PluginInfo/PluginInfo.js
----------------------------------------------------------------------
diff --git a/src/PluginInfo/PluginInfo.js b/src/PluginInfo/PluginInfo.js
index 4d77cbc..ae003c9 100644
--- a/src/PluginInfo/PluginInfo.js
+++ b/src/PluginInfo/PluginInfo.js
@@ -312,6 +312,12 @@ 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
[09/12] cordova-common git commit: CB-13145 : added getFrameworks to
unit tests
Posted by st...@apache.org.
CB-13145 : added getFrameworks to unit tests
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/623039ff
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/623039ff
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/623039ff
Branch: refs/heads/2.1.x
Commit: 623039ff6ecb6b522dd5d6da10560cbedded8310
Parents: c38a220
Author: Steve Gill <st...@gmail.com>
Authored: Thu Aug 17 17:18:12 2017 -0700
Committer: Audrey So <au...@apache.org>
Committed: Mon Sep 25 10:54:22 2017 -0700
----------------------------------------------------------------------
spec/PluginInfo/PluginInfo.spec.js | 6 ++++++
src/PluginInfo/PluginInfo.js | 1 -
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/623039ff/spec/PluginInfo/PluginInfo.spec.js
----------------------------------------------------------------------
diff --git a/spec/PluginInfo/PluginInfo.spec.js b/spec/PluginInfo/PluginInfo.spec.js
index e7a7c4f..5fdaf87 100644
--- a/spec/PluginInfo/PluginInfo.spec.js
+++ b/spec/PluginInfo/PluginInfo.spec.js
@@ -64,4 +64,10 @@ 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/623039ff/src/PluginInfo/PluginInfo.js
----------------------------------------------------------------------
diff --git a/src/PluginInfo/PluginInfo.js b/src/PluginInfo/PluginInfo.js
index ae003c9..7e9754d 100644
--- a/src/PluginInfo/PluginInfo.js
+++ b/src/PluginInfo/PluginInfo.js
@@ -317,7 +317,6 @@ function PluginInfo (dirname) {
// 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
[04/12] cordova-common git commit: CB-13145: added variable replacing
to framework tag
Posted by st...@apache.org.
CB-13145: added variable replacing to framework tag
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/7f38f6b2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/7f38f6b2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/7f38f6b2
Branch: refs/heads/CB-13145
Commit: 7f38f6b266e683f56eb7ca980fe9fdff405b5f35
Parents: af5c6dc
Author: Steve Gill <st...@gmail.com>
Authored: Thu Aug 17 17:18:12 2017 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Aug 22 18:01:43 2017 -0700
----------------------------------------------------------------------
src/PluginInfo/PluginInfo.js | 27 +++++++++++++++++++++++----
src/PluginManager.js | 2 +-
2 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/7f38f6b2/src/PluginInfo/PluginInfo.js
----------------------------------------------------------------------
diff --git a/src/PluginInfo/PluginInfo.js b/src/PluginInfo/PluginInfo.js
index 75c96c1..4cb5307 100644
--- a/src/PluginInfo/PluginInfo.js
+++ b/src/PluginInfo/PluginInfo.js
@@ -306,15 +306,34 @@ function PluginInfo (dirname) {
return n.attrib.name;
});
};
- self.getFrameworks = function (platform) {
+
+ self.getFrameworks = function (platform, options) {
return _getTags(self._et, 'framework', platform, function (el) {
+ 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
+ Object.keys(vars).forEach(function (name) {
+ if (vars[name]) {
+ regExp = new RegExp('\\$' + name, 'g');
+ src = src.replace(regExp, vars[name]);
+ }
+ });
+ }
var ret = {
itemType: 'framework',
type: el.attrib.type,
parent: el.attrib.parent,
custom: isStrTrue(el.attrib.custom),
embed: isStrTrue(el.attrib.embed),
- src: el.attrib.src,
+ src: src,
spec: el.attrib.spec,
weak: isStrTrue(el.attrib.weak),
versions: el.attrib.versions,
@@ -328,14 +347,14 @@ function PluginInfo (dirname) {
};
self.getFilesAndFrameworks = getFilesAndFrameworks;
- function getFilesAndFrameworks (platform) {
+ function getFilesAndFrameworks (platform, options) {
// Please avoid changing the order of the calls below, files will be
// installed in this order.
var items = [].concat(
self.getSourceFiles(platform),
self.getHeaderFiles(platform),
self.getResourceFiles(platform),
- self.getFrameworks(platform),
+ self.getFrameworks(platform, options),
self.getLibFiles(platform)
);
return items;
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/7f38f6b2/src/PluginManager.js
----------------------------------------------------------------------
diff --git a/src/PluginManager.js b/src/PluginManager.js
index 7b8a0d4..b875d0e 100644
--- a/src/PluginManager.js
+++ b/src/PluginManager.js
@@ -92,7 +92,7 @@ PluginManager.prototype.doOperation = function (operation, plugin, options) {
var actions = new ActionStack();
// gather all files need to be handled during operation ...
- plugin.getFilesAndFrameworks(this.platform)
+ plugin.getFilesAndFrameworks(this.platform, options)
.concat(plugin.getAssets(this.platform))
.concat(plugin.getJsModules(this.platform))
// ... put them into stack ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[12/12] cordova-common git commit: CB-13380 Incremented package
version to -dev
Posted by st...@apache.org.
CB-13380 Incremented package version to -dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-common/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-common/commit/7f4e5d75
Tree: http://git-wip-us.apache.org/repos/asf/cordova-common/tree/7f4e5d75
Diff: http://git-wip-us.apache.org/repos/asf/cordova-common/diff/7f4e5d75
Branch: refs/heads/master
Commit: 7f4e5d75b05042d40cca02adac54de72a5913d7e
Parents: e76dd52
Author: Steve Gill <st...@gmail.com>
Authored: Fri Oct 6 15:28:29 2017 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 6 15:28:29 2017 -0700
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-common/blob/7f4e5d75/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index cd5fa09..ea5b7c7 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"name": "cordova-common",
"description": "Apache Cordova tools and platforms shared routines",
"license": "Apache-2.0",
- "version": "2.1.1",
+ "version": "2.1.2-dev",
"repository": {
"type": "git",
"url": "https://github.com/apache/cordova-lib"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org