diff options
| author |  yang-g <yangg@google.com> | 2016-07-18 16:30:58 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-07-18 16:30:58 -0700 |
| commit | c76e48b8d38ed8d1c0359a3da2e60b87b93a99d9 (patch) | |
| tree | f3c9e2b5e9f3d5345f6e46f07e6414262acd0377 /src/objective-c/tests/Podfile | |
| parent | 9275d4067cfd9233edf2ae9a0fe1255c8c730f19 (diff) | |
| parent | 2eebe29ec84ed6b2d5c64016b12e1782281d5a38 (diff) | |
Merge remote-tracking branch 'upstream/master' into shut_down_acceptor_early
Diffstat (limited to 'src/objective-c/tests/Podfile')
| -rw-r--r-- | src/objective-c/tests/Podfile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile index 30a34260d4..17b9740d52 100644 --- a/src/objective-c/tests/Podfile +++ b/src/objective-c/tests/Podfile @@ -17,12 +17,18 @@ GRPC_LOCAL_SRC = '../../..' ).each do |target_name| target target_name do pod 'Protobuf', :path => "#{GRPC_LOCAL_SRC}/third_party/protobuf", :inhibit_warnings => true - pod 'BoringSSL', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c", :inhibit_warnings => true + + 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 - pod 'gRPC-Core', :path => GRPC_LOCAL_SRC + + pod 'gRPC', :path => GRPC_LOCAL_SRC + pod 'gRPC-Core', :path => GRPC_LOCAL_SRC pod 'gRPC-RxLibrary', :path => GRPC_LOCAL_SRC pod 'gRPC-ProtoRPC', :path => GRPC_LOCAL_SRC + pod 'RemoteTest', :path => "RemoteTestClient" end end @@ -65,7 +71,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' |