Fix Swift 5.9 compilation warnings

Needs Sendability on Linux.
Lighter-swift · Jun 18, 2024 · bccc87c · bccc87c
1 parent 3d1ad7f
commit bccc87c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/Plugins/Libraries/LighterGeneration/SchemaLoader.swift b/Plugins/Libraries/LighterGeneration/SchemaLoader.swift
@@ -1,11 +1,16 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 import SQLite3
 import SQLite3Schema
-import Foundation
+#if !(os(macOS) || os(iOS) || os(watchOS) || os(tvOS)) && swift(>=5.9)
+@preconcurrency import Foundation
+#else
+import class  Foundation.FileManager
+import struct Foundation.URL
+#endif
 
 /**
  * A helper class that can load schemas from SQLite database *and* a set of

diff --git a/Plugins/Libraries/LighterGeneration/Utilities/CamelCase.swift b/Plugins/Libraries/LighterGeneration/Utilities/CamelCase.swift
@@ -3,7 +3,7 @@
 //  ZeeQL3
 //
 //  Created by Helge Hess on 19/05/17.
-//  Copyright © 2017-2022 ZeeZide GmbH. All rights reserved.
+//  Copyright © 2017-2024 ZeeZide GmbH. All rights reserved.
 //
 
 import struct Foundation.CharacterSet

diff --git a/Plugins/Libraries/LighterGeneration/Utilities/ConcurrencyCompat.swift b/Plugins/Libraries/LighterGeneration/Utilities/ConcurrencyCompat.swift
@@ -0,0 +1,14 @@
+//
+//  Created by Helge Heß.
+//  Copyright © 2024 ZeeZide GmbH.
+//
+
+
+#if !(os(macOS) || os(iOS) || os(watchOS) || os(tvOS)) && swift(>=5.9)
+  #if compiler(<6) // seems necessary?
+    import struct Foundation.CharacterSet
+    import class  Foundation.DateFormatter
+    extension CharacterSet  : @unchecked Sendable {}
+    extension DateFormatter : @unchecked Sendable {}
+  #endif
+#endif
diff --git a/Sources/Lighter/Schema/SQLiteValueType.swift b/Sources/Lighter/Schema/SQLiteValueType.swift
@@ -5,9 +5,10 @@
 
 import SQLite3
 #if canImport(Foundation)
-#if !(os(macOS) || os(iOS) || os(watchOS) || os(tvOS)) && swift(>=5.10)
+#if !(os(macOS) || os(iOS) || os(watchOS) || os(tvOS)) && swift(>=5.9)
   @preconcurrency import Foundation
   #if compiler(<6) // seems necessary?
+    extension Date    : @unchecked Sendable {}
     extension Decimal : @unchecked Sendable {}
     extension Locale  : @unchecked Sendable {}
     extension URL     : @unchecked Sendable {}