Skip to content

Commit

Permalink
Changed version constratints to be semantic versioning again
Browse files Browse the repository at this point in the history
- in composer the `~` operator is just a shortcut for `~1.0` = `>=1.0.0,<2.0.0`
  it does not prevent dev versions to be installed but neither does `1.*`
- dev versions are constrolled via `minimum-stability` setting and the
  `@dev`, `@beta`, `@stable`,... settings.
- setting bower packages that ship compiled files only with the stable
  release to use `@stable` in composer.json of the applictaions. This
  setting can be removed when we remove the `minimum-stability=dev`
  setting after GA.
  • Loading branch information
cebe committed Sep 22, 2014
1 parent 708d586 commit 8176a39
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 16 deletions.
5 changes: 4 additions & 1 deletion apps/advanced/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
"php": ">=5.4.0",
"yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*",
"yiisoft/yii2-swiftmailer": "*"
"yiisoft/yii2-swiftmailer": "*",
"bower-asset/jquery": "@stable",
"bower-asset/jquery-ui": "@stable",
"bower-asset/jquery.inputmask": "@stable"
},
"require-dev": {
"yiisoft/yii2-codeception": "*",
Expand Down
5 changes: 4 additions & 1 deletion apps/basic/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
"php": ">=5.4.0",
"yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*",
"yiisoft/yii2-swiftmailer": "*"
"yiisoft/yii2-swiftmailer": "*",
"bower-asset/jquery": "@stable",
"bower-asset/jquery-ui": "@stable",
"bower-asset/jquery.inputmask": "@stable"
},
"require-dev": {
"yiisoft/yii2-codeception": "*",
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@
"yiisoft/yii2-composer": "*",
"ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*",
"bower-asset/jquery": "1.11.* | 2.1.*",
"bower-asset/jquery.inputmask": "3.1.*",
"bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": "2.0.*",
"bower-asset/bootstrap": "3.2.*",
"bower-asset/jquery-ui": "1.11.*",
"bower-asset/typeahead.js": "0.10.*"
"bower-asset/jquery": "~1.11 | ~2.1",
"bower-asset/jquery.inputmask": "~3.1",
"bower-asset/punycode": "~1.3",
"bower-asset/yii2-pjax": "~2.0",
"bower-asset/bootstrap": "~3.2",
"bower-asset/jquery-ui": "~1.11",
"bower-asset/typeahead.js": "~0.10"
},
"require-dev": {
"phpunit/phpunit": "3.7.*",
Expand Down
2 changes: 1 addition & 1 deletion extensions/bootstrap/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"require": {
"yiisoft/yii2": "*",
"bower-asset/bootstrap": "3.2.*"
"bower-asset/bootstrap": "~3.2"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion extensions/gii/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"yiisoft/yii2": "*",
"yiisoft/yii2-bootstrap": "*",
"phpspec/php-diff": ">=1.0.2",
"bower-asset/typeahead.js": "0.10.*"
"bower-asset/typeahead.js": "~0.10"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion extensions/jui/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"require": {
"yiisoft/yii2": "*",
"bower-asset/jquery-ui": "1.11.*"
"bower-asset/jquery-ui": "~1.11"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions framework/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
"yiisoft/yii2-composer": "*",
"ezyang/htmlpurifier": "4.6.*",
"cebe/markdown": "0.9.*",
"bower-asset/jquery": "1.11.* | 2.1.*",
"bower-asset/jquery.inputmask": "3.1.*",
"bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": "2.0.*"
"bower-asset/jquery": "~1.11 | ~2.1",
"bower-asset/jquery.inputmask": "~3.1",
"bower-asset/punycode": "~1.3",
"bower-asset/yii2-pjax": "~2.0"
},
"autoload": {
"psr-4": {"yii\\": ""}
Expand Down

0 comments on commit 8176a39

Please sign in to comment.