Merge pull request #2 from vojtasvoboda/feature/update

Update libs
gwa · Mar 28, 2017 · 6bb5cd1 · 6bb5cd1
2 parents 1eaa9d2 + 5ac4497
commit 6bb5cd1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -47,23 +47,6 @@
     "<",
     "<="
   ],
-  "disallowLeftStickedOperators": [
-    "?",
-    "+",
-    "-",
-    "/",
-    "*",
-    "=",
-    "==",
-    "===",
-    "!=",
-    "!==",
-    ">",
-    ">=",
-    "<",
-    "<="
-  ],
-  "requireRightStickedOperators": ["!"],
   "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
   "requireSpaceBeforeBinaryOperators": [
@@ -96,10 +79,5 @@
   "disallowTrailingWhitespace": true,
   "disallowKeywordsOnNewLine": ["else"],
   "requireLineFeedAtFileEnd": true,
-  "requireDotNotation": true,
-  "validateJSDoc": {
-    "checkParamNames": true,
-    "checkRedundantParams": true,
-    "requireParamTypes": true
-  }
+  "requireDotNotation": true
 }
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,7 +1,7 @@
 module.exports = function(grunt) {
 
 	// Project configuration.
-	grunt.initConfig({
+	grunt.config.init({
 
 		pkg: grunt.file.readJSON('package.json'),
 
@@ -13,7 +13,7 @@ module.exports = function(grunt) {
 
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
-	grunt.loadNpmTasks('grunt-jscs-checker');
+	grunt.loadNpmTasks('grunt-jscs');
 
 	grunt.registerTask(
 		'default',

diff --git a/package.json b/package.json
@@ -12,9 +12,9 @@
   },
   "homepage": "https://github.com/gwa/jflickrfeed",
   "devDependencies": {
-    "grunt": "^0.4.4",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-jscs-checker": "^0.4.1",
-    "grunt-contrib-uglify": "^0.4.0"
+    "grunt": "^1.0.1",
+    "grunt-contrib-jshint": "^1.1.0",
+    "grunt-jscs": "^3.0.1",
+    "grunt-contrib-uglify": "^2.2.0"
   }
 }