diff options
author | Jorge Canizales <jcanizales@google.com> | 2016-07-11 00:34:14 -0700 |
---|---|---|
committer | Jorge Canizales <jcanizales@google.com> | 2016-07-11 00:34:14 -0700 |
commit | 6eade6dcd7456b6608113408fd866f2d4f0f3150 (patch) | |
tree | 046f1a9dc698fa707fff80b142fe55f02a550149 /src/objective-c/tests/Podfile | |
parent | 3e53e1a5be4ee1d0433a64b73553496fa3f93827 (diff) |
Podspecs for Protoc and the gRPC plugin
The examples under <repo_root>/examples now rely on the released
versions. Those under src/objective-c/examples, as well as the tests,
rely on protoc and the plugin as compiled from head.
Diffstat (limited to 'src/objective-c/tests/Podfile')
-rw-r--r-- | src/objective-c/tests/Podfile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile index 168114da37..8bc23a5169 100644 --- a/src/objective-c/tests/Podfile +++ b/src/objective-c/tests/Podfile @@ -17,7 +17,8 @@ GRPC_LOCAL_SRC = '../../..' ).each do |target_name| target target_name do pod 'Protobuf', :path => "#{GRPC_LOCAL_SRC}/third_party/protobuf", :inhibit_warnings => true - pod 'ProtoCompiler', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c" + pod '!ProtoCompiler', :path => "#{GRPC_LOCAL_SRC}/src/objective-c" + pod '!ProtoCompiler-gRPCPlugin', :path => "#{GRPC_LOCAL_SRC}/src/objective-c" pod 'BoringSSL', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c", :inhibit_warnings => true pod 'CronetFramework', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c" pod 'gRPC', :path => GRPC_LOCAL_SRC @@ -66,7 +67,7 @@ post_install do |installer| end if target.name == 'gRPC-Core' target.build_configurations.each do |config| - # TODO(zyc) Remove this setting after the issue is resolved + # TODO(zyc): Remove this setting after the issue is resolved # GPR_UNREACHABLE_CODE causes "Control may reach end of non-void # function" warning config.build_settings['GCC_WARN_ABOUT_RETURN_TYPE'] = 'NO' |