Fix coercion errors

Author: tettoffensive

Source/Shared/Configuration/DiskConfig.swift

@@ -31,7 +31,6 @@ public struct DiskConfig {
     self.expiry = expiry
     self.maxSize = maxSize
     self.directory = directory
-    self.protectionType = protectionType
   }
   #endif
 }

Source/Shared/Storage/DiskStorage.swift

@@ -69,7 +69,7 @@ extension DiskStorage: StorageAware {
     let expiry = expiry ?? config.expiry
     let data = try DataSerializer.serialize(object: object)
     let filePath = makeFilePath(for: key)
-    fileManager.createFile(atPath: filePath, contents: data, attributes: nil)
+    _ = fileManager.createFile(atPath: filePath, contents: data, attributes: nil)
     try fileManager.setAttributes([.modificationDate: expiry.date], ofItemAtPath: filePath)
   }
 
@@ -104,18 +104,18 @@ extension DiskStorage: StorageAware {
     }
 
     for url in urlArray {
-      let resourceValues = try (url as NSURL).resourceValues(forKeys: resourceKeys)
-      guard (resourceValues[.isDirectoryKey] as? NSNumber)?.boolValue == false else {
+      let resourceValues = try url.resourceValues(forKeys: Set(resourceKeys))
+      guard resourceValues.isDirectory != true else {
         continue
       }
 
-      if let expiryDate = resourceValues[.contentModificationDateKey] as? Date, expiryDate.inThePast {
+      if let expiryDate = resourceValues.contentModificationDate, expiryDate.inThePast {
         filesToDelete.append(url)
         continue
       }
 
-      if let fileSize = resourceValues[.totalFileAllocatedSizeKey] as? NSNumber {
-        totalSize += fileSize.uintValue
+      if let fileSize = resourceValues.totalFileAllocatedSize {
+        totalSize += UInt(fileSize)
         resourceObjects.append((url: url, resourceValues: resourceValues))
       }
     }
@@ -135,12 +135,12 @@ extension DiskStorage {
    Sets attributes on the disk cache folder.
    - Parameter attributes: Directory attributes
    */
-  func setDirectoryAttributes(_ attributes: [FileAttributeKey : Any]) throws {
+  func setDirectoryAttributes(_ attributes: [FileAttributeKey: Any]) throws {
     try fileManager.setAttributes(attributes, ofItemAtPath: path)
   }
 }
 
-typealias ResourceObject = (url: Foundation.URL, resourceValues: [AnyHashable: Any])
+typealias ResourceObject = (url: Foundation.URL, resourceValues: URLResourceValues)
 
 extension DiskStorage {
   /**
@@ -166,7 +166,7 @@ extension DiskStorage {
     var size: UInt64 = 0
     let contents = try fileManager.contentsOfDirectory(atPath: path)
     for pathComponent in contents {
-      let filePath = (path as NSString).appendingPathComponent(pathComponent)
+      let filePath = NSString(string: path).appendingPathComponent(pathComponent)
       let attributes = try fileManager.attributesOfItem(atPath: filePath)
       if let fileSize = attributes[.size] as? UInt64 {
         size += fileSize
@@ -198,9 +198,8 @@ extension DiskStorage {
     let targetSize = config.maxSize / 2
 
     let sortedFiles = objects.sorted {
-      let key = URLResourceKey.contentModificationDateKey
-      if let time1 = ($0.resourceValues[key] as? Date)?.timeIntervalSinceReferenceDate,
-        let time2 = ($1.resourceValues[key] as? Date)?.timeIntervalSinceReferenceDate {
+      if let time1 = $0.resourceValues.contentModificationDate?.timeIntervalSinceReferenceDate,
+        let time2 = $1.resourceValues.contentModificationDate?.timeIntervalSinceReferenceDate {
         return time1 > time2
       } else {
         return false
@@ -209,8 +208,8 @@ extension DiskStorage {
 
     for file in sortedFiles {
       try fileManager.removeItem(at: file.url)
-      if let fileSize = file.resourceValues[URLResourceKey.totalFileAllocatedSizeKey] as? NSNumber {
-        totalSize -= fileSize.uintValue
+      if let fileSize = file.resourceValues.totalFileAllocatedSize {
+        totalSize -= UInt(fileSize)
       }
       if totalSize < targetSize {
         break

Source/Shared/Storage/MemoryStorage.swift

@@ -20,7 +20,7 @@ final class MemoryStorage {
 
 extension MemoryStorage: StorageAware {
   func entry<T: Codable>(ofType type: T.Type, forKey key: String) throws -> Entry<T> {
-    guard let capsule = cache.object(forKey: key as NSString) else {
+    guard let capsule = cache.object(forKey: NSString(string: key)) else {
       throw StorageError.notFound
     }
 
@@ -32,13 +32,13 @@ extension MemoryStorage: StorageAware {
   }
 
   func removeObject(forKey key: String) {
-    cache.removeObject(forKey: key as NSString)
+    cache.removeObject(forKey: NSString(string: key))
     keys.remove(key)
   }
 
   func setObject<T: Codable>(_ object: T, forKey key: String, expiry: Expiry? = nil) {
     let capsule = MemoryCapsule(value: object, expiry: expiry ?? config.expiry)
-    cache.setObject(capsule, forKey: key as NSString)
+    cache.setObject(capsule, forKey: NSString(string: key))
     keys.insert(key)
   }
 
@@ -61,7 +61,7 @@ extension MemoryStorage {
    - Parameter key: Unique key to identify the object in the cache
    */
   func removeObjectIfExpired(forKey key: String) {
-    if let capsule = cache.object(forKey: key as NSString), capsule.expiry.isExpired {
+    if let capsule = cache.object(forKey: NSString(string: key)), capsule.expiry.isExpired {
       removeObject(forKey: key)
     }
   }