Skip to content

Commit f9f0a9a

Browse files
authored
Merge pull request #5 from kjhangiani/ember-cli-212
upgrade ember/ember-cli to 2.12
2 parents 95e4d06 + f6b55f8 commit f9f0a9a

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# v0.5.0
2+
#### 2017-08-03
3+
4+
- upgrades ember-cli to 2.12.2, so the addon works on [email protected]+
5+
- cleaned up / removed some unnecessary dependencies
6+
- added a changelog, finally

bower.json

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
"name": "ember-cli-jquery-datatables",
33
"dependencies": {
44
"jquery": "^1.11.1",
5-
"ember": "1.11.0",
6-
"ember-data": "1.0.0-beta.16.1",
7-
"ember-resolver": "~0.1.15",
8-
"loader.js": "ember-cli/loader.js#3.2.0",
9-
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
10-
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
11-
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
12-
"ember-qunit": "0.3.0",
13-
"ember-qunit-notifications": "0.0.7",
14-
"qunit": "~1.17.1"
5+
"ember": "1.11.0"
156
}
16-
}
7+
}

package.json

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-cli-jquery-datatables",
3-
"version": "0.4.0",
3+
"version": "0.5.0",
44
"description": "jQuery DataTables ember-cli addon.",
55
"directories": {
66
"doc": "doc",
@@ -22,18 +22,23 @@
2222
"license": "MIT",
2323
"devDependencies": {
2424
"broccoli-asset-rev": "^2.0.2",
25-
"ember-cli": "0.2.2",
26-
"ember-cli-app-version": "0.3.3",
27-
"ember-cli-content-security-policy": "0.4.0",
28-
"ember-cli-dependency-checker": "0.0.8",
29-
"ember-cli-htmlbars": "0.7.4",
30-
"ember-cli-ic-ajax": "0.1.1",
25+
"ember-cli": "2.12.3",
26+
"ember-cli-app-version": "^3.0.0",
27+
"ember-cli-content-security-policy": "^0.6.1",
28+
"ember-cli-dependency-checker": "^1.4.0",
29+
"ember-cli-htmlbars": "^1.3.0",
30+
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
31+
"ember-cli-ic-ajax": "^1.0.0",
3132
"ember-cli-inject-live-reload": "^1.3.0",
32-
"ember-cli-qunit": "0.3.9",
33-
"ember-cli-uglify": "1.0.1",
34-
"ember-data": "1.0.0-beta.16.1",
35-
"ember-export-application-global": "^1.0.2",
36-
"ember-disable-prototype-extensions": "^1.0.0"
33+
"ember-cli-qunit": "3.1.2",
34+
"ember-cli-shims": "^1.0.2",
35+
"ember-cli-sri": "^2.1.0",
36+
"ember-cli-uglify": "^1.2.0",
37+
"ember-disable-prototype-extensions": "^1.0.0",
38+
"ember-export-application-global": "^2.0.0",
39+
"ember-load-initializers": "^0.6.0",
40+
"ember-resolver": "^2.0.3",
41+
"loader.js": "^4.2.3"
3742
},
3843
"keywords": [
3944
"ember-addon",
@@ -42,7 +47,7 @@
4247
"ember-cli-addon"
4348
],
4449
"dependencies": {
45-
"ember-cli-babel": "^4.0.0",
50+
"ember-cli-babel": "^6.0.0",
4651
"node.extend": "^1.1.3"
4752
},
4853
"ember-addon": {

0 commit comments

Comments
 (0)