Merge pull request #334 from nytimes/switch-from-carthage-to-cocoapods

switch from carthage to cocoapods
nytimes · Dec 1, 2020 · d23c5ab · d23c5ab
2 parents 17337a7 + 9bc5072
commit d23c5ab
Show file tree

Hide file tree

Showing 1,587 changed files with 1,138 additions and 281,564 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,14 +43,6 @@ ocunit.xml
 *.xcbkptlist
 *.xcsettings
 
-# bootstrap script
-Vendor/bundle/
+Examples/vendor/bundle/
 .bundle/
-bin/
-
-# Carthage
-Carthage/Build
-### warning!
-### do not ignore Carthage/Checkouts. see https://github.com/Carthage/Carthage/issues/1153
-###Carthage/Checkouts  
-###
+Pods/
diff --git a/.gitmodules b/.gitmodules
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,18 @@
 ## `develop`
 
 Changes for users of the library currently on `develop`:
+-  fixed a NaN when setting `zoomScale` in `NYTScalingImageView` when `ANIMATED_GIF_SUPPORT=1`
 
-## [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/Cartfile b/Cartfile
diff --git a/Cartfile.private b/Cartfile.private
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Carthage/Checkouts/PINCache/.github/workflows/ci.yaml b/Carthage/Checkouts/PINCache/.github/workflows/ci.yaml
diff --git a/Carthage/Checkouts/PINCache/.github_changelog_generator b/Carthage/Checkouts/PINCache/.github_changelog_generator
diff --git a/Carthage/Checkouts/PINCache/.gitignore b/Carthage/Checkouts/PINCache/.gitignore
diff --git a/Carthage/Checkouts/PINCache/.gitmodules b/Carthage/Checkouts/PINCache/.gitmodules
diff --git a/Carthage/Checkouts/PINCache/CHANGELOG.md b/Carthage/Checkouts/PINCache/CHANGELOG.md
diff --git a/Carthage/Checkouts/PINCache/CODE_OF_CONDUCT.md b/Carthage/Checkouts/PINCache/CODE_OF_CONDUCT.md
diff --git a/Carthage/Checkouts/PINCache/Cartfile b/Carthage/Checkouts/PINCache/Cartfile
diff --git a/Carthage/Checkouts/PINCache/Cartfile.resolved b/Carthage/Checkouts/PINCache/Cartfile.resolved