diff options
author | Jisi Liu <liujisi@google.com> | 2015-06-10 13:17:59 -0700 |
---|---|---|
committer | Jisi Liu <liujisi@google.com> | 2015-06-10 13:17:59 -0700 |
commit | 7b354163742ab67e0e920fa6da0f43e2789855c2 (patch) | |
tree | 07efbcbc90cf17a48129411676b9cd8f59ebffce | |
parent | 91becaa867fc25fdd588b951c12f5af16bc5731b (diff) | |
parent | 0f2b4a0e82a2d961f9b8c51f9fcd8d303f318975 (diff) | |
download | protobuf-7b354163742ab67e0e920fa6da0f43e2789855c2.tar.gz protobuf-7b354163742ab67e0e920fa6da0f43e2789855c2.tar.bz2 protobuf-7b354163742ab67e0e920fa6da0f43e2789855c2.zip |
Merge pull request #486 from thomasvl/assets_podspec
Update podspec, rename assets to drop @
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | Protobuf.podspec | 10 | ||||
-rw-r--r-- | objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json | 12 | ||||
-rw-r--r-- | objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png) | bin | 17744 -> 17744 bytes | |||
-rw-r--r-- | objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png) | bin | 18788 -> 18788 bytes | |||
-rw-r--r-- | objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png) | bin | 13348 -> 13348 bytes | |||
-rw-r--r-- | objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png) | bin | 11128 -> 11128 bytes | |||
-rw-r--r-- | objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png) | bin | 21792 -> 21792 bytes |
8 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 3e87c518..cc49d6fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -579,13 +579,13 @@ objectivec_EXTRA_DIST= \ objectivec/Tests/iOSTestHarness/en.lproj/InfoPlist.strings \ objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json \ objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png \ objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png \ objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png \ - objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png \ + objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png \ objectivec/Tests/iOSTestHarness/Images.xcassets/LaunchImage.launchimage/Contents.json \ objectivec/Tests/iOSTestHarness/Info.plist \ objectivec/Tests/iOSTestHarness/LaunchScreen.xib \ 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' diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json index ecd3584e..0cbf9acc 100644 --- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json @@ -34,19 +34,19 @@ { "size" : "57x57", "idiom" : "iphone", - "filename" : "iPhone6@2x.png", + "filename" : "iPhone6_2x.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "iPhone7@2x.png", + "filename" : "iPhone7_2x.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "iPhone7@3x.png", + "filename" : "iPhone7_3x.png", "scale" : "3x" }, { @@ -88,7 +88,7 @@ { "size" : "72x72", "idiom" : "ipad", - "filename" : "iPad6@2x.png", + "filename" : "iPad6_2x.png", "scale" : "2x" }, { @@ -100,7 +100,7 @@ { "size" : "76x76", "idiom" : "ipad", - "filename" : "iPad7@2x.png", + "filename" : "iPad7_2x.png", "scale" : "2x" }, { @@ -113,4 +113,4 @@ "version" : 1, "author" : "xcode" } -}
\ No newline at end of file +} diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png Binary files differindex 2ec93704..2ec93704 100644 --- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png +++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png Binary files differindex e39cc3e7..e39cc3e7 100644 --- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png +++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png Binary files differindex 2424997f..2424997f 100644 --- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png +++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png Binary files differindex 10bfc3cf..10bfc3cf 100644 --- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png +++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png Binary files differindex 8d16f14d..8d16f14d 100644 --- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png +++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png |