Auto merge of #106 - DockYard:update-ember-cli, r=poteto

Update ember-cli to 2.4.2 None
DockYard · Mar 7, 2016 · 075b2d5 · 075b2d5
2 parents e94f2ad + f277d7f
commit 075b2d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.npmignore b/.npmignore
@@ -13,4 +13,4 @@
 .travis.yml
 bower.json
 ember-cli-build.js
-testem.json
+testem.js
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-composable-helpers",
   "dependencies": {
-    "ember": "~2.3.1",
+    "ember": "~2.4.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0"

diff --git a/package.json b/package.json
@@ -27,15 +27,15 @@
     "broccoli-asset-rev": "^2.2.0",
     "chai": "^3.5.0",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.3.0",
+    "ember-cli": "2.4.2",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-htmlbars": "^1.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.3.1",
     "ember-cli-qunit": "^1.2.1",
     "ember-cli-release": "0.2.8",
-    "ember-cli-sri": "^2.0.0",
+    "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",

diff --git a/testem.json → testem.js b/testem.json → testem.js
@@ -1,4 +1,5 @@
-{
+/*jshint node:true*/
+module.exports = {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
@@ -8,4 +9,4 @@
   "launch_in_dev": [
     "Chrome"
   ]
-}
+};