From 44fb295d9f7e39bf0b4874666fec940d5f38ec9a Mon Sep 17 00:00:00 2001
From: Jorge Canizales <jcanizales@google.com>
Date: Sat, 16 May 2015 12:11:35 -0700
Subject: [PATCH] Move our runtime to proto3 and make the dependency explicit
---
gRPC.podspec | 6 ++++--
src/objective-c/ProtoRPC/ProtoRPC.m | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gRPC.podspec b/gRPC.podspec
index affd0d81db..8429357a9e 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
s.homepage = 'https://www.grpc.io'
s.license = 'New BSD'
s.authors = { 'Jorge Canizales' => 'jcanizales@google.com',
- 'Michael Lumish' => 'mlumish@google.com' }
+ 'Michael Lumish' => 'mlumish@google.com' }
# s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => 'release-0_5_0' }
@@ -67,7 +67,8 @@ Pod::Spec.new do |s|
s.subspec 'GRPCClient' do |gs|
gs.summary = 'Objective-C wrapper around the core gRPC library.'
- gs.authors = { 'Jorge Canizales' => 'jcanizales@google.com' }
+ gs.authors = { 'Jorge Canizales' => 'jcanizales@google.com',
+ 'Michael Lumish' => 'mlumish@google.com' }
gs.source_files = 'src/objective-c/GRPCClient/*.{h,m}',
'src/objective-c/GRPCClient/private/*.{h,m}'
@@ -90,5 +91,6 @@ Pod::Spec.new do |s|
ps.dependency 'gRPC/GRPCClient'
ps.dependency 'gRPC/RxLibrary'
+ ps.dependency 'Protobuf', '~> 3.0'
end
end
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m
index 6520b3af59..c5051c0123 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.m
+++ b/src/objective-c/ProtoRPC/ProtoRPC.m
@@ -36,7 +36,7 @@
#import <gRPC/GRXWriteable.h>
#import <gRPC/GRXWriter.h>
#import <gRPC/GRXWriter+Transformations.h>
-#import <ProtocolBuffers/ProtocolBuffers.h>
+#import <Protobuf/GPBProtocolBuffers.h>
@implementation ProtoRPC {
id<GRXWriteable> _responseWriteable;
@@ -65,7 +65,7 @@
}
// A writer that serializes the proto messages to send.
id<GRXWriter> bytesWriter =
- [[[GRXWriter alloc] initWithWriter:requestsWriter] map:^id(PBGeneratedMessage *proto) {
+ [[[GRXWriter alloc] initWithWriter:requestsWriter] map:^id(GPBMessage *proto) {
return [proto data];
}];
if ((self = [super initWithHost:host method:method requestsWriter:bytesWriter])) {
--
GitLab