Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
build: Update dev dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Krinkle committed Aug 19, 2016
1 parent 7e65d5d commit b63decb
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 21 deletions.
1 change: 1 addition & 0 deletions .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"disallowYodaConditions": true,
"requireBlocksOnNewline": 1,
"requireCamelCaseOrUpperCaseIdentifiers": true,
"requireVarDeclFirst": null,
"requireMultipleVarDecl": true,
"validateIndentation": "\t",
"validateLineBreaks": "LF",
Expand Down
9 changes: 0 additions & 9 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-jscs');

grunt.initConfig({
Expand Down Expand Up @@ -45,18 +44,10 @@ module.exports = function (grunt) {
banner: '/*! jQuery JSON plugin v<%= pkg.version %> | github.com/Krinkle/jquery-json */\n'
}
}
},
watch: {
files: [
'.{jscsrc,jshintignore,jshintrc}',
'<%= jshint.all %>'
],
tasks: 'test'
}
});

grunt.registerTask('lint', ['jshint', 'jscs']);
grunt.registerTask('build', ['lint', 'uglify']);
grunt.registerTask('test', ['build', 'connect', 'qunit']);
grunt.registerTask('default', 'test');
};
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright 2009-2011 Brantley Harris
Copyright 2010–2014 Timo Tijhof
Copyright 2010–2016 Timo Tijhof

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
16 changes: 7 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,13 @@
],
"main": "./src/jquery.json.js",
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-connect": "0.10.1",
"grunt-contrib-jshint": "0.11.2",
"grunt-contrib-qunit": "0.7.0",
"grunt-contrib-uglify": "0.9.1",
"grunt-contrib-watch": "0.6.1",
"grunt-jscs": "1.6.0",
"grunt": "1.0.1",
"grunt-contrib-connect": "1.0.2",
"grunt-contrib-jshint": "1.0.0",
"grunt-contrib-qunit": "1.2.0",
"grunt-contrib-uglify": "2.0.0",
"grunt-jscs": "3.0.1",
"jquery": "1.11.2",
"qunitjs": "1.18.0"
"qunitjs": "2.0.1"
}
}
4 changes: 2 additions & 2 deletions src/jquery.json.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* https://github.com/Krinkle/jquery-json
*
* @author Brantley Harris, 2009-2011
* @author Timo Tijhof, 2011-2014
* @author Timo Tijhof, 2011-2016
* @source This plugin is heavily influenced by MochiKit's serializeJSON, which is
* copyrighted 2005 by Bob Ippolito.
* @source Brantley Harris wrote this plugin. It is based somewhat on the JSON.org
* website's http://www.json.org/json2.js, which proclaims:
* "NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.", a sentiment that
* I uphold.
* @license MIT License <http://opensource.org/licenses/MIT>
* @license MIT License <https://opensource.org/licenses/MIT>
*/
(function (factory) {
if (typeof define === 'function' && define.amd) {
Expand Down

0 comments on commit b63decb

Please sign in to comment.