Skip to content

Commit

Permalink
Merge pull request grpc#7503 from stanley-cheung/php-update-package-x…
Browse files Browse the repository at this point in the history
…ml-v1_0

PHP: update package.xml and composer.json
  • Loading branch information
stanley-cheung authored Jul 22, 2016
2 parents 73eec14 + 217c385 commit 89a8851
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 13 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "BSD-3-Clause",
"require": {
"php": ">=5.5.0",
"stanley-cheung/protobuf-php": "dev-master"
"stanley-cheung/protobuf-php": "v0.6"
},
"require-dev": {
"google/auth": "v0.9"
Expand Down
24 changes: 19 additions & 5 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<email>grpc-packages@google.com</email>
<active>yes</active>
</lead>
<date>2016-07-13</date>
<date>2016-07-21</date>
<time>16:06:07</time>
<version>
<release>1.0.0</release>
Expand All @@ -22,8 +22,7 @@
</stability>
<license>BSD</license>
<notes>
- GA release
- Fix shutdown hang problem #4017
- PHP7 Support #7464
</notes>
<contents>
<dir baseinstalldir="/" name="/">
Expand Down Expand Up @@ -1087,8 +1086,8 @@ Update to wrap gRPC C Core version 0.10.0
</release>
<release>
<version>
<release>1.0.0</release>
<api>1.0.0</api>
<release>1.0.0RC1</release>
<api>1.0.0RC1</api>
</version>
<stability>
<release>stable</release>
Expand All @@ -1101,5 +1100,20 @@ Update to wrap gRPC C Core version 0.10.0
- Fix shutdown hang problem #4017
</notes>
</release>
<release>
<version>
<release>1.0.0RC2</release>
<api>1.0.0RC2</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2016-07-21</date>
<license>BSD</license>
<notes>
- PHP7 Support #7464
</notes>
</release>
</changelog>
</package>
2 changes: 1 addition & 1 deletion src/php/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"version": "1.0.0",
"require": {
"php": ">=5.5.0",
"stanley-cheung/protobuf-php": "dev-master",
"stanley-cheung/protobuf-php": "v0.6",
"google/auth": "v0.9"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion templates/composer.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"license": "BSD-3-Clause",
"require": {
"php": ">=5.5.0",
"stanley-cheung/protobuf-php": "dev-master"
"stanley-cheung/protobuf-php": "v0.6"
},
"require-dev": {
"google/auth": "v0.9"
Expand Down
24 changes: 19 additions & 5 deletions templates/package.xml.template
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<email>grpc-packages@google.com</email>
<active>yes</active>
</lead>
<date>2016-07-13</date>
<date>2016-07-21</date>
<time>16:06:07</time>
<version>
<release>${settings.php_version.php()}</release>
Expand All @@ -24,8 +24,7 @@
</stability>
<license>BSD</license>
<notes>
- GA release
- Fix shutdown hang problem #4017
- PHP7 Support #7464
</notes>
<contents>
<dir baseinstalldir="/" name="/">
Expand Down Expand Up @@ -206,8 +205,8 @@
</release>
<release>
<version>
<release>1.0.0</release>
<api>1.0.0</api>
<release>1.0.0RC1</release>
<api>1.0.0RC1</api>
</version>
<stability>
<release>stable</release>
Expand All @@ -220,5 +219,20 @@
- Fix shutdown hang problem #4017
</notes>
</release>
<release>
<version>
<release>1.0.0RC2</release>
<api>1.0.0RC2</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2016-07-21</date>
<license>BSD</license>
<notes>
- PHP7 Support #7464
</notes>
</release>
</changelog>
</package>

0 comments on commit 89a8851

Please sign in to comment.