Skip to content

Commit 3c9c056

Browse files
committed
Support Ember 2.17 and 2.18
1 parent c607ed4 commit 3c9c056

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

app/services/dependency-resolver.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { task, timeout } from 'ember-concurrency';
55

66
const { computed, inject, RSVP, testing } = Ember;
77

8-
const EMBER_VERSIONS = ['2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0', '2.11.2', '2.10.2', '2.9.1', '2.8.2', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2'];
9-
const EMBER_DATA_VERSIONS = ['2.16.3', '2.15.3', '2.14.10', '2.13.2', '2.12.2', '2.11.3', '2.10.0', '2.9.0', '2.8.1', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15'];
8+
const EMBER_VERSIONS = ['2.18.2', '2.17.2', '2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0', '2.11.2', '2.10.2', '2.9.1', '2.8.2', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2'];
9+
const EMBER_DATA_VERSIONS = ['2.18.2', '2.17.1', '2.16.3', '2.15.3', '2.14.10', '2.13.2', '2.12.2', '2.11.3', '2.10.0', '2.9.0', '2.8.1', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15'];
1010

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

blueprints/twiddle.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.13.1",
2+
"version": "0.14.0",
33
"EmberENV": {
44
"FEATURES": {}
55
},
@@ -8,12 +8,12 @@
88
"enable-testing": false
99
},
1010
"dependencies": {
11-
"jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js",
12-
"ember": "2.16.2",
13-
"ember-template-compiler": "2.16.2",
14-
"ember-testing": "2.16.2"
11+
"jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js",
12+
"ember": "2.18.2",
13+
"ember-template-compiler": "2.18.2",
14+
"ember-testing": "2.18.2"
1515
},
1616
"addons": {
17-
"ember-data": "2.16.3"
17+
"ember-data": "2.18.2"
1818
}
1919
}

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-twiddle",
3-
"version": "0.13.1",
3+
"version": "0.14.0",
44
"dependencies": {
55
"jquery": "1.11.3",
66
"bootstrap-sass": "~3.3.5",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-twiddle",
3-
"version": "0.13.1",
3+
"version": "0.14.0",
44
"description": "https://ember-twiddle.com",
55
"private": true,
66
"directories": {

0 commit comments

Comments
 (0)