diff --git a/Package.swift b/Package.swift index c96f07c7..83d8f3a6 100644 --- 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 index ce7ad64a..b4585bfe 100644 --- 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 index fafb3684..588d243b 100644 --- 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 index 1ecdb070..7afdcc0e 100644 --- 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 index 1cf84a84..672dddc5 100644 --- 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 index e030e7d2..2c811388 100644 --- 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 index deb15a77..3d4ee61b 100644 --- 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 {