Update Swift 6.0

Author: jihoonahn

Sources/File/File.swift

@@ -43,9 +43,15 @@ public extension File {
     func append(_ data: Data) throws {
         do {
             let handler = try FileHandle(forWritingTo: url)
-            _ = handler.seekToEndFactory()
-            handler.writeFactory(data)
-            handler.closeFileFactory()
+            if #available(iOS 13.4, macOS 10.15.4, tvOS 13.4, watchOS 6.2, visionOS 1.0, *) {
+                _ = handler.seekToEndFactory()
+                handler.writeFactory(data)
+                handler.closeFileFactory()
+            } else {
+                _ = handler.seekToEndOfFile()
+                handler.write(data)
+                handler.closeFile()
+            }
         } catch {
             throw FileError.writeFailed(path: store.path, error: error)
         }

Sources/File/FileError.swift

@@ -4,7 +4,7 @@ import Logging
 private let logger = Logger(label: "FileError")
 
 /// Error can be thrown by PLFile
-public enum FileError: Error {
+public enum FileError: Error, Sendable {
     /// File Create Error
     case fileCreateError(path: Path)
     /// Verify that file path is empty.

Sources/File/Internal/FileHandleExt.swift

@@ -6,46 +6,39 @@ extension FileHandle {
     ///
     /// - Returns: The current offset from the beginning of the file.
     ///
-    /// - Note: `seekToEndOfFile()` is deprecated in macOS 10.15.4, so this method provides a replacement.
+    /// - Note: Uses the modern `seekToEnd()` method for Swift 6.0 compatibility.
+    @available(iOS 13.4, macOS 10.15.4, tvOS 13.4, watchOS 6.2, visionOS 1.0, *)
     func seekToEndFactory() -> UInt64 {
-        if #available(iOS 13.4, macOS 10.15.4, tvOS 13.4, watchOS 6.2, visionOS 1.0, *) {
-            do {
-                return try self.seekToEnd()
-            } catch {
-                return 0
-            }
-        } else {
-            return self.seekToEndOfFile()
+        do {
+            return try self.seekToEnd()
+        } catch {
+            return 0
         }
     }
 
     ///  Writes the given data to the file handle.
     ///
     /// - Parameter data: The data to write.
     ///
-    /// - Note: `write(_ data: Data)` is deprecated in macOS 10.15.4, so this method provides a replacement.
+    /// - Note: Uses the modern `write(contentsOf:)` method for Swift 6.0 compatibility.
+    @available(iOS 13.4, macOS 10.15.4, tvOS 13.4, watchOS 6.2, visionOS 1.0, *)
     func writeFactory(_ data: Data) {
-        if #available(iOS 13.4, macOS 10.15.4, tvOS 13.4, watchOS 6.2, visionOS 1.0, *) {
-            do {
-                try self.write(contentsOf: data)
-            } catch {
-                return
-            }
-        } else {
-            self.write(data)
+        do {
+            try self.write(contentsOf: data)
+        } catch {
+            return
         }
     }
 
     /// Closes the file handle.
     ///
-    /// - Note: `closeFile()` is deprecated in macOS 10.15, so this method provides a replacement.
+    /// - Note: Uses the modern `close()` method for Swift 6.0 compatibility.
+    @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, visionOS 1.0, *)
     func closeFileFactory() {
-        if #available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, visionOS 1.0, *) {
-            do {
-                try self.close()
-            } catch { return }
-        } else {
-            self.closeFile()
+        do {
+            try self.close()
+        } catch { 
+            return 
         }
     }
 }

Sources/File/Path.swift

@@ -3,7 +3,7 @@ import Logging
 private let logger = Logger(label: "Path")
 
 /// Manage the path of the PLFile.
-public struct Path {
+public struct Path: Sendable {
     /// Root path.
     public static let root = Path("/")
 
@@ -180,25 +180,27 @@ extension Path {
     /// A subscript that identifies the position of the path.
     public subscript(_ position: Int) -> Path {
         let component = pathComponent
-        if position >= component.count || position < 0 {
+        guard position >= 0 && position < component.count else {
             fatalError("Path index out of range")
-        } else {
-            var result = component.first!
-            for index in 1..<position + 1 {
-                result = Path(result.rawValue + component[index].rawValue)
-            }
-            return result
         }
+        guard let first = component.first else {
+            fatalError("Path component is empty")
+        }
+        var result = first
+        for index in 1...position {
+            result = Path(result.rawValue + component[index].rawValue)
+        }
+        return result
     }
     /// A subscript that identifies the bound out of the path.
     public subscript(_ bounds: Range<Int>) -> Path {
         let component = self.pathComponent
-        if bounds.upperBound >= component.count || bounds.lowerBound < 0 {
+        guard bounds.lowerBound >= 0 && bounds.upperBound <= component.count && bounds.lowerBound < bounds.upperBound else {
             fatalError("Path bounds out of range")
         }
         var result = component[bounds.lowerBound]
-        for index in (bounds.lowerBound + 1)..<(bounds.upperBound) {
-            result  = Path(result.rawValue + component[index].rawValue)
+        for index in (bounds.lowerBound + 1)..<bounds.upperBound {
+            result = Path(result.rawValue + component[index].rawValue)
         }
         return result
     }

Sources/File/Store.swift

@@ -3,7 +3,7 @@ import Dispatch
 import Logging
 
 /// A common part of the File and Folder functionality that allows you to set up the required paths and FileManager that the file system should use.
-public final class Store<fileSystem: FileSystem> {
+public final class Store<fileSystem: FileSystem>: @unchecked Sendable {
     public var path: Path
     private let fileManager: FileManager
 
@@ -233,7 +233,7 @@ public extension Store {
     ///   - eventHandler: Called when a change is detected.
     /// - Returns: A DispatchSourceFileSystemObject? (macOS, iOS), or nil if not supported. Uses swift-log for logging.
     @discardableResult
-    func watch(eventHandler: @escaping () -> Void) -> Any? {
+    func watch(eventHandler: @escaping @Sendable () -> Void) -> Any? {
 #if os(macOS) || os(iOS)
         let fd = open(path.rawValue, O_EVTONLY)
         guard fd != -1 else { return nil }