Skip to content

Commit

Permalink
⬆️ v3.10.1...v3.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Apr 15, 2022
1 parent 1fec2e3 commit bd4f40e
Show file tree
Hide file tree
Showing 7 changed files with 257 additions and 147 deletions.
3 changes: 1 addition & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ module.exports = {
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
sourceType: 'script'
},
env: {
browser: false,
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# ember-cli-bootstrap3-grid

Components for managing Boostrap 3 clearfix as well as a Viewport mixin for detecting Boostrap 3 screen sizes.
[![npm version](http://badge.fury.io/js/ember-cli-bootstrap3-grid.svg)](http://badge.fury.io/js/ember-cli-bootstrap3-grid) ![downloads](https://img.shields.io/npm/dy/ember-cli-bootstrap3-grid.svg) [![Code Climate](http://codeclimate.com/github/cybertoothca/ember-cli-bootstrap3-grid/badges/gpa.svg)](http://codeclimate.com/github/cybertoothca/ember-cli-bootstrap3-grid)

[![ember-observer-badge](http://emberobserver.com/badges/ember-cli-bootstrap3-grid.svg)](http://emberobserver.com/addons/ember-cli-bootstrap3-grid) [![License](http://img.shields.io/npm/l/ember-cli-bootstrap3-grid.svg)](LICENSE.md)

[![Maintainability](https://api.codeclimate.com/v1/badges/a5acd1c21cc1fddb227b/maintainability)](https://codeclimate.com/github/cybertoothca/ember-cli-bootstrap3-grid/maintainability)
![https://github.com/cybertoothca/ember-cli-bootstrap3-grid/actions](https://github.com/cybertoothca/ember-cli-bootstrap3-grid/workflows/Build,%20Test,%20Publish%20Coverage/badge.svg)
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=cybertoothca/ember-cli-bootstrap3-grid)](https://dependabot.com/compatibility-score/?dependency-name=ember-cli-bootstrap3-grid&package-manager=npm_and_yarn)
Components for managing Boostrap 3 clearfix as well as a Viewport mixin for detecting Boostrap 3 screen sizes.

## Compatibility

- Ember.js v2.18 or above
- Ember.js v3.4 or above
- Ember CLI v2.13 or above
- Node.js v8 or above

Expand Down
135 changes: 63 additions & 72 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,83 +1,74 @@
'use strict';
"use strict";

const getChannelURL = require('ember-source-channel-url');
const getChannelURL = require("ember-source-channel-url");

module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary')
]).then((urls) => {
return {
scenarios: [
{
name: 'ember-lts-2.18',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
module.exports = async function () {
return {
useYarn: true,
scenarios: [
{
name: "ember-lts-3.4",
npm: {
devDependencies: {
"ember-source": "~3.4.0",
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1',
'ember-source': '~2.18.0'
}
}
},
{
name: 'ember-lts-3.4',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
}
}
},
{
name: "ember-lts-3.8",
npm: {
devDependencies: {
"ember-source": "~3.8.0",
},
},
},
{
name: "ember-release",
npm: {
devDependencies: {
"ember-source": await getChannelURL("release"),
},
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': urls[0]
}
}
},
{
name: "ember-beta",
npm: {
devDependencies: {
"ember-source": await getChannelURL("beta"),
},
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': urls[1]
}
}
},
{
name: "ember-canary",
npm: {
devDependencies: {
"ember-source": await getChannelURL("canary"),
},
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': urls[2]
}
}
},
// The default `.travis.yml` runs this scenario via `yarn test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: "ember-default",
npm: {
devDependencies: {},
},
// The default `.travis.yml` runs this scenario via `yarn test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
devDependencies: {}
}
},
{
name: "ember-default-with-jquery",
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
"jquery-integration": true,
}),
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
})
npm: {
devDependencies: {
"@ember/jquery": "^0.5.1",
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1'
}
}
}
]
};
});
},
},
],
};
};
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"bootstrap": "^3.4.1",
"bootstrap-sass": "^3.4.1",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.10.1",
"ember-cli": "~3.11.0",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -54,7 +54,7 @@
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^4.4.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.10.0",
"ember-source": "~3.11.1",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^2.0.0",
"eslint-plugin-ember": "^6.2.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.10.1",
"version": "3.11.0",
"blueprints": [
{
"name": "addon",
Expand Down
Loading

0 comments on commit bd4f40e

Please sign in to comment.