From 306d47529227fc1de6a86e48074c194a9322086b Mon Sep 17 00:00:00 2001 From: cibernox Date: Sat, 21 Jan 2017 19:24:49 +0000 Subject: [PATCH] Update to latest 2.11 beta --- .travis.yml | 2 +- LICENSE.md | 2 +- config/ember-try.js | 15 +++++---------- package.json | 7 ++++--- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccc47e2a5..567415dbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,4 +40,4 @@ install: script: # Usually, it's ok to finish the test scenario without reverting # to the addon's original dependency state, skipping "cleanup". - - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup + - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup diff --git a/LICENSE.md b/LICENSE.md index 02000b56e..0d5e3ef36 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016 +Copyright (c) 2017 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/config/ember-try.js b/config/ember-try.js index 1f957bb35..a4da0b049 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -5,8 +5,7 @@ module.exports = { name: 'ember-lts-2.4', bower: { dependencies: { - 'ember': 'components/ember#lts-2-4', - 'ember-cli-shims': '0.1.3' + 'ember': 'components/ember#lts-2-4' }, resolutions: { 'ember': 'lts-2-4' @@ -22,8 +21,7 @@ module.exports = { name: 'ember-lts-2.8', bower: { dependencies: { - 'ember': 'components/ember#lts-2-8', - 'ember-cli-shims': '0.1.3' + 'ember': 'components/ember#lts-2-8' }, resolutions: { 'ember': 'lts-2-8' @@ -39,8 +37,7 @@ module.exports = { name: 'ember-release', bower: { dependencies: { - 'ember': 'components/ember#release', - 'ember-cli-shims': '0.1.3' + 'ember': 'components/ember#release' }, resolutions: { 'ember': 'release' @@ -56,8 +53,7 @@ module.exports = { name: 'ember-beta', bower: { dependencies: { - 'ember': 'components/ember#beta', - 'ember-cli-shims': '0.1.3' + 'ember': 'components/ember#beta' }, resolutions: { 'ember': 'beta' @@ -73,8 +69,7 @@ module.exports = { name: 'ember-canary', bower: { dependencies: { - 'ember': 'components/ember#canary', - 'ember-cli-shims': '0.1.3' + 'ember': 'components/ember#canary' }, resolutions: { 'ember': 'canary' diff --git a/package.json b/package.json index fb2e8fc5d..1e0cd22b7 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "devDependencies": { "broccoli-asset-rev": "^2.4.5", "ember-ajax": "^2.4.1", - "ember-cli": "^2.11.0-beta.1", + "ember-cli": "^2.11.0-beta.2", "ember-cli-app-version": "^2.0.0", "ember-cli-blueprint-test-helpers": "0.14.0", "ember-cli-dependency-checker": "^1.3.0", @@ -47,12 +47,13 @@ "ember-cli-mirage": "0.2.4", "ember-cli-qunit": "^3.0.1", "ember-cli-release": "1.0.0-beta.2", + "ember-cli-shims": "^1.0.0", "ember-cli-sass": "^6.0.0", "ember-cli-template-lint": "0.4.12", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", "ember-code-snippet": "1.8.0", - "ember-data": "^2.11.0-beta.1", + "ember-data": "^2.11.0", "ember-disable-prototype-extensions": "^1.1.0", "ember-export-application-global": "^1.0.5", "ember-fastboot-test-helpers": "0.1.1", @@ -60,7 +61,7 @@ "ember-load-initializers": "^0.6.0", "ember-pagefront": "0.10.10", "ember-resolver": "^2.0.3", - "ember-source": "^2.11.0-beta.2", + "ember-source": "^2.11.0-beta.8", "eslint-plugin-ember-suave": "^1.0.0", "liquid-fire": "0.26.7", "loader.js": "^4.0.10",