diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2016-12-16 21:21:14 +0000 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2016-12-16 23:48:52 +0000 |
| commit | 8f7b0b48bf75b652653cb0391fff06c5160e46fa (patch) | |
| tree | 3d57d49ad90086e0b5e29c72e6a47e956fffc4ea /templates/gRPC-Core.podspec.template | |
| parent | b229094678502e2606164a3240dbc8375ad403b5 (diff) | |
| parent | 3fa20cffc6d7f46a6df262a0c8e155619bb7ed39 (diff) | |
v1.0.x → master upmerge
Manual changes:
- Fixed use of Exception.message in _invalid_metadata_test.py
- Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb
- Added "set -e" to generate_build_additions.sh
Diffstat (limited to 'templates/gRPC-Core.podspec.template')
| -rw-r--r-- | templates/gRPC-Core.podspec.template | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index fbad1a3f70..1b97d18f16 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -62,7 +62,7 @@ %> Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.0.1' + version = '1.0.2' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'http://www.grpc.io' @@ -71,7 +71,9 @@ s.source = { :git => 'https://github.com/grpc/grpc.git', - :tag => "v#{version}", + # TODO(mxyan): Change back to "v#{version}" for next release + #:tag => "v#{version}", + :tag => "objective-c-v#{version}", # TODO(jcanizales): Depend explicitly on the nanopb pod, and disable submodules. :submodules => true, } |