Skip to content

Commit

Permalink
Merge pull request #314 from nytimes/chore/publish-5.0.1
Browse files Browse the repository at this point in the history
publish 5.0.1
  • Loading branch information
mr-fixit committed Apr 28, 2020
2 parents 529828b + 759f256 commit db533df
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

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

## [5.0.1](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.0)

Changes for users of the library in 5.0.1:

- bugfix: we weren't treating a nil interstitial correctly.

## [5.0.0](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.0)

Changes for users of the library in 5.0.0:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Release Process.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ _While tagging a new version of a library and pushing it to CocoaPods is concept
# NYTPhotoViewer Release Process

- 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/).
- 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.
- 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.
- Make this change via a pull request to trigger notifications for those who watch the repository.
- 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.
- 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).
Expand Down
2 changes: 1 addition & 1 deletion NYTPhotoViewer.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "NYTPhotoViewer"
s.version = "5.0.0"
s.version = "5.0.1"

s.description = <<-DESC
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.
Expand Down
2 changes: 1 addition & 1 deletion NYTPhotoViewer/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>5.0.0</string>
<string>5.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
9 changes: 4 additions & 5 deletions NYTPhotoViewer/NYTPhotosViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -526,12 +526,11 @@ - (NYTPhotoViewController *)newPhotoViewControllerForPhoto:(id <NYTPhoto>)photo
- (UIViewController *)newViewControllerAtIndex:(NSUInteger)index {
if ([self.delegate respondsToSelector:@selector(photosViewController:interstitialViewAtIndex:)]) {
UIView *view = [self.delegate photosViewController:self interstitialViewAtIndex:index];

NYTInterstitialViewController *interstitialViewController = [[NYTInterstitialViewController alloc] initWithView:view itemIndex:index];

return interstitialViewController;
if (view != nil) {
NYTInterstitialViewController *interstitialViewController = [[NYTInterstitialViewController alloc] initWithView:view itemIndex:index];
return interstitialViewController;
}
}

return nil;
}

Expand Down

0 comments on commit db533df

Please sign in to comment.