From 16ea08b8c56fb26678488dc7612101c1230a69f5 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 2 Jan 2017 12:21:49 +0100 Subject: [PATCH] Update Ember to v2.10.0 --- .gitignore | 2 +- .travis.yml | 3 ++- bower.json | 2 +- package.json | 26 +++++++++++++------------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 373de6a2..5ad14dd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See https://help.github.com/ignore-files/ for more about ignoring files. # compiled output /dist diff --git a/.travis.yml b/.travis.yml index bf70627f..de765e96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,8 @@ sudo: false cache: directories: - - node_modules + - $HOME/.npm + - $HOME/.cache # includes bowers cache before_install: - npm config set spin false diff --git a/bower.json b/bower.json index cef9cd12..940b7c83 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "ember-test-selectors", "dependencies": { - "ember": "~2.9.0", + "ember": "~2.10.0", "ember-cli-shims": "0.1.3" } } diff --git a/package.json b/package.json index 824521e6..91c59e69 100644 --- a/package.json +++ b/package.json @@ -2,26 +2,30 @@ "name": "ember-test-selectors", "version": "0.0.5", "description": "Enabling better Test selectors in Ember.js applications.", + "keywords": [ + "ember-addon" + ], + "license": "MIT", + "author": "", "directories": { "doc": "doc", "test": "tests" }, + "repository": "https://github.com/simplabs/ember-test-selectors", "scripts": { "build": "ember build", "lint": "eslint config test-support tests *.js", "start": "ember server", "test": "ember try:each" }, - "repository": "https://github.com/simplabs/ember-test-selectors", - "engines": { - "node": ">= 0.12.0" + "dependencies": { + "ember-cli-babel": "^5.1.7", + "lodash": "^4.0.0" }, - "author": "", - "license": "MIT", "devDependencies": { "broccoli-asset-rev": "^2.4.5", "ember-ajax": "^2.4.1", - "ember-cli": "2.9.1", + "ember-cli": "2.10.0", "ember-cli-app-version": "^2.0.0", "ember-cli-dependency-checker": "^1.3.0", "ember-cli-htmlbars": "^1.0.10", @@ -32,7 +36,7 @@ "ember-cli-sri": "^2.1.0", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.9.0", + "ember-data": "^2.10.0", "ember-disable-prototype-extensions": "^1.1.0", "ember-export-application-global": "^1.0.5", "ember-load-initializers": "^0.5.1", @@ -40,12 +44,8 @@ "eslint": "^3.12.2", "loader.js": "^4.0.10" }, - "keywords": [ - "ember-addon" - ], - "dependencies": { - "ember-cli-babel": "^5.1.7", - "lodash": "^4.0.0" + "engines": { + "node": ">= 0.12.0" }, "ember-addon": { "configPath": "tests/dummy/config",