Drop Swift 5.9 (#14)

Author: fpseverino

.github/workflows/test.yml

@@ -23,16 +23,21 @@ jobs:
       fail-fast: false
       matrix:
         swift-version:
-          - 5.9
           - 5.10
           - 6.0
+          - 6.1
         include:
-          - { swift-version: 5.9, swift-branch: swift-5.9.2-release, swift-tag: 5.9.2-RELEASE }
           - { swift-version: 5.10, swift-branch: swift-5.10.1-release, swift-tag: 5.10.1-RELEASE }
           - { swift-version: 6.0, swift-branch: swift-6.0.3-release, swift-tag: 6.0.3-RELEASE }
+          - { swift-version: 6.1, swift-branch: swift-6.1-release, swift-tag: 6.1-RELEASE }
     runs-on: windows-latest
     timeout-minutes: 60
     steps:
+      - name: Configure dev environment
+        uses: compnerd/gha-setup-vsdevenv@main
+        with:
+          toolset_version: 14.29
+          winsdk: 10.0.22621.0
       - name: Install Windows Swift toolchain
         uses: compnerd/gha-setup-swift@main
         with:
@@ -55,4 +60,4 @@ jobs:
         uses: actions/checkout@v4
       - name: Run unit tests
         run: |
-          swift test -Xcc -I'C:/Program Files (x86)/zlib/include' -Xlinker -L'C:/Program Files (x86)/zlib/lib'
+          swift test -Xcc -I'C:/Program Files (x86)/zlib/include' -Xcc -D_INTSAFE_H_INCLUDED_ -Xlinker -L'C:/Program Files (x86)/zlib/lib' -Xbuild-tools-swiftc -windows-sdk-root -Xbuild-tools-swiftc "${env:WindowsSdkDir}" -Xbuild-tools-swiftc -windows-sdk-version -Xbuild-tools-swiftc ${env:UCRTVersion} -Xswiftc -windows-sdk-root -Xswiftc "${env:WindowsSdkDir}" -Xswiftc -windows-sdk-version -Xswiftc ${env:UCRTVersion}

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:5.10
 import PackageDescription
 
 #if canImport(Darwin) || compiler(<6.0)
@@ -51,6 +51,7 @@ var swiftSettings: [SwiftSetting] {
         .enableUpcomingFeature("DisableOutwardActorInference"),
         .enableUpcomingFeature("StrictConcurrency"),
         .enableExperimentalFeature("StrictConcurrency=complete"),
+        .enableExperimentalFeature("AccessLevelOnImport"),
     ]
 }
 

README.md

@@ -12,7 +12,7 @@
         <img src="https://img.shields.io/codecov/c/github/vapor-community/Zip?style=plastic&logo=codecov&label=codecov">
     </a>
     <a href="https://swift.org">
-        <img src="https://design.vapor.codes/images/swift59up.svg" alt="Swift 5.9+">
+        <img src="https://design.vapor.codes/images/swift59up.svg" alt="Swift 5.10+">
     </a>
 </div>
 <br>
@@ -40,7 +40,7 @@ and add it to your target's dependencies:
 
 ### Supported Platforms
 
-Zip supports all platforms supported by Swift 5.9 and later.
+Zip supports all platforms supported by Swift 5.10 and later.
 
 To use Zip on Windows, you need to pass an available build of `zlib` to the build via extended flags. For example:
 

Sources/Zip/ArchiveFile.swift

@@ -1,4 +1,4 @@
-@_implementationOnly import CMinizip
+private import CMinizip
 import Foundation
 
 /// Defines data saved in memory that will be archived as a file.

Sources/Zip/Zip.docc/Documentation.md

@@ -31,7 +31,7 @@ and add it to your target's dependencies:
 
 ### Supported Platforms
 
-Zip supports all platforms supported by Swift 5.9 and later.
+Zip supports all platforms supported by Swift 5.10 and later.
 
 To use Zip on Windows, you need to pass an available build of `zlib` to the build via extended flags. For example:
 

Sources/Zip/Zip.swift

@@ -6,17 +6,13 @@
 //  Copyright © 2015 Roy Marmelstein. All rights reserved.
 //
 
-@_implementationOnly import CMinizip
+private import CMinizip
 import Foundation
 
 /// Main class that handles zipping and unzipping of files.
 public class Zip {
     // Set of vaild file extensions
-    #if compiler(>=5.10)
-        nonisolated(unsafe) private static var customFileExtensions: Set<String> = []
-    #else
-        private static var customFileExtensions: Set<String> = []
-    #endif
+    nonisolated(unsafe) private static var customFileExtensions: Set<String> = []
     private static let lock = NSLock()
 
     @available(*, deprecated, message: "Do not use this initializer. Zip is a utility class and should not be instantiated.")

Sources/Zip/ZipCompression.swift

@@ -1,4 +1,4 @@
-@_implementationOnly import CMinizip
+private import CMinizip
 
 /// Zip compression strategies.
 public enum ZipCompression: Int {

Sources/Zip/ZipError.swift

@@ -1,4 +1,8 @@
-import Foundation
+#if canImport(Darwin) || compiler(<6.0)
+    import Foundation
+#else
+    import FoundationEssentials
+#endif
 
 /// Errors that can be thrown by Zip.
 public enum ZipError: Error {
@@ -12,9 +16,9 @@ public enum ZipError: Error {
     /// A textual representation of this error.
     public var description: String {
         switch self {
-        case .fileNotFound: return NSLocalizedString("File not found.", comment: "")
-        case .unzipFail: return NSLocalizedString("Failed to unzip file.", comment: "")
-        case .zipFail: return NSLocalizedString("Failed to zip file.", comment: "")
+        case .fileNotFound: "File not found."
+        case .unzipFail: "Failed to unzip file."
+        case .zipFail: "Failed to zip file."
         }
     }
 }