diff --git a/.travis.yml b/.travis.yml index ea56186c..934e0446 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,15 @@ +sudo: false + language: node_js + node_js: - - "0.8" - "0.10" - - "0.11" -before_install: - - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28' - - npm install -g npm@latest + - "4" + - "5" + +install: - npm install -g grunt-cli + - npm install + +matrix: + fast_finish: true diff --git a/Gruntfile.js b/Gruntfile.js index 63ed5d3e..3a5efa19 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -215,13 +215,9 @@ module.exports = function(grunt) { } }); - // These plugins provide necessary tasks. - grunt.loadNpmTasks("grunt-contrib-clean"); - grunt.loadNpmTasks("grunt-contrib-concat"); - grunt.loadNpmTasks("grunt-contrib-copy"); - grunt.loadNpmTasks("grunt-contrib-jshint"); - grunt.loadNpmTasks("grunt-contrib-watch"); - grunt.loadNpmTasks("grunt-include-replace"); + // Load any grunt plugins found in package.json. + require("load-grunt-tasks")(grunt, {scope: "devDependencies"}); + require("time-grunt")(grunt); // Load custom tasks grunt.loadTasks("tasks"); diff --git a/package.json b/package.json index 92375710..1fd8e7ec 100644 --- a/package.json +++ b/package.json @@ -31,16 +31,18 @@ }, "devDependencies": { "grunt": "~0.4.5", - "grunt-contrib-clean": "~0.6.0", + "grunt-contrib-clean": "~0.7.0", "grunt-contrib-concat": "~0.5.1", "grunt-contrib-copy": "~0.8.0", "grunt-contrib-jshint": "~0.11.0", "grunt-contrib-watch": "~0.6.1", - "grunt-include-replace": "~3.0.0", + "grunt-include-replace": "~3.2.0", + "load-grunt-tasks": "~3.4.0", + "time-grunt": "~1.3.0", "yuitest": "~0.7.9" }, "engines": { - "node": ">=0.8.0" + "node": ">=0.10.0" }, "directories": { "test": "tests"