Skip to content

Commit

Permalink
Merge pull request #3905 from tricknotes/ember-2.x
Browse files Browse the repository at this point in the history
[BUGFIX release] Update the dependencies for Ember 2.x
  • Loading branch information
bmac committed Nov 3, 2015
2 parents 859bc26 + 5201929 commit f1ccad8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ember-data",
"private": true,
"dependencies": {
"ember": "~2.0.0"
"ember": "^2.0.0"
},
"devDependencies": {
"qunit": "~1.17.0",
Expand Down
2 changes: 1 addition & 1 deletion config/package-manager-files/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"ember-data.prod.js"
],
"dependencies": {
"components/ember": ">= 1.8.1 < 2.0.0"
"components/ember": ">= 2.0.0 < 3.0.0"
},
"license": "MIT"
}
2 changes: 1 addition & 1 deletion config/package-manager-files/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "component",
"license": "MIT",
"require": {
"components/ember": "~1.8.1"
"components/ember": ">= 2.0.0 < 3.0.0"
},
"extra": {
"component": {
Expand Down
2 changes: 1 addition & 1 deletion config/package-manager-files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"main": "./ember-data.js",
"dependencies": {
"ember": ">= 1.8.1 < 2.0.0"
"ember": ">= 2.0.0 < 3.0.0"
},
"jspm": {
"main": "ember-data",
Expand Down

0 comments on commit f1ccad8

Please sign in to comment.