diff options
| author |  Muxi Yan <mxyan@google.com> | 2018-01-24 16:16:23 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2018-01-24 16:16:23 -0800 |
| commit | fd900e09fbafad16159617af86ca5b56f4819182 (patch) | |
| tree | 8cc6e609fcec3e38e6966143f53cb2bd1d2417df /src/objective-c | |
| parent | 401f903151825dc06a90ab145791828276278521 (diff) | |
| parent | 7e05426477dbb0235b806ddaa87b6ea95031efdd (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'src/objective-c')
| -rw-r--r-- | src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 2 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/version.h | 2 | ||||
| -rw-r--r-- | src/objective-c/tests/version.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 22501765f9..037ad4d9b0 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -42,7 +42,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.9.0-dev' + v = '1.10.0-dev' s.version = v s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.description = <<-DESC diff --git a/src/objective-c/GRPCClient/private/version.h b/src/objective-c/GRPCClient/private/version.h index 69dd6266fd..5c134e3642 100644 --- a/src/objective-c/GRPCClient/private/version.h +++ b/src/objective-c/GRPCClient/private/version.h @@ -23,4 +23,4 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.9.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.10.0-dev" diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index 6e3a073020..d8581b9779 100644 --- a/src/objective-c/tests/version.h +++ b/src/objective-c/tests/version.h @@ -23,5 +23,5 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.9.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.10.0-dev" #define GRPC_C_VERSION_STRING @"5.0.0-dev" |