Skip to content

Commit db533df

Browse files
authored
Merge pull request #314 from nytimes/chore/publish-5.0.1
publish 5.0.1
2 parents 529828b + 759f256 commit db533df

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
Changes for users of the library currently on `develop`:
44

5+
## [5.0.1](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.0)
6+
7+
Changes for users of the library in 5.0.1:
8+
9+
- bugfix: we weren't treating a nil interstitial correctly.
10+
511
## [5.0.0](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.0)
612

713
Changes for users of the library in 5.0.0:

Documentation/Release Process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ _While tagging a new version of a library and pushing it to CocoaPods is concept
33
# NYTPhotoViewer Release Process
44

55
- Review [the diff between `master` and `develop`](https://github.com/NYTimes/NYTPhotoViewer/compare/master...develop) to determine which part of the version number to increment, in accordance with [semantic versioning](http://semver.org/).
6-
- Update [the Podspec](https://github.com/NYTimes/NYTPhotoViewer/blob/develop/NYTPhotoViewer.podspec) and the framework targets in [the Xcode project](https://github.com/NYTimes/NYTPhotoViewer/tree/develop/NYTPhotoViewer.xcodeproj) to the new version number.
6+
- Update [the Podspec](https://github.com/NYTimes/NYTPhotoViewer/blob/develop/NYTPhotoViewer.podspec) and the CFBundleShortVersionString in [Info.plist](https://github.com/NYTimes/NYTPhotoViewer/tree/develop/NYTPhotoViewer/Info.plist) to the new version number.
77
- Make this change via a pull request to trigger notifications for those who watch the repository.
88
- Using [the diff](https://github.com/NYTimes/NYTPhotoViewer/compare/master...develop), [the commit history](https://github.com/NYTimes/NYTPhotoViewer/commits/develop), and any notes about `develop` which may have been written in the `CHANGELOG`, update [`CHANGELOG.md`](https://github.com/NYTimes/NYTPhotoViewer/blob/develop/CHANGELOG.md) with changes in the new version which may affect library users.
99
- When reviewing the commit history, searching for “Merge pull request” helps find changes which should appear in [the `CHANGELOG`](https://github.com/NYTimes/NYTPhotoViewer/blob/develop/CHANGELOG.md).

NYTPhotoViewer.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "NYTPhotoViewer"
3-
s.version = "5.0.0"
3+
s.version = "5.0.1"
44

55
s.description = <<-DESC
66
NYTPhotoViewer is a slideshow and image viewer that includes double tap to zoom, captions, support for multiple images, interactive flick to dismiss, animated zooming presentation, and more.

NYTPhotoViewer/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>5.0.0</string>
18+
<string>5.0.1</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

NYTPhotoViewer/NYTPhotosViewController.m

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,12 +526,11 @@ - (NYTPhotoViewController *)newPhotoViewControllerForPhoto:(id <NYTPhoto>)photo
526526
- (UIViewController *)newViewControllerAtIndex:(NSUInteger)index {
527527
if ([self.delegate respondsToSelector:@selector(photosViewController:interstitialViewAtIndex:)]) {
528528
UIView *view = [self.delegate photosViewController:self interstitialViewAtIndex:index];
529-
530-
NYTInterstitialViewController *interstitialViewController = [[NYTInterstitialViewController alloc] initWithView:view itemIndex:index];
531-
532-
return interstitialViewController;
529+
if (view != nil) {
530+
NYTInterstitialViewController *interstitialViewController = [[NYTInterstitialViewController alloc] initWithView:view itemIndex:index];
531+
return interstitialViewController;
532+
}
533533
}
534-
535534
return nil;
536535
}
537536

0 commit comments

Comments
 (0)