diff options
author | Vijay Pai <vpai@google.com> | 2016-08-25 14:49:18 -0700 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2016-08-25 14:49:18 -0700 |
commit | ac4113bef128abd57cc166a4921063b0b4c5278d (patch) | |
tree | f5b0b4a72310252d86c502659283c6ad76a47539 /src/objective-c/README.md | |
parent | 326d939873eb96c68d3ebb859c12b4bf022dadc6 (diff) | |
parent | c931305c398e7e87013da52a5c2697d0fb14ad7f (diff) |
Merge branch 'master' into fc_unary
Diffstat (limited to 'src/objective-c/README.md')
-rw-r--r-- | src/objective-c/README.md | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/objective-c/README.md b/src/objective-c/README.md index 6e917ddd81..3624475b9c 100644 --- a/src/objective-c/README.md +++ b/src/objective-c/README.md @@ -48,7 +48,7 @@ Pod::Spec.new do |s| src = '.' # We'll use protoc with the gRPC plugin. - s.dependency '!ProtoCompiler-gRPCPlugin', '~> 1.0.0-pre1' + s.dependency '!ProtoCompiler-gRPCPlugin', '~> 1.0' # Pods directory corresponding to this app's Podfile, relative to the location of this podspec. pods_root = '<path to your Podfile>/Pods' @@ -82,10 +82,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 # The --objcgrpc_out plugin generates a pair of .pbrpc.h/.pbrpc.m files for each .proto file with @@ -98,6 +94,13 @@ 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 ``` |