Merge pull request #113 from NYTimes/feature/close-button

Fixes Close Button
nytimes · Jan 6, 2016 · d34ca45 · d34ca45
2 parents 7760382 + c421363
commit d34ca45
Show file tree

Hide file tree

Showing 10 changed files with 422 additions and 252 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
   - FLAnimatedImage (1.0.8)
   - NYTPhotoViewer/AnimatedGifSupport (0.1.2):
-    - FLAnimatedImage
+    - FLAnimatedImage (= 1.0.8)
     - NYTPhotoViewer/Core
   - NYTPhotoViewer/Core (0.1.2)
   - OCMock (3.2)
@@ -16,7 +16,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FLAnimatedImage: f9422f796135aff80d8c00b2afc48015bb746e24
-  NYTPhotoViewer: c8cdb47350ae4dacd248771a6dbe6ba67c65c3a1
+  NYTPhotoViewer: e348bfa437398deb67a88b7928e85168ac38b5df
   OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb
 
 COCOAPODS: 0.39.0
diff --git a/Example/Pods/Local Podspecs/NYTPhotoViewer.podspec.json b/Example/Pods/Local Podspecs/NYTPhotoViewer.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/NYTPhotoViewer.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/NYTPhotoViewer.xcscheme
diff --git a/...ods/Target Support Files/Pods-NYTPhotoViewer-Swift/Pods-NYTPhotoViewer-Swift-resources.sh b/...ods/Target Support Files/Pods-NYTPhotoViewer-Swift/Pods-NYTPhotoViewer-Swift-resources.sh
diff --git a/... Support Files/Pods-NYTPhotoViewer-SwiftTests/Pods-NYTPhotoViewer-SwiftTests-resources.sh b/... Support Files/Pods-NYTPhotoViewer-SwiftTests/Pods-NYTPhotoViewer-SwiftTests-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-NYTPhotoViewer/Pods-NYTPhotoViewer-resources.sh b/Example/Pods/Target Support Files/Pods-NYTPhotoViewer/Pods-NYTPhotoViewer-resources.sh
diff --git a/Example/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh b/Example/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh
diff --git a/NYTPhotoViewer.podspec b/NYTPhotoViewer.podspec
@@ -15,9 +15,8 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '8.0'
   s.requires_arc = true
 
-  s.ios.resource_bundle = { s.name => ['Pod/Assets/ios/*.png'] }
-
   s.subspec 'Core' do |ss|
+    ss.ios.resource_bundle = { s.name => ['Pod/Assets/ios/*.png'] }
     ss.source_files = 'Pod/Classes/**/*'
     ss.frameworks = 'UIKit', 'Foundation'
   end