Skip to content

Commit

Permalink
Merge pull request #4 from Oreoz/update-dependencies
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
Oreoz authored Aug 11, 2017
2 parents f464f01 + 100e93e commit 62f9ce0
Show file tree
Hide file tree
Showing 6 changed files with 6,039 additions and 33 deletions.
21 changes: 11 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ language: node_js
sudo: false

node_js:
- '6'
- "4"

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

env:
- EMBER_TRY_SCENARIO=ember-lts-2.4
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
Expand All @@ -18,18 +18,19 @@ env:
matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-canary

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

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

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

notifications:
email: false
Expand Down
18 changes: 5 additions & 13 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
module.exports = {
scenarios: [
{
name: 'ember-lts-2.4',
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-4'
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-4'
'ember': 'lts-2-8'
}
},
npm: {
Expand All @@ -18,18 +18,10 @@ module.exports = {
}
},
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-8'
}
},
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': null
'ember-source': '~2.12.0'
}
}
},
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-vertical-timeline",
"version": "0.0.8",
"version": "0.0.9",
"description": "An ember wrapper for the Vertical Timeline initially created by CodyHouse",
"keywords": [
"ember-addon",
Expand Down Expand Up @@ -32,7 +32,7 @@
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0",
"ember-cli": "~2.14.0",
"ember-cli": "~2.14.2",
"ember-cli-autoprefixer": "^0.7.0",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "^3.0.0",
Expand All @@ -48,11 +48,11 @@
"ember-in-viewport": "^2.1.1",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-source": "~2.13.0",
"ember-source": "~2.14.1",
"loader.js": "^4.2.3"
},
"engines": {
"node": ">= 4"
"node": "^4.5 || 6.* || >= 7.*"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
6 changes: 1 addition & 5 deletions tests/dummy/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

let App;

Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
const App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
Expand Down
1 change: 0 additions & 1 deletion tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-env node */

module.exports = {
browsers: [
'ie 9',
Expand Down
Loading

0 comments on commit 62f9ce0

Please sign in to comment.