Update to ember 3.7

mdehoog · Feb 1, 2019 · dfa52b8 · dfa52b8
1 parent 94894c1
commit dfa52b8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 /node_modules/
 
 # misc
+/.env*
 /.sass-cache
 /connect.lock
 /coverage/

diff --git a/.npmignore b/.npmignore
@@ -9,6 +9,7 @@
 /.bowerrc
 /.editorconfig
 /.ember-cli
+/.env*
 /.eslintignore
 /.eslintrc.js
 /.gitignore

diff --git a/.travis.yml b/.travis.yml
@@ -44,8 +44,7 @@ jobs:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
     - stage: "Additional Tests"
-      env: EMBER_TRY_SCENARIO=ember-lts-2.16
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.18
+      env: EMBER_TRY_SCENARIO=ember-lts-2.18
     - env: EMBER_TRY_SCENARIO=ember-lts-3.4
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta

diff --git a/README.md b/README.md
@@ -11,6 +11,12 @@ supported with has-many/belongs-to relationships.
 This addon provides a way to query has-many and belongs-to relationships. Currently the `DS.RESTAdapter` and the
 `DS.JSONAPIAdapter` are supported.
 
+## Compatibility
+
+* Ember.js v2.18 or above
+* Ember CLI v2.13 or above
+
+
 ## Installation
 
 `ember install ember-data-has-many-query`

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -10,18 +10,6 @@ module.exports = function() {
   ]).then((urls) => {
     return {
       scenarios: [
-        {
-          name: 'ember-lts-2.16',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.16.0'
-            }
-          }
-        },
         {
           name: 'ember-lts-2.18',
           env: {

diff --git a/package.json b/package.json
@@ -29,12 +29,14 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.1.2"
+    "ember-cli-babel": "^7.1.2",
+    "ember-cli-update": "^0.29.2",
+    "global": "^4.3.2"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.6.3",
     "broccoli-asset-rev": "^2.7.0",
-    "ember-cli": "~3.6.1",
+    "ember-cli": "~3.7.1",
     "ember-cli-dependency-checker": "^3.0.0",
     "ember-cli-eslint": "^4.2.3",
     "ember-cli-htmlbars": "^3.0.0",
@@ -51,7 +53,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^3.4.1",
     "ember-resolver": "^5.0.1",
-    "ember-source": "~3.6.0",
+    "ember-source": "~3.7.0",
     "ember-source-channel-url": "^1.1.0",
     "ember-try": "^1.0.0",
     "eslint-plugin-ember": "^5.2.0",