brodybits closed pull request #153: cordova-js@4.x cleanup
URL: https://github.com/apache/cordova-js/pull/153
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 e56b78ea..9ee45d0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,12 @@ language: node_js
sudo: false
git:
depth: 10
+
node_js:
- "4"
- "6"
- "8"
+
install:
- cd ..
- git clone https://github.com/apache/cordova-android --depth 10
diff --git a/Gruntfile.js b/Gruntfile.js
index e2f8df27..ebf9a19a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -49,17 +49,10 @@ module.exports = function(grunt) {
"browser": {}
},
clean: ['pkg'],
- jshint: {
- options: {
- jshintrc: '.jshintrc',
- },
- src: ['src/**/*.js']
- },
});
// external tasks
grunt.loadNpmTasks('grunt-contrib-clean');
- grunt.loadNpmTasks('grunt-contrib-jshint');
// custom tasks
grunt.loadTasks('tasks');
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6bfa48f8..7b80e3d2 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,9 @@
-->
## Release Notes for Cordova JS ##
+### 4.2.3-dev (Oct 30, 2017)
+* [CB-13501](https://issues.apache.org/jira/browse/CB-13501) : added support for node 8
+
### 4.2.2 (Oct 04, 2017)
* [CB-12017](https://issues.apache.org/jira/browse/CB-12017) updated dependencies for `Browserify`
* [CB-12762](https://issues.apache.org/jira/browse/CB-12762) point `package.json` repo items to github mirrors instead of apache repos
diff --git a/appveyor.yml b/appveyor.yml
index f44dffe4..1cfae870 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ 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 ..
diff --git a/package.json b/package.json
index c08188a5..3e486fb8 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"engines": {
"node": ">=4.0.0"
},
- "version": "4.2.3-dev",
+ "version": "4.2.4-dev",
"homepage": "http://cordova.apache.org",
"repository": {
"type": "git",
@@ -78,7 +78,6 @@
"eslint-plugin-standard": "^3.0.1",
"grunt": "^1.0.1",
"grunt-contrib-clean": "^1.0.0",
- "grunt-contrib-jshint": "^1.0.0",
"istanbul": "^0.4.5",
"jasmine-node": "1.14.5",
"jsdom-no-contextify": "^3.1.0",
----------------------------------------------------------------
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