Clean up and add watchOS support

Author: 3lvis

Cache.podspec

@@ -8,9 +8,10 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/hyperoslo/Cache.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/hyperoslo'
 
-  s.ios.deployment_target = '11.0'
-  s.osx.deployment_target = '10.12'
-  s.tvos.deployment_target = '11.0'
+  s.ios.deployment_target = '12.0'
+  s.osx.deployment_target = '10.14'
+  s.tvos.deployment_target = '12.0'
+  s.watchos.deployment_target = '6.0'
 
   s.requires_arc = true
   s.ios.source_files = 'Source/{iOS,Shared}/**/*'

Cache.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Cache.xcodeproj/xcshareddata/xcschemes/Cache-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Cache.xcodeproj/xcshareddata/xcschemes/Cache-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Cache.xcodeproj/xcshareddata/xcschemes/Cache-tvOS.xcscheme

@@ -10,9 +10,7 @@ public struct DiskConfig {
   public let maxSize: UInt
   /// A folder to store the disk cache contents. Defaults to a prefixed directory in Caches if nil
   public let directory: URL?
-  #if os(iOS) || os(tvOS)
   /// Data protection is used to store files in an encrypted format on disk and to decrypt them on demand.
-  /// Support only on iOS and tvOS.
   public let protectionType: FileProtectionType?
 
   public init(name: String, expiry: Expiry = .never,
@@ -24,13 +22,4 @@ public struct DiskConfig {
     self.directory = directory
     self.protectionType = protectionType
   }
-  #else
-  public init(name: String, expiry: Expiry = .never,
-              maxSize: UInt = 0, directory: URL? = nil) {
-    self.name = name
-    self.expiry = expiry
-    self.maxSize = maxSize
-    self.directory = directory
-  }
-  #endif
 }

Source/Shared/Configuration/DiskConfig.swift

@@ -1,6 +1,9 @@
+#if canImport(UIKit)
+import UIKit
+#endif
+
 import Foundation
 
-#if os(iOS) || os(tvOS) || os(macOS)
 public struct ImageWrapper: Codable {
   public let image: Image
 
@@ -31,4 +34,3 @@ public struct ImageWrapper: Codable {
     try container.encode(data, forKey: CodingKeys.image)
   }
 }
-#endif

Source/Shared/Library/ImageWrapper.swift

@@ -1,3 +1,7 @@
+#if canImport(UIKit)
+import UIKit
+#endif
+
 import Foundation
 
 public class TransformerFactory {
@@ -9,7 +13,6 @@ public class TransformerFactory {
     return Transformer<Data>(toData: toData, fromData: fromData)
   }
 
-  #if os(iOS) || os(tvOS) || os(macOS) || os(visionOS)
   public static func forImage() -> Transformer<Image> {
     let toData: (Image) throws -> Data = { image in
       return try image.cache_toData().unwrapOrThrow(error: StorageError.transformerFail)
@@ -21,7 +24,6 @@ public class TransformerFactory {
 
     return Transformer<Image>(toData: toData, fromData: fromData)
   }
-  #endif
 
   public static func forCodable<U: Codable>(ofType: U.Type) -> Transformer<U> {
     let toData: (U) throws -> Data = { object in

Source/Shared/Library/TransformerFactory.swift

@@ -1,7 +1,6 @@
-#if os(iOS) || os(tvOS) || os(visionOS)
+#if canImport(UIKit)
   import UIKit
   public typealias Image = UIImage
-#elseif os(watchOS)
 
 #elseif os(OSX)
   import AppKit

Source/Shared/Library/Types.swift

@@ -39,14 +39,11 @@ final public class DiskStorage<Key: Hashable, Value> {
 
     try createDirectory()
 
-    // protection
-    #if os(iOS) || os(tvOS)
     if let protectionType = config.protectionType {
       try setDirectoryAttributes([
         FileAttributeKey.protectionKey: protectionType
       ])
     }
-    #endif
   }
 
   public required init(config: DiskConfig, fileManager: FileManager = FileManager.default, path: String, transformer: Transformer<Value>) {