Merge pull request #83 from MyPureCloud/ember2.11

Upgrade addon to Ember 2.11

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist

.travis.yml

@@ -1,19 +1,22 @@
 ---
 language: node_js
 node_js:
-  - "6.9.1"
+  - "6.9.5"
 
 sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache #includes bowers cache
 
 env:
   - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=ember-lts-2.8
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
+  - EMBER_TRY_SCENARIO=default
 
 matrix:
   fast_finish: true
@@ -23,10 +26,9 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
   - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version
 
 install:
   - npm install
@@ -35,4 +37,4 @@ install:
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

bower.json

@@ -1,20 +1,6 @@
 {
   "name": "fixtable-ember",
-  "version": "1.3.1",
-  "homepage": "https://github.com/MyPureCloud/fixtable-ember",
-  "authors": [
-    "Interactive Intelligence"
-  ],
-  "description": "Ember wrapper for the Fixtable table library",
-  "keywords": [
-    "data",
-    "table",
-    "fixtable"
-  ],
-  "license": "MIT",
   "dependencies": {
-    "ember": "~2.9.0",
-    "ember-cli-shims": "^0.1.3",
-    "fixtable": "^1.3.11"
+    "fixtable": "^1.3.12"
   }
 }

config/ember-try.js

@@ -1,6 +1,12 @@
 /*jshint node:true*/
 module.exports = {
   scenarios: [
+    {
+      name: 'default',
+      bower: {
+        dependencies: {}
+      }
+    },
     {
       name: 'ember-1.13',
       bower: {
@@ -23,6 +29,17 @@ module.exports = {
         }
       }
     },
+    {
+      name: 'ember-lts-2.8',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-8'
+        },
+        resolutions: {
+          'ember': 'lts-2-8'
+        }
+      }
+    },
     {
       name: 'ember-release',
       bower: {

package.json

@@ -16,7 +16,7 @@
     "url": "https://github.com/MyPureCloud/fixtable-ember.git"
   },
   "engines": {
-    "node": ">= 6.9.1"
+    "node": ">= 6.9.x"
   },
   "author": "Interactive Intelligence",
   "contributors": [
@@ -28,22 +28,24 @@
     "broccoli-funnel": "^1.0.8",
     "broccoli-merge-trees": "^1.1.4",
     "ember-ajax": "^2.5.2",
-    "ember-cli": "~2.9.1",
+    "ember-cli": "^2.11.0",
     "ember-cli-app-version": "^2.0.1",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-jshint": "^2.0.1",
     "ember-cli-qunit": "^3.0.2",
-    "ember-cli-release": "^1.0.0-beta.2",
+    "ember-cli-release": "^0.2.9",
     "ember-cli-sass": "5.6.0",
+    "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.9.0",
+    "ember-data": "^2.11.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
+    "ember-load-initializers": "^0.6.0",
     "ember-resolver": "^2.0.3",
+    "ember-source": "^2.11.0",
     "loader.js": "^4.0.10"
   },
   "keywords": [
@@ -54,7 +56,7 @@
   ],
   "dependencies": {
     "ember-cli-babel": "^5.1.7",
-    "ember-cli-htmlbars": "^1.0.10",
+    "ember-cli-htmlbars": "^1.1.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.3",
     "ember-truth-helpers": "1.2.0",
     "font-awesome": "^4.7.0"

tests/dummy/config/environment.js

@@ -12,7 +12,7 @@ module.exports = function(environment) {
         // e.g. 'with-controller': true
       },
       EXTEND_PROTOTYPES: {
-        // Prevent Ember Data from overriding Date.parse
+        // Prevent Ember Data from overriding Date.parse.
         Date: false
       }
     },