Support Ember 3.6

.circleci/config.yml

@@ -21,9 +21,9 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "package.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
+            - v1-dependencies-{{ checksum "package.json" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
       - run:
           name: Install Packages
           command: npm install
@@ -126,6 +126,24 @@ jobs:
           name: Run Tests
           command: ./node_modules/.bin/ember try:one ember-3.2 --skip-cleanup=true
 
+  test_3_4:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: Run Tests
+          command: ./node_modules/.bin/ember try:one ember-3.4 --skip-cleanup=true
+
+  test_3_6:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: Run Tests
+          command: ./node_modules/.bin/ember try:one ember-3.6 --skip-cleanup=true
+
   test_release:
     <<: *defaults
     steps:
@@ -135,7 +153,6 @@ jobs:
           name: Run Tests
           command: ./node_modules/.bin/ember try:one ember-release --skip-cleanup=true
 
-
   test_beta:
     <<: *defaults
     steps:
@@ -189,6 +206,12 @@ workflows:
       - test_3_2:
           requires:
             - setup_environment
+      - test_3_4:
+          requires:
+            - setup_environment
+      - test_3_6:
+          requires:
+            - setup_environment
       - test_release:
           requires:
             - setup_environment

addon/utils/get-mutable-attributes.js

@@ -1,16 +1,21 @@
 import Ember from 'ember';
-import emberVersionInfo from './ember-version-info';
+import semver from 'semver';
 
-const { major, minor, isGlimmer } = emberVersionInfo();
+// Glimmer starts from v2.10
+const isGlimmer = semver.gte(Ember.VERSION, '2.10.0');
 
 let getMutValue;
 
 if (isGlimmer) {
-  // The module location changed since v3.2
-  let libPath =
-    major > 3 || (major == 3 && minor >= 2)
-      ? 'ember-views/lib/compat/attrs'
-      : 'ember-views/compat/attrs';
+  // The module location before v3.2
+  let libPath = 'ember-views/compat/attrs';
+
+  if (semver.gte(Ember.VERSION, '3.6.0')) {
+    libPath = '@ember/-internals/views/lib/compat/attrs';
+  } else if (semver.gte(Ember.VERSION, '3.2.0')) {
+    libPath = 'ember-views/lib/compat/attrs';
+  }
+
   const { MUTABLE_CELL } = Ember.__loader.require(libPath);
   getMutValue = value => {
     if (value && value[MUTABLE_CELL]) {

addon/utils/has-block.js

@@ -1,12 +1,13 @@
 import Ember from 'ember';
-import emberVersionInfo from './ember-version-info';
+import semver from 'semver';
 
-const { major, minor, isGlimmer } = emberVersionInfo();
+// Glimmer starts from v2.10
+const isGlimmer = semver.gte(Ember.VERSION, '2.10.0');
 
 let hasBlockSymbol;
 
 try {
-  if (major > 3 || (major == 3 && minor >= 1)) {
+  if (semver.gte(Ember.VERSION, '3.1.0')) {
     // Ember-glimmer moved to TypeScript since v3.1
     // Do nothing since the symbol is not exported
   } else if (isGlimmer) {

config/ember-try.js

@@ -90,6 +90,22 @@ module.exports = {
         },
       },
     },
+    {
+      name: 'ember-3.4',
+      npm: {
+        devDependencies: {
+          'ember-source': '~3.4.0',
+        },
+      },
+    },
+    {
+      name: 'ember-3.6',
+      npm: {
+        devDependencies: {
+          'ember-source': '~3.6.0',
+        },
+      },
+    },
     {
       name: 'ember-release',
       bower: {

package.json

@@ -50,7 +50,7 @@
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.0.0",
-    "ember-sinon": "0.5.0",
+    "ember-sinon": "3.1.0",
     "ember-source": "~2.15.0",
     "eslint": "^4.11.0",
     "eslint-config-prettier": "^2.7.0",
@@ -66,7 +66,8 @@
     "ember-auto-import": "^1.0.1",
     "ember-cli-babel": "^6.3.0",
     "react": "^15.5.4 || ^16.0.0",
-    "react-dom": "^15.5.4 || ^16.0.0"
+    "react-dom": "^15.5.4 || ^16.0.0",
+    "semver": "^6.0.0"
   },
   "peerDependencies": {
     "react": "^15.5.4 || ^16.0.0",