Skip to content

Commit 55e9f1e

Browse files
committed
Merge pull request #8 from thoov/emberCLIUpgrade
Upgrading packages for ember-cli 0.2
2 parents 97f65bf + de2a585 commit 55e9f1e

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

bower.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
{
22
"name": "ember-buffered-proxy",
33
"dependencies": {
4-
"handlebars": "~1.3.0",
54
"jquery": "^1.11.1",
6-
"ember": "^1.7.0",
7-
"ember-resolver": "~0.1.7",
8-
"loader.js": "ember-cli/loader.js#1.0.1",
5+
"ember": "1.10.0",
6+
"ember-resolver": "~0.1.12",
7+
"loader.js": "ember-cli/loader.js#3.2.0",
98
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
10-
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1",
9+
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
1110
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
1211
"ember-qunit": "0.2.8",
1312
"ember-qunit-notifications": "0.0.7",

package.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ember-buffered-proxy",
3-
"description": "An Ember Object Proxy with change buffering",
43
"version": "0.4.0",
4+
"description": "An Ember Object Proxy with change buffering",
55
"directories": {
66
"doc": "doc",
77
"test": "tests"
@@ -19,19 +19,17 @@
1919
"license": "MIT",
2020
"devDependencies": {
2121
"broccoli-asset-rev": "^2.0.0",
22-
"broccoli-ember-hbs-template-compiler": "^1.6.1",
23-
"ember-cli": "0.1.15",
24-
"ember-cli-6to5": "^3.0.0",
25-
"ember-cli-app-version": "0.3.1",
22+
"ember-cli": "0.2.0",
23+
"ember-cli-app-version": "0.3.2",
24+
"ember-cli-babel": "^4.0.0",
2625
"ember-cli-content-security-policy": "0.3.0",
27-
"ember-cli-dependency-checker": "0.0.7",
26+
"ember-cli-dependency-checker": "0.0.8",
27+
"ember-cli-htmlbars": "0.7.4",
2828
"ember-cli-ic-ajax": "0.1.1",
2929
"ember-cli-inject-live-reload": "^1.3.0",
30-
"ember-cli-qunit": "0.3.7",
30+
"ember-cli-qunit": "0.3.9",
3131
"ember-cli-uglify": "1.0.1",
32-
"ember-export-application-global": "^1.0.2",
33-
"express": "^4.8.5",
34-
"glob": "^4.0.5"
32+
"ember-export-application-global": "^1.0.2"
3533
},
3634
"keywords": [
3735
"ember-addon"

0 commit comments

Comments
 (0)