Skip to content

Commit

Permalink
Reorder fields so it looks like exclude_files affects preserve_paths
Browse files Browse the repository at this point in the history
  • Loading branch information
jcanizales committed Jun 2, 2015
1 parent e55a25c commit 9d6b946
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Protobuf.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ Pod::Spec.new do |s|
'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}',
'objectivec/google/protobuf/Timestamp.pbobjc.h',
'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. For Api, Struct and Type, see issue #449.
s.exclude_files = 'objectivec/GPBProtocolBuffers.m',
'objectivec/google/protobuf/Api.pbobjc.{h,m}',
'objectivec/google/protobuf/Struct.pbobjc.{h,m}',
'objectivec/google/protobuf/Type.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/Timestamp.pbobjc.m',
'objectivec/google/protobuf/Duration.pbobjc.m'
s.header_mappings_dir = 'objectivec'

s.ios.deployment_target = '6.0'
Expand Down

0 comments on commit 9d6b946

Please sign in to comment.