Support Ember 2.17 and 2.18

ember-cli · Jun 2, 2018 · 3c9c056 · 3c9c056
1 parent c607ed4
commit 3c9c056
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/app/services/dependency-resolver.js b/app/services/dependency-resolver.js
@@ -5,8 +5,8 @@ import { task, timeout } from 'ember-concurrency';
 
 const { computed, inject, RSVP, testing } = Ember;
 
-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'];
-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'];
+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'];
+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'];
 
 const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/;
 

diff --git a/blueprints/twiddle.json b/blueprints/twiddle.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.13.1",
+  "version": "0.14.0",
   "EmberENV": {
     "FEATURES": {}
   },
@@ -8,12 +8,12 @@
     "enable-testing": false
   },
   "dependencies": {
-    "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js",
-    "ember": "2.16.2",
-    "ember-template-compiler": "2.16.2",
-    "ember-testing": "2.16.2"
+    "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js",
+    "ember": "2.18.2",
+    "ember-template-compiler": "2.18.2",
+    "ember-testing": "2.18.2"
   },
   "addons": {
-    "ember-data": "2.16.3"
+    "ember-data": "2.18.2"
   }
 }
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-twiddle",
-  "version": "0.13.1",
+  "version": "0.14.0",
   "dependencies": {
     "jquery": "1.11.3",
     "bootstrap-sass": "~3.3.5",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-twiddle",
-  "version": "0.13.1",
+  "version": "0.14.0",
   "description": "https://ember-twiddle.com",
   "private": true,
   "directories": {