Skip to content

Commit 6803e2e

Browse files
committed
3.7 upgrade
1 parent c138d25 commit 6803e2e

File tree

6 files changed

+27
-11
lines changed

6 files changed

+27
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
1213
/.sass-cache
1314
/connect.lock
1415
/coverage/

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
1213
/.eslintignore
1314
/.eslintrc.js
1415
/.gitignore

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444
# we recommend new addons test the current and previous LTS
4545
# as well as latest stable release (bonus points to beta/canary)
4646
- stage: "Additional Tests"
47-
env: EMBER_TRY_SCENARIO=ember-lts-2.16
48-
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
47+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
48+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
4949
- env: EMBER_TRY_SCENARIO=ember-release
5050
- env: EMBER_TRY_SCENARIO=ember-beta
5151
- env: EMBER_TRY_SCENARIO=ember-canary

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2018
3+
Copyright (c) 2019
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
Ember IntroJS wraps [introjs][intro-js] in an Ember Component to guide
1111
users through your app.
1212

13+
14+
Compatibility
15+
------------------------------------------------------------------------------
16+
17+
* Ember.js v2.18 or above
18+
* Ember CLI v2.13 or above
19+
20+
1321
Installation
1422
------------------------------------------------------------------------------
1523

config/ember-try.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,22 @@ module.exports = function() {
1111
return {
1212
scenarios: [
1313
{
14-
name: 'ember-lts-2.16',
14+
name: 'ember-lts-2.18',
1515
env: {
1616
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
1717
},
1818
npm: {
1919
devDependencies: {
2020
'@ember/jquery': '^0.5.1',
21-
'ember-source': '~2.16.0'
21+
'ember-source': '~2.18.0'
2222
}
2323
}
2424
},
2525
{
26-
name: 'ember-lts-2.18',
27-
env: {
28-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
29-
},
26+
name: 'ember-lts-3.4',
3027
npm: {
3128
devDependencies: {
32-
'@ember/jquery': '^0.5.1',
33-
'ember-source': '~2.18.0'
29+
'ember-source': '~3.4.0'
3430
}
3531
}
3632
},
@@ -58,6 +54,16 @@ module.exports = function() {
5854
}
5955
}
6056
},
57+
// The default `.travis.yml` runs this scenario via `npm test`,
58+
// not via `ember try`. It's still included here so that running
59+
// `ember try:each` manually or from a customized CI config will run it
60+
// along with all the other scenarios.
61+
{
62+
name: 'ember-default',
63+
npm: {
64+
devDependencies: {}
65+
}
66+
},
6167
{
6268
name: 'ember-default-with-jquery',
6369
env: {

0 commit comments

Comments
 (0)