You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by GitBox <gi...@apache.org> on 2018/06/18 19:21:29 UTC
[GitHub] brodybits closed pull request #155: 4.2.4 patch update
brodybits closed pull request #155: 4.2.4 patch update
URL: https://github.com/apache/cordova-js/pull/155
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/.travis.yml b/.travis.yml
index 9ee45d0b..c78a48fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,13 +12,7 @@ install:
- cd ..
- git clone https://github.com/apache/cordova-android --depth 10
- git clone https://github.com/apache/cordova-ios --depth 10
- - git clone https://github.com/apache/cordova-blackberry --depth 10
- git clone https://github.com/apache/cordova-windows --depth 10
- - git clone https://github.com/apache/cordova-wp8 --depth 10
- - git clone https://github.com/apache/cordova-firefoxos --depth 10
- - git clone https://github.com/apache/cordova-ubuntu --depth 10
- git clone https://github.com/apache/cordova-browser --depth 10
- - git clone https://github.com/apache/cordova-amazon-fireos --depth 10
- - git clone https://github.com/apache/cordova-webos --depth 10
- cd cordova-js
- npm install
diff --git a/Gruntfile.js b/Gruntfile.js
index ebf9a19a..75ca9fda 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -21,31 +21,19 @@ module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
compile: {
- "amazon-fireos": {},
"android": {},
- "blackberry10": {},
"ios": {},
"osx": {},
"test": {},
"windows": { useWindowsLineEndings: true },
- "wp8": { useWindowsLineEndings: true },
- "firefoxos": {},
- "webos": {},
- "ubuntu": {},
"browser": {}
},
"compile-browserify": {
- "amazon-fireos": {},
"android": {},
- "blackberry10": {},
"ios": {},
"osx": {},
"test": {},
"windows": { useWindowsLineEndings: true },
- "wp8": { useWindowsLineEndings: true },
- "firefoxos": {},
- "webos": {},
- "ubuntu": {},
"browser": {}
},
clean: ['pkg'],
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 50056df7..8ed9962b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,11 @@
-->
## Release Notes for Cordova JS ##
+### 4.2.4 (Jun 18, 2018)
+
+* [CB-9366](https://issues.apache.org/jira/browse/CB-9366) Log error.stack
+* Drop support for old platforms
+
### 4.2.3 (Jun 18, 2018)
* [CB-13501](https://issues.apache.org/jira/browse/CB-13501) add support for node 8
diff --git a/appveyor.yml b/appveyor.yml
index f44dffe4..2e650ba4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,19 +9,14 @@ environment:
install:
- ps: Install-Product node $env:nodejs_version
- - npm -g install npm
+ - npm -g install npm@5 # QUICK FIX for Node.js 4.x
- set PATH=%APPDATA%\npm;%PATH%
- cd ..
- git clone https://github.com/apache/cordova-android --depth 10
- git clone https://github.com/apache/cordova-ios --depth 10
- - git clone https://github.com/apache/cordova-blackberry --depth 10
- git clone https://github.com/apache/cordova-windows --depth 10
- - git clone https://github.com/apache/cordova-wp8 --depth 10
- - git clone https://github.com/apache/cordova-ubuntu --depth 10
- git clone https://github.com/apache/cordova-browser --depth 10
- - git clone https://github.com/apache/cordova-amazon-fireos --depth 10
- - git clone https://github.com/apache/cordova-webos --depth 10
- cd cordova-js
- npm install --msvs_version=2013
diff --git a/package.json b/package.json
index 9ba1f562..bcd80e09 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"engines": {
"node": ">=4.0.0"
},
- "version": "4.2.3",
+ "version": "4.2.5-dev",
"homepage": "http://cordova.apache.org",
"repository": {
"type": "git",
@@ -79,7 +79,7 @@
"grunt": "^1.0.1",
"grunt-contrib-clean": "^1.0.0",
"istanbul": "^0.4.5",
- "jasmine-node": "1.14.5",
+ "jasmine-node": "github:brodybits/jasmine-node#1.15.0-rc1",
"jsdom-no-contextify": "^3.1.0",
"mkdirp": "^0.5.0",
"open": "0.0.5"
@@ -90,14 +90,8 @@
"cordova-platforms": {
"cordova-android": "../cordova-android",
"cordova-ios": "../cordova-ios",
- "cordova-blackberry10": "../cordova-blackberry",
- "cordova-firefoxos": "../cordova-firefoxos",
- "cordova-ubuntu": "../cordova-ubuntu",
- "cordova-amazon-fireos": "../cordova-amazon-fireos",
- "cordova-wp8": "../cordova-wp8",
"cordova-windows": "../cordova-windows",
"cordova-osx": "../cordova-osx",
- "cordova-browser": "../cordova-browser",
- "cordova-webos": "../cordova-webos"
+ "cordova-browser": "../cordova-browser"
}
}
diff --git a/src/cordova.js b/src/cordova.js
index 6297c4e8..09d3451a 100644
--- a/src/cordova.js
+++ b/src/cordova.js
@@ -227,6 +227,7 @@ var cordova = {
} catch (err) {
var msg = 'Error in ' + (isSuccess ? 'Success' : 'Error') + ' callbackId: ' + callbackId + ' : ' + err;
console && console.log && console.log(msg);
+ console && console.log && err.stack && console.log(err.stack);
cordova.fireWindowEvent('cordovacallbackerror', { 'message': msg });
throw err;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org