Merge branch 'master' into spm

Author: garrettmoon

.github/workflows/ci.yaml

@@ -11,51 +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
+      - name: Test
+        run: make test
+  analyze:
+    name: Analyze
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: analyze
+        run: make analyze
   cocoapods:
     name: CocoaPods
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v2
       - name: Lint
-        run: pod lib lint
+        run: make cocoapods
   carthage:
     name: Carthage
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Update
-        run: carthage update --no-use-binaries --no-build
-      - name: Build
-        run: carthage build --no-skip-current
-  SPM-Build:
+      - 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

Makefile

@@ -2,9 +2,9 @@ PLATFORM="platform=iOS Simulator,name=iPhone 8"
 SDK="iphonesimulator"
 SHELL=/bin/bash -o pipefail
 
-.PHONY: all lint test carthage analyze spm
+.PHONY: all cocoapods test carthage analyze spm
 
-lint:
+cocoapods:
 	pod lib lint
 
 analyze:
@@ -31,4 +31,4 @@ spm:
 # https://bugs.swift.org/browse/SR-13560
 	swift build
 
-all: carthage lint test analyze spm
+all: carthage cocoapods test analyze spm

Tests/PINCacheTests.m

@@ -742,13 +742,13 @@ - (void)testAgeLimit
     }];
 
     dispatch_group_enter(group);
-    [self.cache.diskCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
+    [self.cache.diskCache objectForKeyAsync:key1 completion:^(PINDiskCache * _Nonnull cache, NSString * _Nonnull key, id<NSCoding>  _Nullable object) {
         diskObj1 = object;
         dispatch_group_leave(group);
     }];
 
     dispatch_group_enter(group);
-    [self.cache.diskCache objectForKeyAsync:key2 completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
+    [self.cache.diskCache objectForKeyAsync:key2 completion:^(PINDiskCache * _Nonnull cache, NSString * _Nonnull key, id<NSCoding>  _Nullable object) {
         diskObj2 = object;
         dispatch_group_leave(group);
     }];
@@ -785,13 +785,13 @@ - (void)testAgeLimit
     }];
 
     dispatch_group_enter(group);
-    [self.cache.diskCache objectForKeyAsync:key1 completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
+    [self.cache.diskCache objectForKeyAsync:key1 completion:^(PINDiskCache * _Nonnull cache, NSString * _Nonnull key, id<NSCoding>  _Nullable object) {
         diskObj1 = object;
         dispatch_group_leave(group);
     }];
 
     dispatch_group_enter(group);
-    [self.cache.diskCache objectForKeyAsync:key2 completion:^(PINDiskCache *cache, NSString *key, id<NSCoding> object) {
+    [self.cache.diskCache objectForKeyAsync:key2 completion:^(PINDiskCache * _Nonnull cache, NSString * _Nonnull key, id<NSCoding>  _Nullable object) {
         diskObj2 = object;
         dispatch_group_leave(group);
     }];
@@ -916,7 +916,7 @@ - (void)_testTTLCacheObjectAccess {
     }];
 
     dispatch_group_enter(group);
-    [self.cache.diskCache objectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
+    [self.cache.diskCache objectForKeyAsync:key completion:^(PINDiskCache * _Nonnull cache, NSString * _Nonnull key, id<NSCoding> _Nullable object) {
         diskObj = object;
         dispatch_group_leave(group);
     }];
@@ -940,7 +940,7 @@ - (void)_testTTLCacheObjectAccess {
     }];
 
     dispatch_group_enter(group);
-    [self.cache.diskCache objectForKeyAsync:key completion:^(id<PINCaching> cache, NSString *key, id<NSCoding> object) {
+    [self.cache.diskCache objectForKeyAsync:key completion:^(PINDiskCache * _Nonnull cache, NSString * _Nonnull key, id<NSCoding> _Nullable object) {
         diskObj = object;
         dispatch_group_leave(group);
     }];