diff --git a/.travis.yml b/.travis.yml index 8197d316..1ec00a2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ cache: env: - EMBER_TRY_SCENARIO=default + - EMBER_TRY_SCENARIO=ember-1.10 + - EMBER_TRY_SCENARIO=ember-1.11 - EMBER_TRY_SCENARIO=ember-release - EMBER_TRY_SCENARIO=ember-beta - EMBER_TRY_SCENARIO=ember-canary diff --git a/bower.json b/bower.json index 6b925aa5..fc71fc7b 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,9 @@ { "name": "ember-resize", "dependencies": { - "ember": "1.12.0", + "ember": "beta", "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.17", "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4", "ember-qunit": "0.3.3", "ember-qunit-notifications": "0.0.7", @@ -12,5 +11,8 @@ "jquery": "^1.11.1", "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1" + }, + "resolutions": { + "ember": "beta" } -} \ No newline at end of file +} diff --git a/config/ember-try.js b/config/ember-try.js index 83dab0f1..82ba365b 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -4,6 +4,24 @@ module.exports = { name: 'default', dependencies: { } }, + { + name: 'ember-1.10', + dependencies: { + ember: '~1.10.0' + }, + resolutions: { + ember: '~1.10.0' + } + }, + { + name: 'ember-1.11', + dependencies: { + ember: '~1.11.0' + }, + resolutions: { + ember: '~1.11.0' + } + }, { name: 'ember-release', dependencies: {