diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2015-06-10 13:45:52 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-06-10 14:30:59 -0400 |
| commit | 0f2b4a0e82a2d961f9b8c51f9fcd8d303f318975 (patch) | |
| tree | a396eda3a00d03274719d03cfa37942a1bc64b62 /Protobuf.podspec | |
| parent | 686db5c355045c3a449a895f28e0e266755b2315 (diff) | |
| download | protobuf-0f2b4a0e82a2d961f9b8c51f9fcd8d303f318975.tar.gz protobuf-0f2b4a0e82a2d961f9b8c51f9fcd8d303f318975.tar.bz2 protobuf-0f2b4a0e82a2d961f9b8c51f9fcd8d303f318975.zip | |
Update podspec for files that can build now, rename assets to not need @ in the name.
Diffstat (limited to 'Protobuf.podspec')
| -rw-r--r-- | Protobuf.podspec | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Protobuf.podspec b/Protobuf.podspec index f201f035..b6b831c2 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -13,23 +13,23 @@ Pod::Spec.new do |s| 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. 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}' + # left out, as it's an umbrella implementation file. + s.exclude_files = 'objectivec/GPBProtocolBuffers.m' s.header_mappings_dir = 'objectivec' s.ios.deployment_target = '6.0' |