diff options
| author |  Mark D. Roth <roth@google.com> | 2016-08-31 10:46:58 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-08-31 10:46:58 -0700 |
| commit | ceb39ae60c0469d9e7933ac94f10c6e63db55536 (patch) | |
| tree | 9414f2dce9989de7530d11c9c827afeda7788754 /gRPC-ProtoRPC.podspec | |
| parent | 0c137e2e1f737d84e95805bf406a7f7e8938c065 (diff) | |
| parent | 79d7d996002ff1a4d0523af1895c2e007fdba159 (diff) | |
Merge remote-tracking branch 'upstream/master' into http_connect
Diffstat (limited to 'gRPC-ProtoRPC.podspec')
| -rw-r--r-- | gRPC-ProtoRPC.podspec | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index f3a8343041..f6426fb4de 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -30,7 +30,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.0.0-pre1' + version = '1.0.0' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'http://www.grpc.io' @@ -39,7 +39,7 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/grpc/grpc.git', - :tag => "objective-c-v#{version}", + :tag => "v#{version}", } s.ios.deployment_target = '7.1' @@ -56,8 +56,10 @@ Pod::Spec.new do |s| s.dependency 'gRPC', version s.dependency 'gRPC-RxLibrary', version s.dependency 'Protobuf', '~> 3.0' - # This is needed by all pods that depend on Protobuf: 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 |