Merge pull request #484 from palantir/fix-build

Update npm dependencies, fix build on master
palantir · Jul 1, 2015 · 98365d5 · 98365d5
2 parents 508137a + 49cca2c
commit 98365d5
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 10 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -24,17 +24,19 @@
     "underscore.string": "~2.3.3"
   },
   "devDependencies": {
-    "chai": "~1.7.2",
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1.9",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-concat": "~0.5.0",
-    "grunt-jscs": "~1.8.0",
-    "grunt-mocha-test": "~0.6.2",
+    "chai": "^3.0.0",
+    "grunt": "^0.4.5",
+    "grunt-cli": "^0.1.9",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-concat": "^0.5.1",
+    "grunt-jscs": "^1.8.0",
+    "grunt-mocha-test": "^0.12.7",
     "grunt-run": "^0.3.0",
-    "grunt-ts": "~4.1.0",
-    "grunt-tslint": "~2.0.0",
+    "grunt-ts": "^4.1.0",
+    "grunt-tslint": "^2.3.1-beta",
+    "mocha": "^2.2.5",
+    "tslint": "^2.3.1-beta",
     "typescript": "1.5.0-beta"
   },
-  "license": "Apache 2.0"
+  "license": "Apache-2.0"
 }