Fixed Swift 6 support on linux now that it's been released

mochidev · Oct 8, 2024 · 907a124 · 907a124
1 parent 01fb4cc
commit 907a124
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 32 deletions.
diff --git a/Package.swift b/Package.swift
@@ -18,7 +18,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/mochidev/AsyncSequenceReader.git", .upToNextMinor(from: "0.3.0")),
+        .package(url: "https://github.com/mochidev/AsyncSequenceReader.git", .upToNextMinor(from: "0.3.1")),
         .package(url: "https://github.com/mochidev/Bytes.git", .upToNextMinor(from: "0.3.0")),
     ],
     targets: [

diff --git a/[email protected] b/[email protected]
@@ -18,7 +18,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/mochidev/AsyncSequenceReader.git", .upToNextMinor(from: "0.3.0")),
+        .package(url: "https://github.com/mochidev/AsyncSequenceReader.git", .upToNextMinor(from: "0.3.1")),
         .package(url: "https://github.com/mochidev/Bytes.git", .upToNextMinor(from: "0.3.0")),
     ],
     targets: [
@@ -27,17 +27,11 @@ let package = Package(
             dependencies: [
                 "AsyncSequenceReader",
                 "Bytes"
-            ],
-            swiftSettings: [
-                .swiftLanguageVersion(.v6),
             ]
         ),
         .testTarget(
             name: "CodableDatastoreTests",
-            dependencies: ["CodableDatastore"],
-            swiftSettings: [
-                .swiftLanguageVersion(.v6),
-            ]
+            dependencies: ["CodableDatastore"]
         ),
     ]
 )
diff --git a/Sources/CodableDatastore/Indexes/UUID+Comparable.swift b/Sources/CodableDatastore/Indexes/UUID+Comparable.swift
@@ -9,6 +9,7 @@
 import Foundation
 
 /// Make UUIDs comparable on platforms that shipped without it, so that they can be used transparently as an index.
+#if !canImport(FoundationEssentials)
 #if swift(<5.9) || os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(Linux) || os(Windows)
 #if compiler(>=6)
 extension UUID: @retroactive Comparable {
@@ -28,6 +29,7 @@ extension UUID: Comparable {
 }
 #endif
 #endif
+#endif
 
 /// Make UUIDs comparable, so that they can be used transparently as an index.
 ///

diff --git a/...ces/CodableDatastore/Persistence/Disk Persistence/ISO8601DateFormatter+Milliseconds.swift b/...ces/CodableDatastore/Persistence/Disk Persistence/ISO8601DateFormatter+Milliseconds.swift
@@ -9,8 +9,6 @@
 import Foundation
 
 extension ISO8601DateFormatter {
-    #if compiler(>=6)
-    nonisolated(unsafe)
     static let withMilliseconds: ISO8601DateFormatter = {
         let formatter = ISO8601DateFormatter()
         formatter.timeZone = TimeZone(secondsFromGMT: 0)
@@ -23,20 +21,6 @@ extension ISO8601DateFormatter {
         ]
         return formatter
     }()
-    #else
-    static let withMilliseconds: ISO8601DateFormatter = {
-        let formatter = ISO8601DateFormatter()
-        formatter.timeZone = TimeZone(secondsFromGMT: 0)
-        formatter.formatOptions = [
-            .withInternetDateTime,
-            .withDashSeparatorInDate,
-            .withColonSeparatorInTime,
-            .withTimeZone,
-            .withFractionalSeconds
-        ]
-        return formatter
-    }()
-    #endif
 }
 
 extension JSONDecoder.DateDecodingStrategy {
@@ -59,8 +43,8 @@ extension JSONEncoder.DateEncodingStrategy {
     }
 }
 
-#if !canImport(Darwin)
-extension ISO8601DateFormatter: @unchecked Sendable {}
+#if compiler(>=6)
+extension ISO8601DateFormatter: @unchecked @retroactive Sendable {}
 extension JSONDecoder.DateDecodingStrategy: @unchecked Sendable {}
 extension JSONEncoder.DateEncodingStrategy: @unchecked Sendable {}
 #endif
diff --git a/Tests/CodableDatastoreTests/DiskPersistenceDatastoreIndexTests.swift b/Tests/CodableDatastoreTests/DiskPersistenceDatastoreIndexTests.swift
@@ -14,7 +14,7 @@ import XCTest
 
 fileprivate struct SortError: Error, Equatable {}
 
-final class DiskPersistenceDatastoreIndexTests: XCTestCase {
+final class DiskPersistenceDatastoreIndexTests: XCTestCase, @unchecked Sendable {
     var temporaryStoreURL: URL = FileManager.default.temporaryDirectory
 
     override func setUp() async throws {

diff --git a/Tests/CodableDatastoreTests/DiskPersistenceDatastoreTests.swift b/Tests/CodableDatastoreTests/DiskPersistenceDatastoreTests.swift
@@ -12,7 +12,7 @@
 import XCTest
 @testable import CodableDatastore
 
-final class DiskPersistenceDatastoreTests: XCTestCase {
+final class DiskPersistenceDatastoreTests: XCTestCase, @unchecked Sendable {
     var temporaryStoreURL: URL = FileManager.default.temporaryDirectory
 
     override func setUp() async throws {

diff --git a/Tests/CodableDatastoreTests/DiskPersistenceTests.swift b/Tests/CodableDatastoreTests/DiskPersistenceTests.swift
@@ -12,7 +12,7 @@
 import XCTest
 @testable import CodableDatastore
 
-final class DiskPersistenceTests: XCTestCase {
+final class DiskPersistenceTests: XCTestCase, @unchecked Sendable {
     var temporaryStoreURL: URL = FileManager.default.temporaryDirectory
 
     override func setUp() async throws {

diff --git a/Tests/CodableDatastoreTests/DiskTransactionTests.swift b/Tests/CodableDatastoreTests/DiskTransactionTests.swift
@@ -12,7 +12,7 @@
 import XCTest
 @testable import CodableDatastore
 
-final class DiskTransactionTests: XCTestCase {
+final class DiskTransactionTests: XCTestCase, @unchecked Sendable {
     var temporaryStoreURL: URL = FileManager.default.temporaryDirectory
 
     override func setUp() async throws {

diff --git a/Tests/CodableDatastoreTests/SnapshotTests.swift b/Tests/CodableDatastoreTests/SnapshotTests.swift
@@ -12,7 +12,7 @@
 import XCTest
 @testable import CodableDatastore
 
-final class SnapshotTests: XCTestCase {
+final class SnapshotTests: XCTestCase, @unchecked Sendable {
     var temporaryStoreURL: URL = FileManager.default.temporaryDirectory
 
     override func setUp() async throws {