Update dependencies to fix carthage build

Cartfile.resolved

@@ -1,3 +1,3 @@
 git "https://chromium.googlesource.com/webm/libwebp" "v1.1.0"
-github "pinterest/PINCache" "3.0.1"
-github "pinterest/PINOperation" "1.2.0"
+github "pinterest/PINCache" "3.0.3"
+github "pinterest/PINOperation" "1.2.1"

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

@@ -11,41 +11,43 @@ on:
       - master
 
 jobs:
-  build:
-    name: Build
+  test:
+    name: Test
     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
+      - uses: actions/checkout@v2
+      - name: Test
+        run: make test
+  analyze:
+    name: Analyze
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: analyze
+        run: make analyze
   cocoapods:
     name: CocoaPods
     runs-on: macOS-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Lint
-        run: pod lib lint
+        run: make cocoapods
   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
+      - uses: actions/checkout@v2
+      - name: carthage
+        run: make carthage
+  swift-package-manager:
+    runs-on: macos-latest
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Verify that PINCache can be build by SPM
+        run: make spm

Carthage/Checkouts/PINCache/.github/workflows/publish_release.yml

@@ -0,0 +1,39 @@
+name: Create Release
+on:
+  workflow_dispatch:
+    inputs:
+      release-type:
+        description: 'The type of release. Must be major, minor or patch'
+        required: true
+jobs:
+  create_release:
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+      # Make sure we can lint before creating the release.
+      - name: Cocoapods lint
+        run: make cocoapods
+      - name: Create Release Branch
+        env:
+          GITHUB_CHANGELOG_API_KEY: ${{ secrets.GITHUB_TOKEN }}
+          OSS_PROJECT: PINCache
+        run: |
+          gem install github_changelog_generator
+          Scripts/release.sh --${{ github.event.inputs.release-type }}
+          git push origin HEAD
+      - name: Tag Release
+        run: Scripts/tag-release-branch.sh
+      - name: Publish Release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_CHANGELOG_API_KEY: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_TAG }}
+          release_name: ${{ env.RELEASE_TAG }}
+          body_path: RELEASE_NOTES.md
+          draft: false
+      - name: Push to Cocoapods
+        env:
+          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+        run: pod trunk push

Carthage/Checkouts/PINCache/.github_changelog_generator

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

Carthage/Checkouts/PINCache/.gitignore

@@ -23,3 +23,8 @@ xcuserdata
 /.buckd
 
 Carthage/Build
+
+# SPM
+.swiftpm/
+.build/
+Package.resolved

Carthage/Checkouts/PINCache/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [3.0.3](https://github.com/Pinterest/PINCache/tree/3.0.3) (2020-10-22)
+
+[Full Changelog](https://github.com/Pinterest/PINCache/compare/3.0.2...3.0.3)
+
+
+- Update PINOperation to fix imports [\#293](https://github.com/pinterest/PINCache/pull/293) ([garrettmoon](https://github.com/garrettmoon))
+- Add support for automated releases [\#292](https://github.com/pinterest/PINCache/pull/292) ([garrettmoon](https://github.com/garrettmoon))
+- Fix up imports [\#290](https://github.com/pinterest/PINCache/pull/290) ([garrettmoon](https://github.com/garrettmoon))
+- Fix build issues by removing nested PINOperation.xcodeproj [\#282](https://github.com/pinterest/PINCache/pull/282) ([elliottwilliams](https://github.com/elliottwilliams))
+
+## [3.0.2](https://github.com/Pinterest/PINCache/tree/3.0.2) (2020-10-06)
+
+[Full Changelog](https://github.com/Pinterest/PINCache/compare/3.0.1...3.0.2)
+
+**Merged pull requests:**
+
+- Update checkout action [\#287](https://github.com/pinterest/PINCache/pull/287) ([garrettmoon](https://github.com/garrettmoon))
+- Use make commands on the CI so it actually fails [\#286](https://github.com/pinterest/PINCache/pull/286) ([garrettmoon](https://github.com/garrettmoon))
+- Added SPM support [\#283](https://github.com/pinterest/PINCache/pull/283) ([3a4oT](https://github.com/3a4oT))
+- Fix PINCaching compiling in Xcode 12.0b6 \(\#275\) [\#281](https://github.com/pinterest/PINCache/pull/281) ([sagesse-cn](https://github.com/sagesse-cn))
+
 ## [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)

Carthage/Checkouts/PINCache/Cartfile

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

Carthage/Checkouts/PINCache/Makefile

@@ -2,13 +2,13 @@ PLATFORM="platform=iOS Simulator,name=iPhone 8"
 SDK="iphonesimulator"
 SHELL=/bin/bash -o pipefail
 
-.PHONY: all lint test carthage analyze
+.PHONY: all cocoapods test carthage analyze spm
 
-lint:
+cocoapods:
 	pod lib lint
 
 analyze:
-	xcodebuild clean analyze -destination ${PLATFORM} -sdk ${SDK} -project PINCache.xcodeproj -scheme PINCache \
+	xcodebuild clean analyze -destination ${PLATFORM} -sdk ${SDK} -workspace PINCache.xcworkspace -scheme PINCache \
 	ONLY_ACTIVE_ARCH=NO \
 	CODE_SIGNING_REQUIRED=NO \
 	CLANG_ANALYZER_OUTPUT=plist-html \
@@ -17,12 +17,18 @@ analyze:
 	rm -rf $(shell pwd)/clang
 
 test:
-	xcodebuild clean test -destination ${PLATFORM} -sdk ${SDK} -project PINCache.xcodeproj -scheme PINCache \
+	xcodebuild clean test -destination ${PLATFORM} -sdk ${SDK} -workspace PINCache.xcworkspace -scheme PINCache \
 	ONLY_ACTIVE_ARCH=NO \
 	CODE_SIGNING_REQUIRED=NO | xcpretty
 
 carthage:
 	carthage update --no-use-binaries --no-build
 	carthage build --no-skip-current
 
-all: carthage lint test analyze
+spm:
+# For now just check whether we can assemble it
+# TODO: replace it with "swift test --enable-test-discovery --sanitize=thread" when swiftPM resource-related bug would be fixed.
+# https://bugs.swift.org/browse/SR-13560
+	swift build
+
+all: carthage cocoapods test analyze spm

Carthage/Checkouts/PINCache/PINCache.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = 'PINCache'
-  s.version       = '3.0.1'
+  s.version       = '3.0.3'
   s.homepage      = 'https://github.com/pinterest/PINCache'
   s.summary       = 'Fast, thread safe, parallel object cache for iOS and OS X.'
   s.authors       = { 'Garrett Moon' => 'garrett@pinterest.com', 'Justin Ouellette' => 'jstn@tumblr.com' }
@@ -22,7 +22,7 @@ EOS
   s.prefix_header_contents = pch_PIN
   s.subspec 'Core' do |sp|
       sp.source_files  = 'Source/*.{h,m}'
-      sp.dependency 'PINOperation', '~> 1.2.0'
+      sp.dependency 'PINOperation', '~> 1.2.1'
   end
   s.subspec 'Arc-exception-safe' do |sp|
       sp.dependency 'PINCache/Core'