Support visionOS

Author: onmyway133

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -1,18 +1,22 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "EasyStash",
+    platforms: [
+        .iOS(.v15),
+        .tvOS(.v13),
+        .macOS(.v12),
+    ],
     products: [
         .library(
             name: "EasyStash",
             targets: ["EasyStash"]
         ),
     ],
-    dependencies: [
-    ],
+    dependencies: [],
     targets: [
         .target(
             name: "EasyStash",

Package.swift

@@ -21,9 +21,9 @@ public struct Options {
 
     public init() {
         #if os(tvOS)
-        searchPathDirectory = .cachesDirectory
+            searchPathDirectory = .cachesDirectory
         #else
-        searchPathDirectory = .applicationSupportDirectory
+            searchPathDirectory = .applicationSupportDirectory
         #endif
     }
 }

Sources/Options.swift

@@ -22,7 +22,7 @@ public extension Storage {
     }
 
     func load<T: Codable>(forKey key: String, as: T.Type, withExpiry expiry: Expiry = .never) throws -> T {
-        func loadFromDisk<T: Codable>(forKey key: String, as: T.Type) throws -> T {
+        func loadFromDisk(forKey key: String, as: T.Type) throws -> T {
             let data = try Data(contentsOf: fileUrl(forKey: key))
             let decoder = options.decoder
 

Sources/Storage+Codable.swift

@@ -7,9 +7,9 @@
 //
 
 #if canImport(UIKit)
-import UIKit
+    import UIKit
 #elseif canImport(AppKit)
-import AppKit
+    import AppKit
 #endif
 
 public extension Storage {

Sources/Storage+Image.swift

@@ -7,12 +7,13 @@
 //
 
 import Foundation
+
 #if canImport(UIKit)
-import UIKit
-public typealias Image = UIImage
+    import UIKit
+    public typealias Image = UIImage
 #elseif canImport(AppKit)
-import AppKit
-public typealias Image = NSImage
+    import AppKit
+    public typealias Image = NSImage
 #endif
 
 func unwrapOrThrow<T>(_ optional: Optional<T>, _ error: Error) throws -> T {
@@ -47,21 +48,21 @@ public struct TypeWrapper<T: Codable>: Codable {
 class Utils {
     static func image(data: Data) -> Image? {
         #if canImport(UIKit)
-        return UIImage(data: data)
+            return UIImage(data: data)
         #elseif canImport(AppKit)
-        return NSImage(data: data)
+            return NSImage(data: data)
         #else
-        return nil
+            return nil
         #endif
     }
 
     static func data(image: Image) -> Data? {
         #if canImport(UIKit)
-        return image.jpegData(compressionQuality: 0.9)
+            return image.jpegData(compressionQuality: 0.9)
         #elseif canImport(AppKit)
-        return image.tiffRepresentation
+            return image.tiffRepresentation
         #else
-        return nil
+            return nil
         #endif
     }
 }

Sources/Utils.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Khoa Pham. All rights reserved.
 //
 
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
 import UIKit
 
 extension UIColor {
@@ -21,6 +21,7 @@ extension UIColor {
         }
     }
 }
+
 #elseif os(OSX)
 import AppKit
 

Tests/EasyStashTests/ImageGenerate.swift

@@ -181,7 +181,11 @@ class iOSTests: XCTestCase {
     func testPerformanceUsingKeyArchiver() {
         let users = Array(0..<10_000).map { _ in User3(city: "Oslo", name: "A") }
         measure {
-            NSKeyedArchiver.archivedData(withRootObject: users)
+            do {
+                try NSKeyedArchiver.archivedData(withRootObject: users, requiringSecureCoding: false)
+            } catch {
+                
+            }    
         }
     }
 }