Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies + fix deprecations #465

Merged
merged 1 commit into from
Jul 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/services/dependency-resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import Ember from 'ember';
import config from '../config/environment';
import { task, timeout } from 'ember-concurrency';

const EMBER_VERSIONS = ['2.6.0', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2'];
const EMBER_DATA_VERSIONS = ['2.6.1', '2.5.3', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15'];
const EMBER_VERSIONS = ['2.7.0, 2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2'];
const EMBER_DATA_VERSIONS = ['2.7.0, 2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15'];

const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/;

Expand Down
8 changes: 4 additions & 4 deletions blueprints/twiddle.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.10.1",
"version": "0.10.2",
"EmberENV": {
"FEATURES": {}
},
Expand All @@ -9,9 +9,9 @@
},
"dependencies": {
"jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js",
"ember": "2.6.0",
"ember-data": "2.6.1",
"ember-template-compiler": "2.6.0"
"ember": "2.7.0",
"ember-data": "2.7.0",
"ember-template-compiler": "2.7.0"
},
"addons": {}
}
10 changes: 5 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "ember-twiddle",
"version": "0.10.1",
"version": "0.10.2",
"dependencies": {
"ember": "2.7.0-beta.2",
"ember": "2.7.0",
"ember-cli-shims": "0.1.1",
"ember-qunit-notifications": "0.1.0",
"jquery": "1.11.3",
"codemirror": "~5.16.0",
"codemirror": "~5.17.0",
"bootstrap-sass": "~3.3.5",
"dom-ruler": "~0.1.15",
"pretender": "~1.1.0",
Expand All @@ -16,8 +16,8 @@
"jstree": "~3.3.0"
},
"resolutions": {
"codemirror": "~5.16.0",
"ember": "2.7.0-beta.2",
"codemirror": "~5.17.0",
"ember": "2.7.0",
"FakeXMLHttpRequest": "^1.3.0",
"qunit-notifications": "~0.1.0"
}
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-twiddle",
"version": "0.10.1",
"version": "0.10.2",
"description": "https://ember-twiddle.com",
"private": true,
"directories": {
Expand Down Expand Up @@ -31,8 +31,8 @@
"ember-ajax": "~2.4.1",
"ember-api-actions": "~0.1.4",
"ember-autoresize": "0.5.16",
"ember-browserify": "1.1.9",
"ember-cli": "2.7.0-beta.4",
"ember-browserify": "1.1.11",
"ember-cli": "2.7.0",
"ember-cli-app-version": "1.0.0",
"ember-cli-babel": "^5.1.6",
"ember-cli-bootstrap-sassy": "lifegadget/ember-cli-bootstrap-sassy#fa01943776a219905ee4a12bb9cd3981bba5c75a",
Expand All @@ -43,7 +43,7 @@
"ember-cli-deploy-s3-pack": "~0.1.5",
"ember-cli-deploy-slack": "0.1.0",
"ember-cli-document-title": "0.3.1",
"ember-cli-fastboot": "1.0.0-beta.4",
"ember-cli-fastboot": "1.0.0-beta.7",
"ember-cli-file-creator": "~0.3.0",
"ember-cli-htmlbars": "~1.0.3",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
Expand All @@ -60,21 +60,21 @@
"ember-cli-test-loader": "~1.1.0",
"ember-cli-uglify": "~1.2.0",
"ember-concurrency": "~0.7.1",
"ember-data": "2.6.1",
"ember-data": "2.7.0",
"ember-disable-proxy-controllers": "1.0.1",
"ember-export-application-global": "~1.0.5",
"ember-git-version": "0.1.0",
"ember-load": "0.0.9",
"ember-load-initializers": "~0.5.1",
"ember-lodash": "0.0.9",
"ember-lodash": "0.0.10",
"ember-moment": "7.0.0-beta.3",
"ember-notify": "~5.1.0",
"ember-resolver": "~2.0.3",
"ember-responsive": "~1.2.7",
"ember-route-action-helper": "0.3.2",
"ember-route-action-helper": "~0.3.3",
"ivy-codemirror": "2.0.2",
"loader.js": "~4.0.1",
"moment": "~2.13.0",
"moment": "~2.14.1",
"moment-timezone": "~0.5.4",
"torii": "0.8.0"
},
Expand Down
2 changes: 2 additions & 0 deletions tests/unit/models/gist-file-test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { moduleForModel, test } from 'ember-qunit';
import Ember from 'ember';
import DS from 'ember-data';

const { run } = Ember;

moduleForModel('gist-file', 'Unit | Model | gist file', {
Expand Down