diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2015-04-22 23:40:18 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2015-04-22 23:40:18 -0700 |
| commit | 8957cae7072d3be4fcd320df06b1636e24d6de72 (patch) | |
| tree | 54fe1cb3f9177f0f45a7f6cb8067d0036f281ade /src/objective-c/examples | |
| parent | 7847b0eb3a8684d9111866a20fb6fabead0d4a8d (diff) | |
Moves ProtoRPC.podspec into gRPC.podspec
So the root of the repository doesn’t have 2 podspecs.
All four libraries are subspecs now.
Adjusts the generated code to account for that.
Diffstat (limited to 'src/objective-c/examples')
4 files changed, 3 insertions, 4 deletions
diff --git a/src/objective-c/examples/Sample/Podfile b/src/objective-c/examples/Sample/Podfile index 7752d240d0..8b1a90e39b 100644 --- a/src/objective-c/examples/Sample/Podfile +++ b/src/objective-c/examples/Sample/Podfile @@ -2,7 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' pod 'gRPC', :path => "../../../.." -pod 'ProtoRPC', :path => "../../../.." pod 'Route_guide', :path => "RouteGuideClient" pod 'RemoteTest', :path => "RemoteTestClient" diff --git a/src/objective-c/examples/Sample/RemoteTestClient/RemoteTest.podspec b/src/objective-c/examples/Sample/RemoteTestClient/RemoteTest.podspec index 8770804617..7b025ce252 100644 --- a/src/objective-c/examples/Sample/RemoteTestClient/RemoteTest.podspec +++ b/src/objective-c/examples/Sample/RemoteTestClient/RemoteTest.podspec @@ -14,5 +14,5 @@ Pod::Spec.new do |s| s.requires_arc = true s.dependency 'ProtocolBuffers', '~> 1.9' - s.dependency 'ProtoRPC', '~> 0.0' + s.dependency 'gRPC', '~> 0.0' end diff --git a/src/objective-c/examples/Sample/RemoteTestClient/Test.pb.h b/src/objective-c/examples/Sample/RemoteTestClient/Test.pb.h index a96244dc12..b6111b15b8 100644 --- a/src/objective-c/examples/Sample/RemoteTestClient/Test.pb.h +++ b/src/objective-c/examples/Sample/RemoteTestClient/Test.pb.h @@ -4,7 +4,7 @@ #import "Empty.pb.h" #import "Messages.pb.h" -#import <ProtoRPC/ProtoService.h> +#import <gRPC/ProtoService.h> // @@protoc_insertion_point(imports) @class ObjectiveCFileOptions; diff --git a/src/objective-c/examples/Sample/RemoteTestClient/Test.pb.m b/src/objective-c/examples/Sample/RemoteTestClient/Test.pb.m index a34af37020..31a3ba3a61 100644 --- a/src/objective-c/examples/Sample/RemoteTestClient/Test.pb.m +++ b/src/objective-c/examples/Sample/RemoteTestClient/Test.pb.m @@ -2,9 +2,9 @@ #import "Test.pb.h" -#import <ProtoRPC/ProtoRPC.h> #import <gRPC/GRXWriteable.h> #import <gRPC/GRXWriter+Immediate.h> +#import <gRPC/ProtoRPC.h> // @@protoc_insertion_point(imports) @implementation RMTTestRoot |