Skip to content

Commit 6ddb07b

Browse files
authoredOct 15, 2017
Merge pull request #91 from aomran/update2.7
Update to Chart.js 2.7
2 parents f36e2f2 + 1d47456 commit 6ddb07b

17 files changed

+8799
-83
lines changed
 

‎.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414
/coverage/*
1515
/libpeerconnection.log
1616
npm-debug.log*
17+
yarn-error.log
1718
testem.log
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

‎.travis.yml

+19-13
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,28 @@ node_js:
44
- "6"
55

66
sudo: false
7+
dist: trusty
8+
9+
addons:
10+
chrome: stable
711

812
cache:
913
directories:
1014
- $HOME/.npm
1115

1216
env:
13-
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
14-
- EMBER_TRY_SCENARIO=ember-lts-2.4
15-
- EMBER_TRY_SCENARIO=ember-lts-2.8
16-
- EMBER_TRY_SCENARIO=ember-release
17-
- EMBER_TRY_SCENARIO=ember-beta
18-
- EMBER_TRY_SCENARIO=ember-canary
19-
- EMBER_TRY_SCENARIO=ember-default
17+
global:
18+
# See https://git.io/vdao3 for details.
19+
- JOBS=1
20+
matrix:
21+
# we recommend new addons test the current and previous LTS
22+
# as well as latest stable release (bonus points to beta/canary)
23+
- EMBER_TRY_SCENARIO=ember-lts-2.8
24+
- EMBER_TRY_SCENARIO=ember-lts-2.12
25+
- EMBER_TRY_SCENARIO=ember-release
26+
- EMBER_TRY_SCENARIO=ember-beta
27+
- EMBER_TRY_SCENARIO=ember-canary
28+
- EMBER_TRY_SCENARIO=ember-default
2029

2130
matrix:
2231
fast_finish: true
@@ -25,13 +34,10 @@ matrix:
2534

2635
before_install:
2736
- npm config set spin false
28-
- npm install -g phantomjs-prebuilt
29-
- phantomjs --version
30-
31-
install:
32-
- npm install
37+
- npm install -g npm@4
38+
- npm --version
3339

3440
script:
3541
# Usually, it's ok to finish the test scenario without reverting
3642
# to the addon's original dependency state, skipping "cleanup".
37-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
43+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

‎LICENSE.md

-9
This file was deleted.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://travis-ci.org/aomran/ember-cli-chart.svg)](https://travis-ci.org/aomran/ember-cli-chart)
44

5-
This Ember CLI addon is a simple wrapper for [ChartJS](http://www.chartjs.org/) (v2.6.0).
5+
This Ember CLI addon is a simple wrapper for [ChartJS](http://www.chartjs.org/) (v2.7.0).
66

77
### Installation
88

‎config/ember-try.js

+5-13
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
module.exports = {
33
scenarios: [
44
{
5-
name: 'ember-lts-2.4',
5+
name: 'ember-lts-2.8',
66
bower: {
77
dependencies: {
8-
'ember': 'components/ember#lts-2-4'
8+
'ember': 'components/ember#lts-2-8'
99
},
1010
resolutions: {
11-
'ember': 'lts-2-4'
11+
'ember': 'lts-2-8'
1212
}
1313
},
1414
npm: {
@@ -18,18 +18,10 @@ module.exports = {
1818
}
1919
},
2020
{
21-
name: 'ember-lts-2.8',
22-
bower: {
23-
dependencies: {
24-
'ember': 'components/ember#lts-2-8'
25-
},
26-
resolutions: {
27-
'ember': 'lts-2-8'
28-
}
29-
},
21+
name: 'ember-lts-2.12',
3022
npm: {
3123
devDependencies: {
32-
'ember-source': null
24+
'ember-source': '~2.12.0'
3325
}
3426
}
3527
},

‎ember-cli-build.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
/* eslint-env node */
2+
'use strict';
3+
24
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
35

46
module.exports = function(defaults) {
5-
var app = new EmberAddon(defaults, {
7+
let app = new EmberAddon(defaults, {
68
// Add options here
79
});
810

0 commit comments

Comments
 (0)
Failed to load comments.