Skip to content

Commit

Permalink
fix: upgrade ember
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-north committed Aug 22, 2018
1 parent da4c662 commit e191fed
Show file tree
Hide file tree
Showing 8 changed files with 7,393 additions and 13,200 deletions.
15 changes: 8 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "4"
- "8"

sudo: false
dist: trusty
Expand All @@ -10,8 +10,7 @@ addons:
chrome: stable

cache:
directories:
- $HOME/.npm
yarn: true

env:
global:
Expand All @@ -35,13 +34,15 @@ matrix:
allow_failures:
- env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary

install:
- yarn install --no-lockfile --non-interactive

before_install:
- npm config set spin false
- npm install -g npm@4
- npm --version
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

script:
- npm run lint:js
- yarn lint:js
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
Expand Down
4 changes: 1 addition & 3 deletions app/initializers/resize.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Ember from 'ember';
import ResizeService from 'ember-resize/services/resize';
import config from '../config/environment';

const { getWithDefault } = Ember;
import { getWithDefault } from '@ember/object';

export function initialize() {
let application = arguments[1] || arguments[0];
Expand Down
1 change: 1 addition & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module.exports = function() {
getChannelURL('canary')
]).then((urls) => {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.12',
Expand Down
10 changes: 0 additions & 10 deletions ember-resize.sublime-project

This file was deleted.

Loading

0 comments on commit e191fed

Please sign in to comment.