Merge pull request #130 from spotify/dflems/20210924-ci

Xcode 13 support, fix some warnings, remove suppressions
spotify · Sep 24, 2021 · 12f1d72 · 12f1d72
2 parents 974682a + 1b5e24f
commit 12f1d72
Show file tree

Hide file tree

Showing 72 changed files with 134 additions and 117 deletions.
diff --git a/SPTPersistentCache.xcodeproj/project.pbxproj b/SPTPersistentCache.xcodeproj/project.pbxproj
@@ -353,7 +353,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SPTPersistentCache;
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = Spotify;
 				TargetAttributes = {
 					0510FF121BA2FF7A00ED0766 = {

diff --git a/SPTPersistentCache.xcodeproj/xcshareddata/xcschemes/SPTPersistentCache.xcscheme b/SPTPersistentCache.xcodeproj/xcshareddata/xcschemes/SPTPersistentCache.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo.xcodeproj/project.pbxproj b/SPTPersistentCacheDemo/SPTPersistentCacheDemo.xcodeproj/project.pbxproj
@@ -157,7 +157,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SPT;
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = Spotify;
 				TargetAttributes = {
 					055725F91C65280000EF6787 = {

diff --git a/...o/SPTPersistentCacheDemo.xcodeproj/xcshareddata/xcschemes/SPTPersistentCacheDemo.xcscheme b/...o/SPTPersistentCacheDemo.xcodeproj/xcshareddata/xcschemes/SPTPersistentCacheDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/AppDelegate.h b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/AppDelegate.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/AppDelegate.m b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/AppDelegate.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.h b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -25,7 +25,7 @@
 @interface DetailViewController : UIViewController
 
 @property (nonatomic, strong) SPTPersistentCache *persistentDataCache;
-@property (strong, nonatomic) id detailItem;
+@property (strong, nonatomic) NSObject *detailItem;
 @property (nonatomic, weak, readwrite) IBOutlet UIImageView *detailImageView;
 
 @end

diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.m b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/MasterViewController.h b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/MasterViewController.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/MasterViewController.m b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/MasterViewController.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/main.m b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/main.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/SPTPersistentCacheFramework/Info.plist b/SPTPersistentCacheFramework/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleVersion</key>
 	<string>1.1.1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2020 Spotify. All rights reserved.</string>
+	<string>Copyright © 2015-2021 Spotify. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/SPTPersistentCacheFramework/SPTPersistentCacheFramework.xcodeproj/project.pbxproj b/SPTPersistentCacheFramework/SPTPersistentCacheFramework.xcodeproj/project.pbxproj
@@ -370,7 +370,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SPTPersistentCache;
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = Spotify;
 				TargetAttributes = {
 					0520219B1C737DBE003A4FB4 = {

diff --git a/...PersistentCacheFramework.xcodeproj/xcshareddata/xcschemes/SPTPersistentCache-OSX.xcscheme b/...PersistentCacheFramework.xcodeproj/xcshareddata/xcschemes/SPTPersistentCache-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...PersistentCacheFramework.xcodeproj/xcshareddata/xcschemes/SPTPersistentCache-iOS.xcscheme b/...PersistentCacheFramework.xcodeproj/xcshareddata/xcschemes/SPTPersistentCache-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Sources/NSError+SPTPersistentCacheDomainErrors.h b/Sources/NSError+SPTPersistentCacheDomainErrors.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/NSError+SPTPersistentCacheDomainErrors.m b/Sources/NSError+SPTPersistentCacheDomainErrors.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCache+Private.h b/Sources/SPTPersistentCache+Private.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCache.m b/Sources/SPTPersistentCache.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -61,6 +61,13 @@ void SPTPersistentCacheSafeDispatch(_Nullable dispatch_queue_t queue, _Nonnull d
     }
 }
 
+@interface SPTPersistentCacheFileInfo : NSObject
+@property (nonatomic, strong, readonly) NSString *fileName;
+@property (nonatomic, strong, readonly) NSDate *mdate;
+@property (nonatomic, assign, readonly) off_t fileSize;
+- (instancetype)initWithFileName:(NSString *)fileName mdate:(NSDate *)mdate fileSize:(off_t)fileSize;
+@end
+
 // Class extension exists in SPTPersistentCache+Private.h
 
 #pragma mark - SPTPersistentCache
@@ -959,22 +966,22 @@ - (BOOL)pruneBySize
     }
 
     // Find all the image names and attributes and sort oldest last
-    NSMutableArray *images = [self storedImageNamesAndAttributes];
+    NSMutableArray<SPTPersistentCacheFileInfo *> *files = [self storedFileNamesAndAttributes];
 
     // Find the free space on the disk
     SPTPersistentCacheDiskSize currentCacheSize = (SPTPersistentCacheDiskSize)[self lockedItemsSizeInBytes];
-    for (NSDictionary *image in images) {
-        currentCacheSize += [image[SPTDataCacheFileAttributesKey][NSFileSize] integerValue];
+    for (SPTPersistentCacheFileInfo *file in files) {
+        currentCacheSize += file.fileSize;
     }
 
     SPTPersistentCacheDiskSize optimalCacheSize = [self.dataCacheFileManager optimizedDiskSizeForCacheSize:currentCacheSize];
 
     // Remove oldest data until we reach acceptable cache size
-    while (currentCacheSize > optimalCacheSize && images.count) {
-        NSDictionary *image = images.lastObject;
-        [images removeLastObject];
+    while (currentCacheSize > optimalCacheSize && files.count) {
+        SPTPersistentCacheFileInfo *file = files.lastObject;
+        [files removeLastObject];
 
-        NSString *fileName = image[SPTDataCacheFileNameKey];
+        NSString *fileName = file.fileName;
         NSError *localError = nil;
         if (fileName.length > 0 && ![self.fileManager removeItemAtPath:fileName error:&localError]) {
             [self debugOutput:@"PersistentDataCache: %@ ERROR %@", @(__PRETTY_FUNCTION__), [localError localizedDescription]];
@@ -983,12 +990,12 @@ - (BOOL)pruneBySize
             [self debugOutput:@"PersistentDataCache: evicting by size key:%@", fileName.lastPathComponent];
         }
 
-        currentCacheSize -= [image[SPTDataCacheFileAttributesKey][NSFileSize] integerValue];
+        currentCacheSize -= file.fileSize;
     }
     return YES;
 }
 
-- (NSMutableArray *)storedImageNamesAndAttributes
+- (NSMutableArray<SPTPersistentCacheFileInfo *> *)storedFileNamesAndAttributes
 {
     NSURL *urlPath = [NSURL fileURLWithPath:self.options.cachePath];
 
@@ -1001,7 +1008,7 @@ - (NSMutableArray *)storedImageNamesAndAttributes
                                                                 errorHandler:nil];
 
     // An array to store the all the enumerated file names in
-    NSMutableArray *images = [NSMutableArray array];
+    NSMutableArray<SPTPersistentCacheFileInfo *> *files = [NSMutableArray array];
 
     // Enumerate the dirEnumerator results, each value is stored in allURLs
     NSURL *theURL = nil;
@@ -1043,28 +1050,26 @@ - (NSMutableArray *)storedImageNamesAndAttributes
                  Use modification time even for files with TTL
                  Files with TTL have updateTime set once on creation.
                  */
-                NSDate *mdate = [NSDate dateWithTimeIntervalSince1970:(fileStat.st_mtimespec.tv_sec + fileStat.st_mtimespec.tv_nsec*1e9)];
-                NSNumber *fsize = [NSNumber numberWithLongLong:fileStat.st_size];
-                NSDictionary *values = @{NSFileModificationDate : mdate, NSFileSize: fsize};
 
-                [images addObject:@{ SPTDataCacheFileNameKey : filePathString,
-                                     SPTDataCacheFileAttributesKey : values }];
+                NSDate *mdate = [NSDate dateWithTimeIntervalSince1970:(fileStat.st_mtimespec.tv_sec + fileStat.st_mtimespec.tv_nsec*1e9)];
+                SPTPersistentCacheFileInfo *info = [[SPTPersistentCacheFileInfo alloc] initWithFileName:filePathString
+                                                                                                  mdate:mdate
+                                                                                               fileSize:fileStat.st_size];
+                [files addObject:info];
             }
         } else {
             [self debugOutput:@"Unable to fetch isDir#5 attribute:%@", theURL];
         }
     }
 
     // Oldest goes last
-    NSComparisonResult(^SPTSortFilesByModificationDate)(id, id) = ^NSComparisonResult(NSDictionary *file1, NSDictionary *file2) {
-        NSDate *date1 = file1[SPTDataCacheFileAttributesKey][NSFileModificationDate];
-        NSDate *date2 = file2[SPTDataCacheFileAttributesKey][NSFileModificationDate];
-        return [date2 compare:date1];
+    NSComparisonResult(^SPTSortFilesByModificationDate)(id, id) = ^NSComparisonResult(SPTPersistentCacheFileInfo *file1, SPTPersistentCacheFileInfo *file2) {
+        return [file2.mdate compare:file1.mdate];
     };
 
-    NSArray *sortedImages = [images sortedArrayUsingComparator:SPTSortFilesByModificationDate];
+    [files sortUsingComparator:SPTSortFilesByModificationDate];
 
-    return [sortedImages mutableCopy];
+    return files;
 }
 
 - (NSTimeInterval)currentDateTimeInterval
@@ -1090,3 +1095,18 @@ - (void)logTimingForKey:(NSString *)key method:(SPTPersistentCacheDebugMethodTyp
 }
 
 @end
+
+@implementation SPTPersistentCacheFileInfo
+
+- (instancetype)initWithFileName:(NSString *)fileName mdate:(NSDate *)mdate fileSize:(off_t)fileSize
+{
+    self = [super init];
+    if (self) {
+        _fileName = fileName;
+        _mdate = mdate;
+        _fileSize = fileSize;
+    }
+    return self;
+}
+
+@end
diff --git a/Sources/SPTPersistentCacheDebugUtilities.h b/Sources/SPTPersistentCacheDebugUtilities.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheDebugUtilities.m b/Sources/SPTPersistentCacheDebugUtilities.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheFileManager+Private.h b/Sources/SPTPersistentCacheFileManager+Private.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheFileManager.h b/Sources/SPTPersistentCacheFileManager.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheFileManager.m b/Sources/SPTPersistentCacheFileManager.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheGarbageCollector.h b/Sources/SPTPersistentCacheGarbageCollector.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheGarbageCollector.m b/Sources/SPTPersistentCacheGarbageCollector.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheHeader.m b/Sources/SPTPersistentCacheHeader.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheObjectDescription.h b/Sources/SPTPersistentCacheObjectDescription.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheObjectDescription.m b/Sources/SPTPersistentCacheObjectDescription.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheOptions.m b/Sources/SPTPersistentCacheOptions.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -108,7 +108,7 @@ - (void)setDefaultExpirationPeriod:(NSUInteger)defaultExpirationPeriod
 
 - (id)copyWithZone:(NSZone *)zone
 {
-    SPTPersistentCacheOptions * const copy = [[self.class allocWithZone:zone] init];
+    SPTPersistentCacheOptions * const copy = [(SPTPersistentCacheOptions *)[self.class allocWithZone:zone] init];
 
     copy.cacheIdentifier = self.cacheIdentifier;
     copy.cachePath = self.cachePath;

diff --git a/Sources/SPTPersistentCachePosixWrapper.h b/Sources/SPTPersistentCachePosixWrapper.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCachePosixWrapper.m b/Sources/SPTPersistentCachePosixWrapper.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheRecord+Private.h b/Sources/SPTPersistentCacheRecord+Private.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheRecord.m b/Sources/SPTPersistentCacheRecord.m
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file

diff --git a/Sources/SPTPersistentCacheResponse+Private.h b/Sources/SPTPersistentCacheResponse+Private.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2020 Spotify AB.
+ Copyright (c) 2015-2021 Spotify AB.
 
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file