aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/objective-c/tests/Podfile
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2016-07-14 16:34:04 -0700
committerGravatar Muxi Yan <mxyan@google.com>2016-07-14 16:34:04 -0700
commit3e54deb05ad1c73b227a65606cde96c3af6fe8e7 (patch)
tree169dffc5d95f07f59fbc1c8230bbbd3f258ee819 /src/objective-c/tests/Podfile
parent37480eb60a3beebddb6a582c5f95de660abe4d8b (diff)
parent1198da0b5c95b8444e4f282349f5d1f47db76525 (diff)
Merged master branch
Diffstat (limited to 'src/objective-c/tests/Podfile')
-rw-r--r--src/objective-c/tests/Podfile14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/objective-c/tests/Podfile b/src/objective-c/tests/Podfile
index 62ffd59f07..e5265630a2 100644
--- a/src/objective-c/tests/Podfile
+++ b/src/objective-c/tests/Podfile
@@ -17,11 +17,17 @@ 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 'gRPC', :path => GRPC_LOCAL_SRC
- pod 'gRPC-Core', :path => GRPC_LOCAL_SRC
+
+ 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 '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
@@ -72,7 +78,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'