diff options
author | 2016-09-09 11:31:25 -0700 | |
---|---|---|
committer | 2016-09-09 11:31:25 -0700 | |
commit | d0989101f520bdfe961605f198ddc50c7657011d (patch) | |
tree | 5f5f33097791f281f211bc45d4da816d9f230f53 /examples/objective-c/auth_sample/AuthTestService.podspec | |
parent | 509ee4c11127700986ceb05c020d2ceef5667852 (diff) | |
parent | 61a420e9966e0b628c710bd4c2db2409bc1cfad9 (diff) |
Merge branch 'master' into fix_channel_from_fd_api
Diffstat (limited to 'examples/objective-c/auth_sample/AuthTestService.podspec')
-rw-r--r-- | examples/objective-c/auth_sample/AuthTestService.podspec | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/examples/objective-c/auth_sample/AuthTestService.podspec b/examples/objective-c/auth_sample/AuthTestService.podspec index afccf08bbf..59fbb5f395 100644 --- a/examples/objective-c/auth_sample/AuthTestService.podspec +++ b/examples/objective-c/auth_sample/AuthTestService.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| src = "../../protos" # 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", "~> 1.0" # Pods directory corresponding to this app's Podfile, relative to the location of this podspec. pods_root = 'Pods' @@ -45,10 +45,6 @@ Pod::Spec.new do |s| ms.requires_arc = false # The generated files depend on the protobuf runtime. 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 # Files generated by the gRPC plugin @@ -60,4 +56,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 |