Merge branch 'release/2.0.4'

DockYard · Dec 4, 2015 · f3f116f · f3f116f
2 parents 3c0e348 + 63c24a0
commit f3f116f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -0,0 +1,3 @@
+{
+  "preset": "ember-suave"
+}
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+- "4.1.2"
 
-sudo: false
+sudo: required
+dist: trusty
 
 cache:
   directories:
@@ -23,7 +24,7 @@ matrix:
 before_install:
   - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - "npm install -g npm@^3"
 
 install:
   - npm install -g bower

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-in-viewport",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Detect if an Ember View or Component is in the viewport @ 60FPS",
   "directories": {
     "doc": "doc",
@@ -34,7 +34,7 @@
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.3",
-    "ember-suave": "1.0.0",
+    "ember-suave": "1.2.3",
     "ember-try": "0.0.6"
   },
   "keywords": [