Add support for Swift 6

Author: SplittyDev

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -35,5 +35,6 @@ let package = Package(
                 )
             ]
         ),
-    ]
+    ],
+    swiftLanguageModes: [.v6]
 )

Package@swift-5.9.swift

@@ -0,0 +1,39 @@
+// 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: "FoundationPlus",
+    platforms: [
+        .iOS(.v13),
+        .tvOS(.v13),
+        .watchOS(.v6),
+        .macOS(.v10_15),
+    ],
+    products: [
+        .library(
+            name: "FoundationPlus",
+            targets: ["FoundationPlus"]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.1.0"),
+    ],
+    targets: [
+        .target(
+            name: "FoundationPlus",
+            resources: [.process("PrivacyInfo.xcprivacy")]
+        ),
+        .testTarget(
+            name: "FoundationPlusTests",
+            dependencies: ["FoundationPlus"],
+            linkerSettings: [
+                .linkedFramework(
+                    "XCTest",
+                    .when(platforms: [.macOS, .iOS, .tvOS, .watchOS])
+                )
+            ]
+        ),
+    ]
+)

Sources/Extensions/Sequence/Sequence+Parallel.swift

@@ -1,7 +1,7 @@
 import Foundation
 
-public extension Sequence {
-    
+public extension Sequence where Element: Sendable {
+
     /// Performs a map operation on the sequence's elements concurrently.
     ///
     /// The transformed elements are collected
@@ -15,14 +15,14 @@ public extension Sequence {
     /// - Returns: An array of transformed values `T`.
     /// - Throws: Rethrows any errors encountered during the filtering process. Due to implementation details,
     ///   `parallelMap` can't use the `rethrows` keyword. In practice, it only throws if the `transform` function throws.
-    func parallelMap<T>(
+    func parallelMap<T: Sendable>(
         preservingOrder: Bool = true,
-        _ transform: @escaping (Element) async throws -> T
+        _ transform: @Sendable @escaping (Element) async throws -> T
     ) async rethrows -> [T] {
         try await withThrowingTaskGroup(of: (Int, T).self, returning: [T].self) { group in
             var results: [(Int, T)] = []
             results.reserveCapacity(self.underestimatedCount)
-            
+
             var index = 0
             for element in self {
                 let indexCopy = index
@@ -31,11 +31,11 @@ public extension Sequence {
                 }
                 index += 1
             }
-            
+
             for try await (index, element) in group {
                 results.append((index, element))
             }
-            
+
             return if preservingOrder {
                 results
                     .sorted(by: \.0, ascending: true)
@@ -45,7 +45,7 @@ public extension Sequence {
             }
         }
     }
-    
+
     /// Performs a filter operation on the sequence's elements concurrently.
     ///
     /// Elements that satisfy the closure (return `true`)
@@ -61,11 +61,11 @@ public extension Sequence {
     ///   `parallelFilter` can't use the `rethrows` keyword. In practice, it only throws if the `isIncluded` function throws.
     func parallelFilter(
         preservingOrder: Bool = true,
-        _ isIncluded: @escaping (Element) async throws -> Bool
+        _ isIncluded: @Sendable @escaping (Element) async throws -> Bool
     ) async throws -> [Element] {
         try await withThrowingTaskGroup(of: Optional<(Int, Element)>.self, returning: [Element].self) { group in
             var results = [(Int, Element)]()
-            
+
             var index = 0
             for element in self {
                 let indexCopy = index
@@ -74,13 +74,13 @@ public extension Sequence {
                 }
                 index += 1
             }
-            
+
             for try await result in group {
                 if let (index, element) = result {
                     results.append((index, element))
                 }
             }
-            
+
             return if preservingOrder {
                 results
                     .sorted(by: \.0, ascending: true)

Sources/Extensions/Timer/Timer+ScheduledTimer.swift

@@ -25,7 +25,7 @@ public extension Timer {
     static func scheduledTimer(
         withTimeInterval timeInterval: TimeInterval,
         repeats: Bool = false,
-        block: @escaping () -> Void
+        block: @Sendable @escaping () -> Void
     ) -> Timer {
         self.scheduledTimer(withTimeInterval: timeInterval, repeats: repeats, block: { _ in
             block()

Sources/PropertyWrappers/BackgroundPublished.swift

@@ -17,7 +17,7 @@ import Combine
 /// ```
 ///
 /// In this example, changes to `myProperty` will automatically trigger updates on the main thread, even if called from a background thread.
-@propertyWrapper
+@propertyWrapper @MainActor
 public struct BackgroundPublished<Value> {
 
     private var value: Value

Sources/PropertyWrappers/EquatablePublished.swift

@@ -18,7 +18,7 @@ typealias CombinePublisher = Combine.Publisher
 /// ```
 ///
 /// In this example, `myProperty` will only trigger updates to any subscribers when the value actually changes.
-@propertyWrapper
+@propertyWrapper @MainActor
 public struct EquatablePublished<Value: Equatable> {
     private var publisher: Publisher?
     private var storage: Storage

Sources/PropertyWrappers/SettingStorage/PublishedCodableSettingStorage.swift

@@ -18,7 +18,7 @@ import Combine
 /// ```
 ///
 /// In this example, `mySetting` is stored in `UserDefaults` and changes to it will be published.
-@propertyWrapper
+@propertyWrapper @MainActor
 public struct PublishedCodableSettingStorage<Value> where Value: Codable {
     private let key: String
     private var dataHash: Int

Sources/PropertyWrappers/SettingStorage/PublishedSettingStorage.swift

@@ -18,7 +18,7 @@ import Combine
 /// ```
 ///
 /// In this example, `mySetting` is stored in `UserDefaults` and changes to it will be published.
-@propertyWrapper
+@propertyWrapper @MainActor
 public struct PublishedSettingStorage<Value> {
     private let explicitKey: String?
     private var initialValue: Value

Sources/_Internal/_Substitute.swift

@@ -0,0 +1,75 @@
+import Foundation
+
+extension Array {
+    
+    /**
+     Removes the specified number of elements from the beginning of the collection, if they exist.
+     
+     - Note : If less elements than specified exist, they will be removed anyway.
+     */
+    mutating func removeFirstIfExist(_ n : Int) {
+        self.removeFirst(Swift.min(n, self.count))
+    }
+    
+    func removingFirstIfExists() -> ArraySlice<Element> {
+        if self.count == 0 {
+            return self[...]
+        }
+        return self[1..<self.count]
+    }
+    
+    /**
+     Removes the specified number of elements from the end of the collection, if they exist.
+     
+     - Note : If less elements than specified exist, they will be removed anyway.
+     */
+    mutating func removeLastIfExist(_ n : Int) {
+        self.removeLast(Swift.min(n, self.count))
+    }
+    
+    func split(isInFirstArray: (Element) -> Bool) -> ([Element], [Element]) {
+        var first = [Element]()
+        var second = [Element]()
+        
+        for element in self {
+            if isInFirstArray(element) {
+                first.append(element)
+            } else {
+                second.append(element)
+            }
+        }
+        
+        return (first, second)
+    }
+}
+
+public extension NSMutableAttributedString {
+    
+    /**
+     Adds an attribute with the given name and value to the entire receiver.
+     */
+    func addAttribute(_ name: NSAttributedString.Key, value : Any){
+        addAttribute(name, value: value, range: NSRange(location: 0, length: self.length))
+    }
+    
+    /**
+     Removes the named attribute from the characters in the entire receiver.
+     */
+    func removeAttribute(_ name: NSAttributedString.Key){
+        removeAttribute(name, range: NSRange(location: 0, length: self.length))
+    }
+    
+    /**
+     Adds the characters of a given string to the end of the receiver.
+     */
+    func append(_ string: String){
+        append(NSAttributedString(string: string))
+    }
+    
+    /**
+     Adds the given character to the end of the receiver.
+     */
+    func append(_ character: Character){
+        append(NSAttributedString(string: String(character)))
+    }
+}

Tests/PropertyWrappers/EquatablePublishedTests.swift

@@ -3,6 +3,7 @@ import Combine
 
 @testable import FoundationPlus
 
+@MainActor
 final class EquatablePublishedTests: XCTestCase {
     private var cancellables: Set<AnyCancellable> = []
 
@@ -46,7 +47,8 @@ final class EquatablePublishedTests: XCTestCase {
 extension EquatablePublishedTests {
 
     // Helper class to use in tests
-    private class TestClass: ObservableObject {
+    @MainActor
+    private class TestClass: @MainActor ObservableObject {
         let objectWillChange = ObservableObjectPublisher()
 
         @EquatablePublished var myProperty: Int = 1