Skip to content

Commit de5dd10

Browse files
committed
deprecate versions prior to Ember 2.16 (#690)
* deprecate versions prior to Ember 2.16 * fix test
1 parent bba960a commit de5dd10

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

app/services/dependency-resolver.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const {
1414
testing
1515
} = Ember;
1616

17-
const EMBER_VERSIONS = ['3.14.3', '3.13.4', '3.12.2', '3.11.1', '3.10.2', '3.9.1', '3.8.3', '3.7.3', '3.6.1', '3.5.1', '3.4.3', '3.3.2', '3.2.2', '3.1.4', '3.0.0', '2.18.2', '2.17.2', '2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0'];
18-
const EMBER_DATA_VERSIONS = ['3.14.1', '3.13.2', '3.12.5', '3.11.5', '3.10.0', '3.9.3', '3.8.1', '3.7.0', '3.6.0', '3.5.2', '3.4.2', '3.3.2', '3.2.2', '3.1.2', '3.0.4', '2.18.5', '2.17.1', '2.16.4', '2.15.3', '2.14.10', '2.13.2', '2.12.2'];
17+
const EMBER_VERSIONS = ['3.14.3', '3.13.4', '3.12.2', '3.11.1', '3.10.2', '3.9.1', '3.8.3', '3.7.3', '3.6.1', '3.5.1', '3.4.3', '3.3.2', '3.2.2', '3.1.4', '3.0.0', '2.18.2', '2.17.2', '2.16.2'];
18+
const EMBER_DATA_VERSIONS = ['3.14.1', '3.13.2', '3.12.5', '3.11.5', '3.10.0', '3.9.3', '3.8.1', '3.7.0', '3.6.0', '3.5.2', '3.4.2', '3.3.2', '3.2.2', '3.1.2', '3.0.4', '2.18.5', '2.17.1', '2.16.4'];
1919

2020
const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/;
2121

@@ -163,11 +163,11 @@ export default Service.extend({
163163
return deprecatedUrl;
164164
}
165165

166-
if (compareVersions(version, '2.12.0') === -1) {
167-
const msg = 'Versions of Ember prior to 2.12.0 are no longer supported in Ember Twiddle';
166+
if (compareVersions(version, '2.16.0') === -1) {
167+
const msg = 'Versions of Ember prior to 2.16.0 are no longer supported in Ember Twiddle';
168168
deprecate(msg, testing, {
169-
id: 'ember-twiddle.deprecate-ember-versions-before-2-12',
170-
until: '0.16.0',
169+
id: 'ember-twiddle.deprecate-ember-versions-before-2-16',
170+
until: '0.17.0',
171171
});
172172
this.notify.warning(msg);
173173

tests/acceptance/dependency-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ module('Acceptance | dependencies', function(hooks) {
113113
await click(findContains('.test-set-ember-data-version', '2.16.4'));
114114

115115
await click('.versions-menu .dropdown-toggle');
116-
await click(findContains('.test-set-ember-version', '2.15.3'));
116+
await click(findContains('.test-set-ember-version', '2.18.2'));
117117

118118
await waitForLoadedIFrame();
119-
assert.equal(outputContents('.ember-version'), '2.15.3');
119+
assert.equal(outputContents('.ember-version'), '2.18.2');
120120
assert.equal(outputContents('.ember-data-version'), '2.16.4');
121121
});
122122
});

0 commit comments

Comments
 (0)