Merge branch 'develop'

.gitignore

@@ -50,3 +50,7 @@ bin/
 
 # Carthage
 Carthage/Build
+### warning!
+### do not ignore Carthage/Checkouts. see https://github.com/Carthage/Carthage/issues/1153
+###Carthage/Checkouts  
+###

.gitmodules

@@ -1,3 +1,12 @@
 [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

CHANGELOG.md

@@ -2,11 +2,23 @@
 
 Changes for users of the library currently on `develop`:
 
+## [5.0.4](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.4)
+
+Changes for users of the library in 5.0.4:
+
+- Update PINRemoteImage to 3.0.1 for Xcode 12
+
+## [5.0.3](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.3)
+
+Changes for users of the library in 5.0.3:
+
+- Be more explicit with the PINRemoteImage dependency
+
 ## [5.0.2](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.2)
 
 Changes for users of the library in 5.0.2:
 
-- Restore a method that was accidentally removed in 5.0.0. This prevented a long-tap guesture from displaying the 'Copy' menu.
+- Restore a method that was accidentally removed in 5.0.0. This prevented a long-tap gesture from displaying the 'Copy' menu.
 - Remove obsolete check for iOS 8.3.
 
 ## [5.0.1](https://github.com/nytimes/NYTPhotoViewer/releases/tag/5.0.1)

Cartfile

@@ -1 +1 @@
-github "pinterest/PINRemoteImage" ~> 3.0.0
+github "pinterest/PINRemoteImage" ~> 3.0.1

Cartfile.resolved

@@ -1,4 +1,5 @@
-github "erikdoe/ocmock" "v3.6"
-github "pinterest/PINCache" "3.0.1-beta.8"
-github "pinterest/PINOperation" "1.1.2"
-github "pinterest/PINRemoteImage" "3.0.0"
+git "https://chromium.googlesource.com/webm/libwebp" "v1.1.0"
+github "erikdoe/ocmock" "v3.7.1"
+github "pinterest/PINCache" "3.0.1"
+github "pinterest/PINOperation" "1.2"
+github "pinterest/PINRemoteImage" "3.0.1"

Carthage/Checkouts/PINCache/.github/workflows/ci.yaml

@@ -0,0 +1,51 @@
+---
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+      - 'releases/*'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build
+    runs-on: macOS-latest
+    strategy:
+      matrix:
+        platform: ['iOS Simulator,name=iPhone 8']
+    steps:
+      - uses: actions/checkout@v1
+      - name: Analyze and Test
+        run: |
+          xcodebuild clean analyze test \
+            -destination "platform=${{ matrix.platform }}" \
+            -sdk "iphonesimulator" \
+            -project PINCache.xcodeproj \
+            -scheme PINCache \
+            ONLY_ACTIVE_ARCH=NO \
+            CODE_SIGNING_REQUIRED=NO \
+            CLANG_ANALYZER_OUTPUT=plist-html \
+            CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang" \
+           | xcpretty
+          if [[ -n `find $(pwd)/clang -name "*.html"` ]] ; then rm -rf $(pwd)/clang; exit 1; fi
+          rm -rf $(pwd)/clang
+  cocoapods:
+    name: CocoaPods
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Lint
+        run: pod lib lint
+  carthage:
+    name: Carthage
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Update
+        run: carthage update --no-use-binaries --no-build
+      - name: Build
+        run: carthage build --no-skip-current

Carthage/Checkouts/PINCache/.github_changelog_generator

@@ -0,0 +1,3 @@
+issues=false
+since-tag=3.0.1-beta.8
+future-release=3.0.1

Carthage/Checkouts/PINCache/CHANGELOG.md

@@ -1,6 +1,31 @@
-## master
-
-* Add your own contributions to the next release on the line below this with your name.
+# Changelog
+
+## [3.0.1](https://github.com/Pinterest/PINCache/tree/3.0.1) (2020-08-20)
+
+[Full Changelog](https://github.com/Pinterest/PINCache/compare/3.0.1-beta.8...3.0.1)
+
+**Implemented enhancements:**
+
+- Support Catalyst [\#272](https://github.com/pinterest/PINCache/pull/272) ([cgmaier](https://github.com/cgmaier))
+
+**Merged pull requests:**
+
+- Update PINOperation [\#277](https://github.com/pinterest/PINCache/pull/277) ([garrettmoon](https://github.com/garrettmoon))
+- Fix PINCacheTests compiling in Xcode 12.0b4 [\#276](https://github.com/pinterest/PINCache/pull/276) ([arangato](https://github.com/arangato))
+- Remove BUCK files [\#274](https://github.com/pinterest/PINCache/pull/274) ([adlerj](https://github.com/adlerj))
+- Fix compiling in Xcode 12.0b4 [\#273](https://github.com/pinterest/PINCache/pull/273) ([zacwest](https://github.com/zacwest))
+- Fix the grammar in an assertion failure message [\#270](https://github.com/pinterest/PINCache/pull/270) ([jparise](https://github.com/jparise))
+- Add Carthage for watchOS, fix macOS min deployment target version [\#269](https://github.com/pinterest/PINCache/pull/269) ([dreampiggy](https://github.com/dreampiggy))
+- Remove the unused CI directory [\#265](https://github.com/pinterest/PINCache/pull/265) ([jparise](https://github.com/jparise))
+- Fix up analyze for github CI [\#264](https://github.com/pinterest/PINCache/pull/264) ([garrettmoon](https://github.com/garrettmoon))
+- Use correct class name in NSAssert\(\) messages [\#263](https://github.com/pinterest/PINCache/pull/263) ([jparise](https://github.com/jparise))
+- Check fileURL outside of the locked scope [\#262](https://github.com/pinterest/PINCache/pull/262) ([jparise](https://github.com/jparise))
+- Remove Danger from the project [\#261](https://github.com/pinterest/PINCache/pull/261) ([jparise](https://github.com/jparise))
+- Switch to GitHub Actions for CI [\#259](https://github.com/pinterest/PINCache/pull/259) ([jparise](https://github.com/jparise))
+- Test that the "remove object" blocks are called [\#258](https://github.com/pinterest/PINCache/pull/258) ([jparise](https://github.com/jparise))
+- Discrepancy between Header Comment and Implementation \#trivial [\#257](https://github.com/pinterest/PINCache/pull/257) ([jlaws](https://github.com/jlaws))
+- Optimization `PINMemoryCache` trim to date [\#252](https://github.com/pinterest/PINCache/pull/252) ([kinarobin](https://github.com/kinarobin))
+- Optimize `PINMemoryCache` remove objects when receive memory warning notification [\#251](https://github.com/pinterest/PINCache/pull/251) ([kinarobin](https://github.com/kinarobin))
 
 ## 3.0.1 -- Beta 8
 - [fix] Initing PINCache with TTL enabled should enable TTL on PINMemoryCache. [#246](https://github.com/pinterest/PINCache/pull/246)

Carthage/Checkouts/PINCache/CODE_OF_CONDUCT.md

@@ -0,0 +1,40 @@
+# Code of Conduct
+
+At Pinterest, we work hard to ensure that our work environment is welcoming
+and inclusive to as many people as possible. We are committed to creating this
+environment for everyone involved in our open source projects as well. We
+welcome all participants regardless of ability, age, ethnicity, identified
+gender, religion (or lack there of), sexual orientation and socioeconomic
+status.
+
+This code of conduct details our expectations for upholding these values.
+
+## Good behavior
+
+We expect members of our community to exhibit good behavior including (but of
+course not limited to):
+
+- Using intentional and empathetic language.
+- Focusing on resolving instead of escalating conflict.
+- Providing constructive feedback.
+
+## Unacceptable behavior
+
+Some examples of unacceptable behavior (again, this is not an exhaustive
+list):
+
+- Harassment, publicly or in private.
+- Trolling.
+- Sexual advances (this isn’t the place for it).
+- Publishing other’s personal information.
+- Any behavior which would be deemed unacceptable in a professional environment.
+
+## Recourse
+
+If you are witness to or the target of unacceptable behavior, it should be
+reported to Pinterest at [email protected]. All reporters will
+be kept confidential and an appropriate response for each incident will be
+evaluated.
+
+If the maintainers do not uphold and enforce this code of conduct in
+good faith, community leadership will hold them accountable.

Carthage/Checkouts/PINCache/Cartfile

@@ -1 +1 @@
-github "pinterest/PINOperation" ~> 1.1.0
+github "pinterest/PINOperation" ~> 1.2.0

Carthage/Checkouts/PINCache/Cartfile.resolved

@@ -1 +1 @@
-github "pinterest/PINOperation" "1.1"
+github "pinterest/PINOperation" "1.2"

Carthage/Checkouts/PINCache/Carthage/Checkouts/PINOperation/.github/workflows/ci.yml

@@ -0,0 +1,80 @@
+---
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+      - 'releases/*'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build
+    runs-on: macOS-latest
+    strategy:
+      matrix:
+        platform: ['iOS Simulator,name=iPhone 8']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Analyze and Test
+        run: |
+          xcodebuild clean analyze test \
+            -destination "platform=${{ matrix.platform }}" \
+            -sdk "iphonesimulator" \
+            -project PINOperation.xcodeproj \
+            -scheme PINOperation \
+            ONLY_ACTIVE_ARCH=NO \
+            CODE_SIGNING_REQUIRED=NO \
+            CLANG_ANALYZER_OUTPUT=plist-html \
+            CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang" \
+          | xcpretty
+          if [[ -n `find $(pwd)/clang -name "*.html"` ]] ; then rm -rf $(pwd)/clang; exit 1; fi
+          rm -rf $(pwd)/clang
+  cocoapods:
+    name: CocoaPods
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Lint
+        run: pod lib lint
+  carthage:
+    name: Carthage
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build
+        run: carthage build --no-skip-current
+  spm:
+    name: Swift Package Manager tests
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Test
+        run: swift test
+  example:
+    name: Build Example project
+    runs-on: macOS-latest
+    strategy:
+      matrix:
+        platform: ['iOS Simulator,name=iPhone 8']
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Pods
+        run: cd Example && pod install
+      - name: Build 
+        run: |
+          cd Example && xcodebuild clean analyze \
+            -destination "platform=${{ matrix.platform }}" \
+            -sdk "iphonesimulator" \
+            -workspace PINOperationExample.xcworkspace \
+            -scheme PINOperationExample \
+            ONLY_ACTIVE_ARCH=NO \
+            CODE_SIGNING_REQUIRED=NO \
+            CLANG_ANALYZER_OUTPUT=plist-html \
+            CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang" \
+          | xcpretty
+          if [[ -n `find $(pwd)/clang -name "*.html"` ]] ; then rm -rf $(pwd)/clang; exit 1; fi
+          rm -rf $(pwd)/clang

Carthage/Checkouts/PINCache/Carthage/Checkouts/PINOperation/.github_changelog_generator

@@ -0,0 +1,3 @@
+issues=false
+since-tag=1.1.1
+future-release=1.2

Carthage/Checkouts/PINCache/Carthage/Checkouts/PINOperation/.gitignore

@@ -52,3 +52,6 @@ Carthage/Build
 # Bundler
 .bundle
 vendor
+
+# Example project
+Example/Pods

Carthage/Checkouts/PINCache/Carthage/Checkouts/PINOperation/BUCK

@@ -1,8 +1,9 @@
 apple_library(
   name = 'PINOperation',
-  exported_headers = glob(['PINOperation/*.h']),
+  modular = True,
+  exported_headers = glob(['Source/*.h']),
   srcs =
-    glob(['PINOperation/*.m']),
+    glob(['Source/*.m']),
   preprocessor_flags = ['-fobjc-arc'],
   lang_preprocessor_flags = {
     'C': ['-std=gnu99'],