diff --git a/bower.json b/bower.json index f9bbbeb..1f0bf6e 100644 --- a/bower.json +++ b/bower.json @@ -2,14 +2,14 @@ "name": "my-addon", "dependencies": { "jquery": "^1.11.1", - "ember": "1.10.0", - "ember-data": "1.0.0-beta.16", - "ember-resolver": "~0.1.14", + "ember": "1.11.0", + "ember-data": "1.0.0-beta.16.1", + "ember-resolver": "~0.1.15", "loader.js": "ember-cli/loader.js#3.2.0", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2", - "ember-qunit": "0.2.8", + "ember-qunit": "0.3.0", "ember-qunit-notifications": "0.0.7", "qunit": "~1.17.1" } diff --git a/package.json b/package.json index d46b715..8d8198d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.0.2", - "ember-cli": "0.2.1", + "ember-cli": "0.2.2", "ember-cli-app-version": "0.3.3", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "0.0.8", @@ -28,8 +28,9 @@ "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.3.9", "ember-cli-uglify": "1.0.1", - "ember-data": "1.0.0-beta.16", - "ember-export-application-global": "^1.0.2" + "ember-data": "1.0.0-beta.16.1", + "ember-export-application-global": "^1.0.2", + "ember-disable-prototype-extensions": "^1.0.0" }, "keywords": [ "ember-addon" diff --git a/tests/dummy/app/router.js b/tests/dummy/app/router.js index cef554b..dce5994 100644 --- a/tests/dummy/app/router.js +++ b/tests/dummy/app/router.js @@ -5,7 +5,5 @@ var Router = Ember.Router.extend({ location: config.locationType }); -Router.map(function() { +export default Router.map(function() { }); - -export default Router;