This is an automated email from the ASF dual-hosted git repository.
bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new 3642ffb CB-13741: Updating checked-in node_modules, otherwise plugin
installation fails
3642ffb is described below
commit 3642ffb57aebf8a3f7a447906f5c63050ac499fd
Author: Joe Bowser <[email protected]>
AuthorDate: Wed Nov 29 13:32:12 2017 -0800
CB-13741: Updating checked-in node_modules, otherwise plugin installation
fails
---
node_modules/abbrev/LICENSE | 31 +++++++++++++++
node_modules/abbrev/package.json | 27 +++++++------
node_modules/android-versions/package.json | 16 ++++----
node_modules/big-integer/BigInteger.d.ts | 5 +++
node_modules/big-integer/BigInteger.js | 44 +++++++++++-----------
node_modules/big-integer/BigInteger.min.js | 2 +-
node_modules/big-integer/package.json | 16 ++++----
node_modules/cordova-common/.travis.yml | 1 +
node_modules/cordova-common/RELEASENOTES.md | 8 ++++
node_modules/cordova-common/appveyor.yml | 1 +
node_modules/cordova-common/package.json | 34 ++++++++---------
.../cordova-common/src/ConfigChanges/ConfigFile.js | 37 ++++++++++++------
.../cordova-common/src/PluginInfo/PluginInfo.js | 5 +++
node_modules/q/CHANGES.md | 8 ++++
node_modules/q/package.json | 22 +++++------
node_modules/q/q.js | 9 +++--
16 files changed, 173 insertions(+), 93 deletions(-)
diff --git a/node_modules/abbrev/LICENSE b/node_modules/abbrev/LICENSE
index 19129e3..9bcfa9d 100644
--- a/node_modules/abbrev/LICENSE
+++ b/node_modules/abbrev/LICENSE
@@ -1,3 +1,8 @@
+This software is dual-licensed under the ISC and MIT licenses.
+You may use this software under EITHER of the following licenses.
+
+----------
+
The ISC License
Copyright (c) Isaac Z. Schlueter and Contributors
@@ -13,3 +18,29 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+----------
+
+Copyright Isaac Z. Schlueter and Contributors
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/node_modules/abbrev/package.json b/node_modules/abbrev/package.json
index 9fadf3e..d5a9ebc 100644
--- a/node_modules/abbrev/package.json
+++ b/node_modules/abbrev/package.json
@@ -14,19 +14,19 @@
]
],
"_from": "abbrev@>=1.0.0 <2.0.0",
- "_id": "[email protected]",
+ "_id": "[email protected]",
"_inCache": true,
"_location": "/abbrev",
- "_nodeVersion": "8.0.0-pre",
+ "_nodeVersion": "8.5.0",
"_npmOperationalInternal": {
- "host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/abbrev-1.1.0.tgz_1487054000015_0.9229173036292195"
+ "host": "s3://npm-registry-packages",
+ "tmp": "tmp/abbrev-1.1.1.tgz_1506566833068_0.05750026390887797"
},
"_npmUser": {
"name": "isaacs",
"email": "[email protected]"
},
- "_npmVersion": "4.3.0",
+ "_npmVersion": "5.4.2",
"_phantomChildren": {},
"_requested": {
"raw": "abbrev@1",
@@ -40,8 +40,8 @@
"_requiredBy": [
"/nopt"
],
- "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";,
- "_shasum": "d0554c2256636e2f56e7c2e5ad183f859428d81f",
+ "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";,
+ "_shasum": "f8f2c887ad10bf67f634f005b6987fed3179aac8",
"_shrinkwrap": null,
"_spec": "abbrev@1",
"_where": "/Users/jbowser/cordova/cordova-android/node_modules/nopt",
@@ -59,18 +59,23 @@
},
"directories": {},
"dist": {
- "shasum": "d0554c2256636e2f56e7c2e5ad183f859428d81f",
- "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
+ "integrity":
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+ "shasum": "f8f2c887ad10bf67f634f005b6987fed3179aac8",
+ "tarball": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
},
"files": [
"abbrev.js"
],
- "gitHead": "7136d4d95449dc44115d4f78b80ec907724f64e0",
+ "gitHead": "a9ee72ebc8fe3975f1b0c7aeb3a8f2a806a432eb",
"homepage": "https://github.com/isaacs/abbrev-js#readme";,
"license": "ISC",
"main": "abbrev.js",
"maintainers": [
{
+ "name": "gabra",
+ "email": "[email protected]"
+ },
+ {
"name": "isaacs",
"email": "[email protected]"
}
@@ -88,5 +93,5 @@
"preversion": "npm test",
"test": "tap test.js --100"
},
- "version": "1.1.0"
+ "version": "1.1.1"
}
diff --git a/node_modules/android-versions/package.json
b/node_modules/android-versions/package.json
index e47f424..564f2a5 100644
--- a/node_modules/android-versions/package.json
+++ b/node_modules/android-versions/package.json
@@ -2,18 +2,18 @@
"_args": [
[
{
- "raw": "android-versions@^1.2.0",
+ "raw": "android-versions@^1.2.1",
"scope": null,
"escapedName": "android-versions",
"name": "android-versions",
- "rawSpec": "^1.2.0",
- "spec": ">=1.2.0 <2.0.0",
+ "rawSpec": "^1.2.1",
+ "spec": ">=1.2.1 <2.0.0",
"type": "range"
},
"/Users/jbowser/cordova/cordova-android"
]
],
- "_from": "android-versions@>=1.2.0 <2.0.0",
+ "_from": "android-versions@>=1.2.1 <2.0.0",
"_id": "[email protected]",
"_inCache": true,
"_location": "/android-versions",
@@ -29,12 +29,12 @@
"_npmVersion": "5.4.0",
"_phantomChildren": {},
"_requested": {
- "raw": "android-versions@^1.2.0",
+ "raw": "android-versions@^1.2.1",
"scope": null,
"escapedName": "android-versions",
"name": "android-versions",
- "rawSpec": "^1.2.0",
- "spec": ">=1.2.0 <2.0.0",
+ "rawSpec": "^1.2.1",
+ "spec": ">=1.2.1 <2.0.0",
"type": "range"
},
"_requiredBy": [
@@ -43,7 +43,7 @@
"_resolved":
"https://registry.npmjs.org/android-versions/-/android-versions-1.2.1.tgz";,
"_shasum": "3f50baf693e73a512c3c5403542291cead900063",
"_shrinkwrap": null,
- "_spec": "android-versions@^1.2.0",
+ "_spec": "android-versions@^1.2.1",
"_where": "/Users/jbowser/cordova/cordova-android",
"author": {
"name": "dvoiss"
diff --git a/node_modules/big-integer/BigInteger.d.ts
b/node_modules/big-integer/BigInteger.d.ts
index 3cd4c0e..d70e401 100644
--- a/node_modules/big-integer/BigInteger.d.ts
+++ b/node_modules/big-integer/BigInteger.d.ts
@@ -346,6 +346,11 @@ declare namespace bigInt {
* Converts a bigInt to a string.
*/
toString(radix?: number): string;
+
+ /**
+ * Converts a bigInt to a string. This method is called behind the
scenes in JSON.stringify.
+ */
+ toJSON(): string;
/**
* Converts a bigInt to a native Javascript number. This override
allows you to use native
diff --git a/node_modules/big-integer/BigInteger.js
b/node_modules/big-integer/BigInteger.js
index 8ba8843..9a65a5f 100644
--- a/node_modules/big-integer/BigInteger.js
+++ b/node_modules/big-integer/BigInteger.js
@@ -873,7 +873,7 @@ var bigInt = (function (undefined) {
};
var powersOfTwo = [1];
- while (powersOfTwo[powersOfTwo.length - 1] <= BASE) powersOfTwo.push(2 *
powersOfTwo[powersOfTwo.length - 1]);
+ while (2 * powersOfTwo[powersOfTwo.length - 1] <= BASE) powersOfTwo.push(2
* powersOfTwo[powersOfTwo.length - 1]);
var powers2Length = powersOfTwo.length, highestPower2 =
powersOfTwo[powers2Length - 1];
function shift_isSmall(n) {
@@ -920,31 +920,29 @@ var bigInt = (function (undefined) {
var xSign = x.isNegative(), ySign = y.isNegative();
var xRem = xSign ? x.not() : x,
yRem = ySign ? y.not() : y;
- var xBits = [], yBits = [];
- var xStop = false, yStop = false;
- while (!xStop || !yStop) {
- if (xRem.isZero()) { // virtual sign extension for simulating
two's complement
- xStop = true;
- xBits.push(xSign ? 1 : 0);
+ var xDigit = 0, yDigit = 0;
+ var xDivMod = null, yDivMod = null;
+ var result = [];
+ while (!xRem.isZero() || !yRem.isZero()) {
+ xDivMod = divModAny(xRem, highestPower2);
+ xDigit = xDivMod[1].toJSNumber();
+ if (xSign) {
+ xDigit = highestPower2 - 1 - xDigit; // two's complement for
negative numbers
}
- else if (xSign) xBits.push(xRem.isEven() ? 1 : 0); // two's
complement for negative numbers
- else xBits.push(xRem.isEven() ? 0 : 1);
- if (yRem.isZero()) {
- yStop = true;
- yBits.push(ySign ? 1 : 0);
+ yDivMod = divModAny(yRem, highestPower2);
+ yDigit = yDivMod[1].toJSNumber();
+ if (ySign) {
+ yDigit = highestPower2 - 1 - yDigit; // two's complement for
negative numbers
}
- else if (ySign) yBits.push(yRem.isEven() ? 1 : 0);
- else yBits.push(yRem.isEven() ? 0 : 1);
- xRem = xRem.over(2);
- yRem = yRem.over(2);
+ xRem = xDivMod[0];
+ yRem = yDivMod[0];
+ result.push(fn(xDigit, yDigit));
}
- var result = [];
- for (var i = 0; i < xBits.length; i++) result.push(fn(xBits[i],
yBits[i]));
- var sum =
bigInt(result.pop()).negate().times(bigInt(2).pow(result.length));
- while (result.length) {
- sum =
sum.add(bigInt(result.pop()).times(bigInt(2).pow(result.length)));
+ var sum = fn(xSign ? 1 : 0, ySign ? 1 : 0) !== 0 ? bigInt(-1) :
bigInt(0);
+ for (var i = result.length - 1; i >= 0; i -= 1) {
+ sum = sum.multiply(highestPower2).add(bigInt(result[i]));
}
return sum;
}
@@ -1023,8 +1021,8 @@ var bigInt = (function (undefined) {
a = parseValue(a);
b = parseValue(b);
var low = min(a, b), high = max(a, b);
- var range = high.subtract(low);
- if (range.isSmall) return low.add(Math.round(Math.random() * range));
+ var range = high.subtract(low).add(1);
+ if (range.isSmall) return low.add(Math.floor(Math.random() * range));
var length = range.value.length - 1;
var result = [], restricted = true;
for (var i = length; i >= 0; i--) {
diff --git a/node_modules/big-integer/BigInteger.min.js
b/node_modules/big-integer/BigInteger.min.js
index 99ea9fb..a868e44 100644
--- a/node_modules/big-integer/BigInteger.min.js
+++ b/node_modules/big-integer/BigInteger.min.js
@@ -1 +1 @@
-var bigInt=function(undefined){"use strict";var
BASE=1e7,LOG_BASE=7,MAX_INT=9007199254740992,MAX_INT_ARR=smallToArray(MAX_INT),LOG_MAX_INT=Math.log(MAX_INT);function
Integer(v,radix){if(typeof v==="undefined")return Integer[0];if(typeof
radix!=="undefined")return+radix===10?parseValue(v):parseBase(v,radix);return
parseValue(v)}function
BigInteger(value,sign){this.value=value;this.sign=sign;this.isSmall=false}BigInteger.prototype=Object.create(Integer.prototype);function
SmallInteger(valu [...]
\ No newline at end of file
+var bigInt=function(undefined){"use strict";var
BASE=1e7,LOG_BASE=7,MAX_INT=9007199254740992,MAX_INT_ARR=smallToArray(MAX_INT),LOG_MAX_INT=Math.log(MAX_INT);function
Integer(v,radix){if(typeof v==="undefined")return Integer[0];if(typeof
radix!=="undefined")return+radix===10?parseValue(v):parseBase(v,radix);return
parseValue(v)}function
BigInteger(value,sign){this.value=value;this.sign=sign;this.isSmall=false}BigInteger.prototype=Object.create(Integer.prototype);function
SmallInteger(valu [...]
\ No newline at end of file
diff --git a/node_modules/big-integer/package.json
b/node_modules/big-integer/package.json
index ef26cbe..bfe5744 100644
--- a/node_modules/big-integer/package.json
+++ b/node_modules/big-integer/package.json
@@ -14,13 +14,13 @@
]
],
"_from": "big-integer@>=1.6.7 <2.0.0",
- "_id": "[email protected]",
+ "_id": "[email protected]",
"_inCache": true,
"_location": "/big-integer",
"_nodeVersion": "6.10.3",
"_npmOperationalInternal": {
"host": "s3://npm-registry-packages",
- "tmp": "tmp/big-integer-1.6.25.tgz_1504748727289_0.9231066561769694"
+ "tmp": "tmp/big-integer-1.6.26.tgz_1510889021794_0.842821853235364"
},
"_npmUser": {
"name": "peterolson",
@@ -40,8 +40,8 @@
"_requiredBy": [
"/bplist-parser"
],
- "_resolved":
"https://registry.npmjs.org/big-integer/-/big-integer-1.6.25.tgz";,
- "_shasum": "1de45a9f57542ac20121c682f8d642220a34e823",
+ "_resolved":
"https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz";,
+ "_shasum": "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8",
"_shrinkwrap": null,
"_spec": "big-integer@^1.6.7",
"_where":
"/Users/jbowser/cordova/cordova-android/node_modules/bplist-parser",
@@ -72,13 +72,13 @@
},
"directories": {},
"dist": {
- "shasum": "1de45a9f57542ac20121c682f8d642220a34e823",
- "tarball":
"https://registry.npmjs.org/big-integer/-/big-integer-1.6.25.tgz";
+ "shasum": "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8",
+ "tarball":
"https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz";
},
"engines": {
"node": ">=0.6"
},
- "gitHead": "a0c10d68aae8f5df56a67b3e3eb353b428abf170",
+ "gitHead": "b1c6e0e95eca0a0d19ebbb9cc81ec492448a9e8a",
"homepage": "https://github.com/peterolson/BigInteger.js#readme";,
"keywords": [
"math",
@@ -111,5 +111,5 @@
"test": "tsc && node_modules/.bin/karma start my.conf.js && node
spec/tsDefinitions.js"
},
"typings": "./BigInteger.d.ts",
- "version": "1.6.25"
+ "version": "1.6.26"
}
diff --git a/node_modules/cordova-common/.travis.yml
b/node_modules/cordova-common/.travis.yml
index 459273a..4592c3e 100644
--- a/node_modules/cordova-common/.travis.yml
+++ b/node_modules/cordova-common/.travis.yml
@@ -5,6 +5,7 @@ git:
node_js:
- "4"
- "6"
+ - "8"
install:
- npm install
- npm install -g codecov
diff --git a/node_modules/cordova-common/RELEASENOTES.md
b/node_modules/cordova-common/RELEASENOTES.md
index 5dc4460..faf7524 100644
--- a/node_modules/cordova-common/RELEASENOTES.md
+++ b/node_modules/cordova-common/RELEASENOTES.md
@@ -20,6 +20,14 @@
-->
# Cordova-common Release Notes
+### 2.2.0 (Nov 22, 2017)
+* [CB-13471](https://issues.apache.org/jira/browse/CB-13471) File Provider fix
belongs in cordova-common
+* [CB-11244](https://issues.apache.org/jira/browse/CB-11244) Spot fix for
upcoming `cordova-android@7` changes.
https://github.com/apache/cordova-android/pull/389
+
+### 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`
diff --git a/node_modules/cordova-common/appveyor.yml
b/node_modules/cordova-common/appveyor.yml
index 94714f2..ffe5194 100644
--- a/node_modules/cordova-common/appveyor.yml
+++ b/node_modules/cordova-common/appveyor.yml
@@ -5,6 +5,7 @@ environment:
matrix:
- nodejs_version: "4"
- nodejs_version: "6"
+ - nodejs_version: "8"
install:
- ps: Install-Product node $env:nodejs_version
diff --git a/node_modules/cordova-common/package.json
b/node_modules/cordova-common/package.json
index 3ac0c10..43b5548 100644
--- a/node_modules/cordova-common/package.json
+++ b/node_modules/cordova-common/package.json
@@ -2,48 +2,48 @@
"_args": [
[
{
- "raw": "cordova-common@^2.1.0",
+ "raw": "cordova-common@^2.2.0",
"scope": null,
"escapedName": "cordova-common",
"name": "cordova-common",
- "rawSpec": "^2.1.0",
- "spec": ">=2.1.0 <3.0.0",
+ "rawSpec": "^2.2.0",
+ "spec": ">=2.2.0 <3.0.0",
"type": "range"
},
"/Users/jbowser/cordova/cordova-android"
]
],
- "_from": "cordova-common@>=2.1.0 <3.0.0",
- "_id": "[email protected]",
+ "_from": "cordova-common@>=2.2.0 <3.0.0",
+ "_id": "[email protected]",
"_inCache": true,
"_location": "/cordova-common",
"_nodeVersion": "6.6.0",
"_npmOperationalInternal": {
"host": "s3://npm-registry-packages",
- "tmp": "tmp/cordova-common-2.1.0.tgz_1504306462859_0.04064799007028341"
+ "tmp": "tmp/cordova-common-2.2.0.tgz_1511807085778_0.6969101736322045"
},
"_npmUser": {
- "name": "audreyso",
- "email": "[email protected]"
+ "name": "stevegill",
+ "email": "[email protected]"
},
"_npmVersion": "4.6.1",
"_phantomChildren": {},
"_requested": {
- "raw": "cordova-common@^2.1.0",
+ "raw": "cordova-common@^2.2.0",
"scope": null,
"escapedName": "cordova-common",
"name": "cordova-common",
- "rawSpec": "^2.1.0",
- "spec": ">=2.1.0 <3.0.0",
+ "rawSpec": "^2.2.0",
+ "spec": ">=2.2.0 <3.0.0",
"type": "range"
},
"_requiredBy": [
"/"
],
- "_resolved":
"https://registry.npmjs.org/cordova-common/-/cordova-common-2.1.0.tgz";,
- "_shasum": "bb357ee1b9825031ed9db3c56b592efe973d1640",
+ "_resolved":
"https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.0.tgz";,
+ "_shasum": "0d00f5bcd2bc6c7d06b1ddc0328aea3fe38bcf07",
"_shrinkwrap": null,
- "_spec": "cordova-common@^2.1.0",
+ "_spec": "cordova-common@^2.2.0",
"_where": "/Users/jbowser/cordova/cordova-android",
"author": {
"name": "Apache Software Foundation"
@@ -84,8 +84,8 @@
},
"directories": {},
"dist": {
- "shasum": "bb357ee1b9825031ed9db3c56b592efe973d1640",
- "tarball":
"https://registry.npmjs.org/cordova-common/-/cordova-common-2.1.0.tgz";
+ "shasum": "0d00f5bcd2bc6c7d06b1ddc0328aea3fe38bcf07",
+ "tarball":
"https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.0.tgz";
},
"engines": {
"node": ">=4.0.0"
@@ -144,5 +144,5 @@
"jasmine": "jasmine JASMINE_CONFIG_PATH=spec/support/jasmine.json",
"test": "npm run eslint && npm run jasmine"
},
- "version": "2.1.0"
+ "version": "2.2.0"
}
diff --git a/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js
b/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js
index a4a7331..ec4a28a 100644
--- a/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js
+++ b/node_modules/cordova-common/src/ConfigChanges/ConfigFile.js
@@ -184,16 +184,34 @@ function resolveConfigFilePath (project_dir, platform,
file) {
return filepath;
}
- // special-case config.xml target that is just "config.xml". This should
be resolved to the real location of the file.
- // TODO: move the logic that contains the locations of config.xml from
cordova CLI into plugman.
+ // XXX this checks for android studio projects
+ // only if none of the options above are satisfied does this get called
+ // TODO: Move this out of cordova-common and into the platforms somehow
+ if (platform === 'android' && !fs.existsSync(filepath)) {
+ if (file === 'AndroidManifest.xml') {
+ filepath = path.join(project_dir, 'app', 'src', 'main',
'AndroidManifest.xml');
+ } else if (file.endsWith('config.xml')) {
+ filepath = path.join(project_dir, 'app', 'src', 'main', 'res',
'xml', 'config.xml');
+ } else if (file.endsWith('strings.xml')) {
+ // Plugins really shouldn't mess with strings.xml, since it's able
to be localized
+ filepath = path.join(project_dir, 'app', 'src', 'main', 'res',
'values', 'strings.xml');
+ } else if (file.match(/res\/xml/)) {
+ // Catch-all for all other stored XML configuration in legacy
plugins
+ var config_file = path.basename(file);
+ filepath = path.join(project_dir, 'app', 'src', 'main', 'res',
'xml', config_file);
+ }
+ return filepath;
+ }
+
+ // special-case config.xml target that is just "config.xml" for other
platforms. This should
+ // be resolved to the real location of the file.
+ // TODO: Move this out of cordova-common into platforms
if (file === 'config.xml') {
if (platform === 'ubuntu') {
filepath = path.join(project_dir, 'config.xml');
} else if (platform === 'ios') {
- var iospath = getIOSProjectname(project_dir);
+ var iospath = module.exports.getIOSProjectname(project_dir);
filepath = path.join(project_dir, iospath, 'config.xml');
- } else if (platform === 'android') {
- filepath = path.join(project_dir, 'res', 'xml', 'config.xml');
} else {
matches = modules.glob.sync(path.join(project_dir, '**',
'config.xml'));
if (matches.length) filepath = matches[0];
@@ -201,12 +219,6 @@ function resolveConfigFilePath (project_dir, platform,
file) {
return filepath;
}
- // XXX this checks for android studio projects
- // only if none of the options above are satisfied does this get called
- if (platform === 'android' && !fs.existsSync(filepath)) {
- filepath = path.join(project_dir, 'app', 'src', 'main', 'res', 'xml',
'config.xml');
- }
-
// None of the special cases matched, returning project_dir/file.
return filepath;
}
@@ -240,3 +252,6 @@ function isBinaryPlist (filename) {
}
module.exports = ConfigFile;
+module.exports.isBinaryPlist = isBinaryPlist;
+module.exports.getIOSProjectname = getIOSProjectname;
+module.exports.resolveConfigFilePath = resolveConfigFilePath;
diff --git a/node_modules/cordova-common/src/PluginInfo/PluginInfo.js
b/node_modules/cordova-common/src/PluginInfo/PluginInfo.js
index 4d77cbc..7e9754d 100644
--- a/node_modules/cordova-common/src/PluginInfo/PluginInfo.js
+++ b/node_modules/cordova-common/src/PluginInfo/PluginInfo.js
@@ -312,6 +312,11 @@ 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
diff --git a/node_modules/q/CHANGES.md b/node_modules/q/CHANGES.md
index 2d845a3..766fcdc 100644
--- a/node_modules/q/CHANGES.md
+++ b/node_modules/q/CHANGES.md
@@ -1,3 +1,11 @@
+
+## 1.5.1
+
+ - Q.any now annotates its error message to clarify that Q.any was involved and
+ includes only the last error emitted. (Ivan Etchart)
+ - Avoid domain.dispose during tests in preparation for Node.js 9. (Anna
+ Henningsen)
+
## 1.5.0
- Q.any gives an error message from the last rejected promise
diff --git a/node_modules/q/package.json b/node_modules/q/package.json
index 9253651..4110a74 100644
--- a/node_modules/q/package.json
+++ b/node_modules/q/package.json
@@ -14,19 +14,19 @@
]
],
"_from": "q@>=1.4.1 <2.0.0",
- "_id": "[email protected]",
+ "_id": "[email protected]",
"_inCache": true,
"_location": "/q",
- "_nodeVersion": "6.9.5",
+ "_nodeVersion": "0.10.32",
"_npmOperationalInternal": {
- "host": "packages-18-east.internal.npmjs.com",
- "tmp": "tmp/q-1.5.0.tgz_1490148893963_0.4695124195422977"
+ "host": "s3://npm-registry-packages",
+ "tmp": "tmp/q-1.5.1.tgz_1508435736930_0.7891315249726176"
},
"_npmUser": {
"name": "kriskowal",
"email": "[email protected]"
},
- "_npmVersion": "3.10.10",
+ "_npmVersion": "2.14.2",
"_phantomChildren": {},
"_requested": {
"raw": "q@^1.4.1",
@@ -41,8 +41,8 @@
"/",
"/cordova-common"
],
- "_resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz";,
- "_shasum": "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1",
+ "_resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz";,
+ "_shasum": "7e32f75b41381291d04611f1bf14109ac00651d7",
"_shrinkwrap": null,
"_spec": "q@^1.4.1",
"_where": "/Users/jbowser/cordova/cordova-android",
@@ -88,8 +88,8 @@
"test": "./spec"
},
"dist": {
- "shasum": "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1",
- "tarball": "https://registry.npmjs.org/q/-/q-1.5.0.tgz";
+ "shasum": "7e32f75b41381291d04611f1bf14109ac00651d7",
+ "tarball": "https://registry.npmjs.org/q/-/q-1.5.1.tgz";
},
"engines": {
"node": ">=0.6.0",
@@ -100,7 +100,7 @@
"q.js",
"queue.js"
],
- "gitHead": "4fecabe07ff9f3683a3d4548e7f81c2aba693326",
+ "gitHead": "c2f5a6f35456389a806acca50bfd929cbe30c4cb",
"homepage": "https://github.com/kriskowal/q";,
"keywords": [
"q",
@@ -151,5 +151,5 @@
"test": "npm ls -s && jasmine-node spec && promises-aplus-tests
spec/aplus-adapter && npm run -s lint",
"test-browser": "opener spec/q-spec.html"
},
- "version": "1.5.0"
+ "version": "1.5.1"
}
diff --git a/node_modules/q/q.js b/node_modules/q/q.js
index 14dc24a..6e46795 100644
--- a/node_modules/q/q.js
+++ b/node_modules/q/q.js
@@ -1645,9 +1645,12 @@ function any(promises) {
function onRejected(err) {
pendingCount--;
if (pendingCount === 0) {
- err.message = ("Q can't get fulfillment value from any
promise, all " +
- "promises were rejected. Last error message: " +
err.message);
- deferred.reject(err);
+ var rejection = err || new Error("" + err);
+
+ rejection.message = ("Q can't get fulfillment value from any
promise, all " +
+ "promises were rejected. Last error message: " +
rejection.message);
+
+ deferred.reject(rejection);
}
}
function onProgress(progress) {
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
