From e83bf78f9be69a6dcedd5a7e16402c6b874efceb Mon Sep 17 00:00:00 2001
From: Kelly Selden <kellyselden@gmail.com>
Date: Wed, 8 Jul 2015 18:54:32 -0400
Subject: [PATCH] 1.13.0

---
 Brocfile.js                   | 20 --------------------
 app/templates/application.hbs |  2 +-
 bower.json                    | 10 +++++-----
 ember-cli-build.js            | 23 +++++++++++++++++++++++
 package.json                  | 14 ++++++++------
 tests/.jshintrc               |  5 +++--
 tests/helpers/start-app.js    |  1 -
 7 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100644 Brocfile.js
 create mode 100644 ember-cli-build.js

diff --git a/Brocfile.js b/Brocfile.js
deleted file mode 100644
index a69fc99..0000000
--- a/Brocfile.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/* global require, module */
-
-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-
-var app = new EmberApp();
-
-// Use `app.import` to add additional libraries to the generated
-// output files.
-//
-// If you need to use different assets in different
-// environments, specify an object as the first parameter. That
-// object's keys should be the environment name and the values
-// should be the asset to use in that environment.
-//
-// If the library that you are including contains AMD or ES6
-// modules that you would like to import into your application
-// please specify an object with the list of modules as keys
-// along with the exports of each module as its value.
-
-module.exports = app.toTree();
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 05eb936..94df915 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -1,3 +1,3 @@
 <h2 id="title">Welcome to Ember.js</h2>
 
-{{outlet}}
+{{outlet}}
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 6bcad38..387cdde 100644
--- a/bower.json
+++ b/bower.json
@@ -1,14 +1,14 @@
 {
   "name": "my-app",
   "dependencies": {
-    "ember": "1.12.0",
+    "ember": "1.13.3",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "ember-data": "1.13.5",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"
diff --git a/ember-cli-build.js b/ember-cli-build.js
new file mode 100644
index 0000000..a0c0b84
--- /dev/null
+++ b/ember-cli-build.js
@@ -0,0 +1,23 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  // Use `app.import` to add additional libraries to the generated
+  // output files.
+  //
+  // If you need to use different assets in different
+  // environments, specify an object as the first parameter. That
+  // object's keys should be the environment name and the values
+  // should be the asset to use in that environment.
+  //
+  // If the library that you are including contains AMD or ES6
+  // modules that you would like to import into your application
+  // please specify an object with the list of modules as keys
+  // along with the exports of each module as its value.
+
+  return app.toTree();
+};
diff --git a/package.json b/package.json
index 883666e..26af924 100644
--- a/package.json
+++ b/package.json
@@ -20,17 +20,19 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.7",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "1.13.0",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-babel": "^5.0.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.13",
+    "ember-cli-qunit": "0.3.15",
+    "ember-cli-release": "0.2.3",
     "ember-cli-uglify": "^1.0.1",
-    "ember-data": "1.0.0-beta.18",
+    "ember-data": "1.13.5",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2"
   }
diff --git a/tests/.jshintrc b/tests/.jshintrc
index ea8b88f..6ec0b7c 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -26,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -47,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 16cc7c3..0f7aab1 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {