diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-07-27 02:11:02 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-07-27 02:11:02 -0700 |
| commit | 1f533d2ae562f6664e707c0390629b40b0fb1957 (patch) | |
| tree | ce30f1881459d4bb1d082d1a1129065ba5d54f96 /src/objective-c | |
| parent | 37f7b5399dcf5b29e41ac1c0ff2a1c81c9933a93 (diff) | |
| parent | 58dec1aa9e45aaacafa131ea803407459a30bdb5 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-subchannels
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 28dfffd863..6ad9166b32 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.14.0-dev' + v = '1.15.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 60571b1f43..52fe0dd050 100644 --- a/src/objective-c/GRPCClient/private/version.h +++ b/src/objective-c/GRPCClient/private/version.h @@ -22,4 +22,4 @@ // instead. This file can be regenerated from the template by running // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.14.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.15.0-dev" diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index fafcac6507..d532eed245 100644 --- a/src/objective-c/tests/version.h +++ b/src/objective-c/tests/version.h @@ -22,5 +22,5 @@ // instead. This file can be regenerated from the template by running // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.14.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.15.0-dev" #define GRPC_C_VERSION_STRING @"6.0.0-dev" |