Fix import FoundationEssentials

vapor-community · Sep 29, 2024 · 18eac81 · 18eac81
1 parent a098012
commit 18eac81
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,9 +1,9 @@
 // swift-tools-version:5.8
 import PackageDescription
-#if swift(>=6.0)
-import FoundationEssentials
-#else
+#if canImport(Darwin)
 import Foundation
+#else
+import FoundationEssentials
 #endif
 
 let package = Package(

diff --git a/Sources/Zip/ArchiveFile.swift b/Sources/Zip/ArchiveFile.swift
@@ -1,7 +1,7 @@
-#if swift(>=6.0)
-import FoundationEssentials
-#else
+#if canImport(Darwin)
 import Foundation
+#else
+import FoundationEssentials
 #endif
 @_implementationOnly import CMinizip
 

diff --git a/Sources/Zip/Date+dosDate.swift b/Sources/Zip/Date+dosDate.swift
@@ -1,7 +1,7 @@
-#if swift(>=6.0)
-import FoundationEssentials
-#else
+#if canImport(Darwin)
 import Foundation
+#else
+import FoundationEssentials
 #endif
 
 extension Date {

diff --git a/Sources/Zip/QuickZip.swift b/Sources/Zip/QuickZip.swift
@@ -6,10 +6,10 @@
 //  Copyright © 2016 Roy Marmelstein. All rights reserved.
 //
 
-#if swift(>=6.0)
-import FoundationEssentials
-#else
+#if canImport(Darwin)
 import Foundation
+#else
+import FoundationEssentials
 #endif
 
 extension Zip { 

diff --git a/Sources/Zip/Zip.swift b/Sources/Zip/Zip.swift
@@ -6,10 +6,10 @@
 //  Copyright © 2015 Roy Marmelstein. All rights reserved.
 //
 
-#if swift(>=6.0)
-import FoundationEssentials
-#else
+#if canImport(Darwin)
 import Foundation
+#else
+import FoundationEssentials
 #endif
 @_implementationOnly import CMinizip
 

diff --git a/Sources/Zip/ZipError.swift b/Sources/Zip/ZipError.swift
@@ -1,7 +1,7 @@
-#if swift(>=6.0)
-import FoundationEssentials
-#else
+#if canImport(Darwin)
 import Foundation
+#else
+import FoundationEssentials
 #endif
 
 /// Errors that can be thrown by Zip.

diff --git a/Sources/Zip/ZipUtilities.swift b/Sources/Zip/ZipUtilities.swift
@@ -6,10 +6,10 @@
 //  Copyright © 2016 Roy Marmelstein. All rights reserved.
 //
 
-#if swift(>=6.0)
-import FoundationEssentials
-#else
+#if canImport(Darwin)
 import Foundation
+#else
+import FoundationEssentials
 #endif
 
 internal class ZipUtilities {