diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/composer.json.template | 2 | ||||
| -rw-r--r-- | templates/gRPC-Core.podspec.template | 2 | ||||
| -rw-r--r-- | templates/package.xml.template | 44 | ||||
| -rw-r--r-- | templates/src/php/composer.json.template | 2 |
4 files changed, 41 insertions, 9 deletions
diff --git a/templates/composer.json.template b/templates/composer.json.template index f56ecb69d6..94f0c236a9 100644 --- a/templates/composer.json.template +++ b/templates/composer.json.template @@ -9,7 +9,7 @@ "license": "BSD-3-Clause", "require": { "php": ">=5.5.0", - "google/protobuf": "v3.1.0" + "google/protobuf": "^v3.1.0" }, "require-dev": { "google/auth": "v0.9" diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index f05ee4c05f..9ed32e31cf 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -191,7 +191,7 @@ 'test/core/util/debugger_macros.c', 'test/core/util/test_config.{c,h}', 'test/core/util/port.h', - 'test/core/util/port_posix.c', + 'test/core/util/port.c', 'test/core/util/port_server_client.{c,h}' end end diff --git a/templates/package.xml.template b/templates/package.xml.template index 80f1a1fe97..8655cfa1d9 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -12,7 +12,7 @@ <email>grpc-packages@google.com</email> <active>yes</active> </lead> - <date>2017-01-13</date> + <date>2017-03-01</date> <time>16:06:07</time> <version> <release>${settings.php_version.php()}</release> @@ -24,8 +24,8 @@ </stability> <license>BSD</license> <notes> - - PHP Proto3 adoption #8179 - - Various bug fixes + - Added arg info macros #9751 + - Updated codegen to be consistent with protobuf #9492 </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -312,8 +312,8 @@ </release> <release> <version> - <release>1.1.0dev</release> - <api>1.1.0dev</api> + <release>1.1.0RC1</release> + <api>1.1.0RC1</api> </version> <stability> <release>beta</release> @@ -323,7 +323,39 @@ <license>BSD</license> <notes> - PHP Proto3 adoption #8179 - - Various bug fixes + - Various bug fixes + </notes> + </release> + <release> + <version> + <release>1.1.0</release> + <api>1.1.0</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2017-01-31</date> + <license>BSD</license> + <notes> + - PHP Proto3 adoption #8179 + - Various bug fixes + </notes> + </release> + <release> + <version> + <release>1.2.0RC1</release> + <api>1.2.0RC1</api> + </version> + <stability> + <release>beta</release> + <api>beta</api> + </stability> + <date>2017-03-01</date> + <license>BSD</license> + <notes> + - Added arg info macros #9751 + - Updated codegen to be consistent with protobuf #9492 </notes> </release> </changelog> diff --git a/templates/src/php/composer.json.template b/templates/src/php/composer.json.template index ecc516d1c4..1887ee3c82 100644 --- a/templates/src/php/composer.json.template +++ b/templates/src/php/composer.json.template @@ -7,7 +7,7 @@ "version": "${settings.php_version.php_composer()}", "require": { "php": ">=5.5.0", - "google/protobuf": "v3.1.0" + "google/protobuf": "^v3.1.0" }, "require-dev": { "google/auth": "v0.9" |