diff options
author | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-08-23 14:59:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-23 14:59:39 -0700 |
commit | 668bf881a9449cc4f9885e4d3492e2cbe7476925 (patch) | |
tree | cb1c019f2f5806d9acdb3d3f570a487b43f21c73 /src/objective-c/tests | |
parent | 56d7044ed808e08af8b7a812a140bd751622f15c (diff) | |
parent | d25c1d2a6c5ce6b0696a99c042e7c7026ac1a00c (diff) |
Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x
Upmerge from v1.0.x
Diffstat (limited to 'src/objective-c/tests')
-rw-r--r-- | src/objective-c/tests/RemoteTestClient/RemoteTest.podspec | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/objective-c/tests/RemoteTestClient/RemoteTest.podspec b/src/objective-c/tests/RemoteTestClient/RemoteTest.podspec index 3d28234fa2..2e0a050b0c 100644 --- a/src/objective-c/tests/RemoteTestClient/RemoteTest.podspec +++ b/src/objective-c/tests/RemoteTestClient/RemoteTest.podspec @@ -11,7 +11,7 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.9' # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. - s.dependency "!ProtoCompiler-gRPCPlugin", "~> 1.0.0-pre1.2" + s.dependency "!ProtoCompiler-gRPCPlugin" repo_root = '../../../..' bin_dir = "#{repo_root}/bins/$CONFIG" @@ -35,10 +35,6 @@ Pod::Spec.new do |s| ms.header_mappings_dir = "." ms.requires_arc = false ms.dependency "Protobuf" - # This is needed by all pods that depend on Protobuf: - ms.pod_target_xcconfig = { - 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1', - } end s.subspec "Services" do |ss| @@ -48,4 +44,11 @@ Pod::Spec.new do |s| ss.dependency "gRPC-ProtoRPC" ss.dependency "#{s.name}/Messages" end + + s.pod_target_xcconfig = { + # This is needed by all pods that depend on Protobuf: + 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1', + # This is needed by all pods that depend on gRPC-RxLibrary: + 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES', + } end |