diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2015-07-06 13:05:46 -0700 |
---|---|---|
committer | Paul Yang <TeBoring@users.noreply.github.com> | 2015-07-06 13:05:46 -0700 |
commit | ab2094de11155ffa57e7d38a9b996dd038af981e (patch) | |
tree | 640f3c07329273b2979759c38ffe94f420f6a562 /Protobuf.podspec | |
parent | 0a27430bd4c4e5deb49754b031fa3c3657cfb37d (diff) | |
parent | d5d7bb3bfbe3702617f604834d61d3357c8c87fb (diff) | |
download | protobuf-ab2094de11155ffa57e7d38a9b996dd038af981e.tar.gz protobuf-ab2094de11155ffa57e7d38a9b996dd038af981e.tar.bz2 protobuf-ab2094de11155ffa57e7d38a9b996dd038af981e.zip |
Merge pull request #554 from jcanizales/proto-objc-bazel
Add Bazel target for the Objective-C protobuf runtime
Diffstat (limited to 'Protobuf.podspec')
-rw-r--r-- | Protobuf.podspec | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/Protobuf.podspec b/Protobuf.podspec index b6b831c2..6aa89902 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -11,25 +11,11 @@ Pod::Spec.new do |s| s.license = 'New BSD' s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } - s.source_files = 'objectivec/*.{h,m}', - 'objectivec/google/protobuf/Any.pbobjc.{h,m}', - 'objectivec/google/protobuf/Api.pbobjc.{h,m}', - 'objectivec/google/protobuf/Descriptor.pbobjc.{h,m}', - 'objectivec/google/protobuf/Duration.pbobjc.h', - 'objectivec/google/protobuf/Empty.pbobjc.{h,m}', - 'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}', - 'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}', - 'objectivec/google/protobuf/Struct.pbobjc.{h,m}', - 'objectivec/google/protobuf/Timestamp.pbobjc.h', - 'objectivec/google/protobuf/Type.pbobjc.{h,m}' - 'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}' - # Timestamp.pbobjc.m and Duration.pbobjc.m are #imported by GPBWellKnownTypes.m. So we can't - # compile them (duplicate symbols), but we need them available for the importing: - s.preserve_paths = 'objectivec/google/protobuf/Duration.pbobjc.m', - 'objectivec/google/protobuf/Timestamp.pbobjc.m' - # 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.source_files = 'objectivec/GPBProtocolBuffers.{h,m}' + # GPBProtocolBuffers.{h,m} are umbrella files. We need Cocoapods to preserve the files imported by + # them. + s.preserve_paths = 'objectivec/*.{h,m}', + 'objectivec/google/protobuf/*.pbobjc.{h,m}' s.header_mappings_dir = 'objectivec' s.ios.deployment_target = '6.0' |