Reorder fields so it looks like exclude_files affects preserve_paths
diff --git a/Protobuf.podspec b/Protobuf.podspec
index 1c1477a..8b12135 100644
--- a/Protobuf.podspec
+++ b/Protobuf.podspec
@@ -15,16 +15,16 @@
'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'