From 8b534638c034492784f0141e0e19d43d52f44bb1 Mon Sep 17 00:00:00 2001 From: Eric Slosser Date: Fri, 18 Sep 2020 12:54:49 -0400 Subject: [PATCH 1/2] delete .gitmodules --- .gitmodules | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3d788e4b..00000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "Carthage/Checkouts/ocmock"] - path = Carthage/Checkouts/ocmock - url = https://github.com/erikdoe/ocmock.git -[submodule "Carthage/Checkouts/libwebp"] - path = Carthage/Checkouts/libwebp - url = https://chromium.googlesource.com/webm/libwebp -[submodule "Carthage/Checkouts/PINCache"] - url = https://github.com/pinterest/PINCache.git -[submodule "Carthage/Checkouts/PINRemoteImage"] - url = https://github.com/pinterest/PINRemoteImage.git -[submodule "Carthage/Checkouts/PINOperation"] - url = https://github.com/pinterest/PINOperation.git From 9f35b748933e1ebfc90b614f860656e2c52d344a Mon Sep 17 00:00:00 2001 From: Eric Slosser Date: Fri, 18 Sep 2020 13:26:23 -0400 Subject: [PATCH 2/2] bump to 5.0.5 --- CHANGELOG.md | 10 ++++++++-- NYTPhotoViewer.podspec | 2 +- NYTPhotoViewer/Info.plist | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da0598e3..0e29f8f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,16 @@ Changes for users of the library currently on `develop`: -## [5.0.4](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.4) +## [5.0.5](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.5) -Changes for users of the library in 5.0.4: +Changes for users of the library in 5.0.5: +- Update PINRemoteImage to 3.0.1 for Xcode 12 +- Restored the ability to pull down via Carthage + +## [5.0.4 (broken)](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.4) + +- Broke the ability to pull down via Carthage or build this repo in Xcode! - Update PINRemoteImage to 3.0.1 for Xcode 12 ## [5.0.3](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.3) diff --git a/NYTPhotoViewer.podspec b/NYTPhotoViewer.podspec index ed11322a..bb2dcd14 100644 --- a/NYTPhotoViewer.podspec +++ b/NYTPhotoViewer.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "NYTPhotoViewer" - s.version = "5.0.4" + s.version = "5.0.5" 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. diff --git a/NYTPhotoViewer/Info.plist b/NYTPhotoViewer/Info.plist index cf07db1f..c4a7cedd 100644 --- a/NYTPhotoViewer/Info.plist +++ b/NYTPhotoViewer/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.0.4 + 5.0.5 CFBundleSignature ???? CFBundleVersion