diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2016-07-01 13:54:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 13:54:25 -0700 |
| commit | bdeb215cab2985195325fcd5e70c3fa751f46e0f (patch) | |
| tree | 83e849351e03571358c6f5bddb0a6d82a65ab197 /Protobuf.podspec | |
| parent | d4d13a4349e4e59d67f311185ddcc1890d956d7a (diff) | |
| parent | 99ae32a39fefaac7112e6142da379afde3cb408f (diff) | |
| download | protobuf-3.0.0-beta-3.3.tar.gz protobuf-3.0.0-beta-3.3.tar.bz2 protobuf-3.0.0-beta-3.3.zip | |
Merge pull request #1737 from jcanizales/testv3.0.0-beta-3.33.0.0-beta-3
Merge beta-3.1 fixes into beta-3 branch
Diffstat (limited to 'Protobuf.podspec')
| -rw-r--r-- | Protobuf.podspec | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Protobuf.podspec b/Protobuf.podspec index 0bbd06df..3d3fec62 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -5,11 +5,12 @@ # dependent projects use the :git notation to refer to the library. Pod::Spec.new do |s| s.name = 'Protobuf' - s.version = '3.0.0-beta-2' + s.version = '3.0.0-beta-3.1' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/google/protobuf' s.license = 'New BSD' s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } + s.cocoapods_version = '>= 1.0' s.source = { :git => 'https://github.com/google/protobuf.git', :tag => "v#{s.version}" } @@ -32,7 +33,10 @@ Pod::Spec.new do |s| # The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be # left out, as it's an umbrella implementation file. s.exclude_files = 'objectivec/GPBProtocolBuffers.m' - s.header_mappings_dir = 'objectivec' + + # Set a CPP symbol so the code knows to use framework imports. + s.user_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' } + s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' } s.ios.deployment_target = '7.1' s.osx.deployment_target = '10.9' |