diff options
author | 2016-12-16 21:21:14 +0000 | |
---|---|---|
committer | 2016-12-16 23:48:52 +0000 | |
commit | 8f7b0b48bf75b652653cb0391fff06c5160e46fa (patch) | |
tree | 3d57d49ad90086e0b5e29c72e6a47e956fffc4ea /src/objective-c | |
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 'src/objective-c')
-rw-r--r-- | src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 7 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/private/GRPCHost.m | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 6e594fd3ed..bcc2bb6126 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler-gRPCPlugin' - v = '1.0.1' + v = '1.0.2' s.version = v s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.description = <<-DESC @@ -84,7 +84,10 @@ Pod::Spec.new do |s| repo = 'grpc/grpc' file = "grpc_objective_c_plugin-#{v}-macos-x86_64.zip" s.source = { - :http => "https://github.com/#{repo}/releases/download/v#{v}/#{file}", + # TODO(mxyan): Change back to "https://github.com/#{repo}/releases/download/v#{v}/#{file}" for + # next release + # :http => "https://github.com/#{repo}/releases/download/v#{v}/#{file}", + :http => "https://github.com/#{repo}/releases/download/objective-c-v#{v}/#{file}", # TODO(jcanizales): Add sha1 or sha256 # :sha1 => '??', } diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m index 31065cbf01..450bec36e0 100644 --- a/src/objective-c/GRPCClient/private/GRPCHost.m +++ b/src/objective-c/GRPCClient/private/GRPCHost.m @@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN // TODO(jcanizales): Generate the version in a standalone header, from templates. Like // templates/src/core/surface/version.c.template . -#define GRPC_OBJC_VERSION_STRING @"1.0.1" +#define GRPC_OBJC_VERSION_STRING @"1.0.2" static NSMutableDictionary *kHostCache; |