Merge pull request #73 from giginet/support5.7

Support Swift 5.7 dependencies

Author: bok-

Package.resolved

@@ -4,7 +4,13 @@
 import PackageDescription
 
 let dependencies: [Package.Dependency]
-#if swift(>=5.6)
+#if swift(>=5.7)
+dependencies = [
+    .package(url: "https://github.com/apple/swift-argument-parser.git", .exact("1.0.3")),
+    .package(name: "SwiftPM", url: "https://github.com/apple/swift-package-manager.git", .branch("release/5.7")),
+    .package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("release/5.7")),
+]
+#elseif swift(>=5.6)
 dependencies = [
     .package(url: "https://github.com/apple/swift-argument-parser.git", .exact("1.0.3")),
     .package(name: "SwiftPM", url: "https://github.com/apple/swift-package-manager.git", .branch("release/5.6")),

Package.swift

@@ -88,7 +88,10 @@ struct PackageInfo {
 
         self.toolchain = try UserToolchain(destination: try .hostDestination())
 
-        #if swift(>=5.6)
+        #if swift(>=5.7)
+        let loader = ManifestLoader(toolchain: self.toolchain)
+        self.workspace = try Workspace(forRootPackage: root, customManifestLoader: loader)
+        #elseif swift(>=5.6)
         let resources = ToolchainConfiguration(swiftCompilerPath: self.toolchain.swiftCompilerPath)
         let loader = ManifestLoader(toolchain: resources)
         self.workspace = try Workspace(forRootPackage: root, customManifestLoader: loader)

Sources/CreateXCFramework/PackageInfo.swift

@@ -23,7 +23,11 @@ struct ProjectGenerator {
 
     var projectPath: AbsolutePath {
         let dir = AbsolutePath(self.package.projectBuildDirectory.path)
+        #if swift(>=5.7)
+        return XcodeProject.makePath(outputDir: dir, projectName: self.package.manifest.displayName)
+        #else
         return buildXcodeprojPath(outputDir: dir, projectName: self.package.manifest.displayName)
+        #endif
     }
 
 

Sources/CreateXCFramework/ProjectGenerator.swift

@@ -5,6 +5,9 @@
 //  Created by Rob Amos on 13/5/20.
 //
 
+#if canImport(Basics)
+import Basics
+#endif
 import Foundation
 #if swift(>=5.6)
 import PackageGraph
@@ -54,7 +57,9 @@ struct Zipper {
     }
 
     func checksum (file: Foundation.URL) throws -> Foundation.URL {
-#if swift(>=5.6)
+#if swift(>=5.7)
+        let sum = try checksum(forBinaryArtifactAt: AbsolutePath(file.path))
+#elseif swift(>=5.6)
         let sum = try self.package.workspace.checksum(forBinaryArtifactAt: AbsolutePath(file.path))
 #else
         let sum = self.package.workspace.checksum(forBinaryArtifactAt: AbsolutePath(file.path), diagnostics: self.package.diagnostics)
@@ -106,6 +111,28 @@ struct Zipper {
     func clean (file: Foundation.URL) throws {
         try FileManager.default.removeItem(at: file)
     }
+
+    #if swift(>=5.7)
+    private func checksum(forBinaryArtifactAt path: AbsolutePath) throws -> String {
+        let fileSystem = localFileSystem
+        let checksumAlgorithm = SHA256()
+        let archiver = ZipArchiver(fileSystem: fileSystem)
+
+        // Validate the path has a supported extension.
+        guard let pathExtension = path.extension, archiver.supportedExtensions.contains(pathExtension) else {
+            let supportedExtensionList = archiver.supportedExtensions.joined(separator: ", ")
+            throw StringError("unexpected file type; supported extensions are: \(supportedExtensionList)")
+        }
+
+        // Ensure that the path with the accepted extension is a file.
+        guard fileSystem.isFile(path) else {
+            throw StringError("file not found at path: \(path.pathString)")
+        }
+
+        let contents = try fileSystem.readFileContents(path)
+        return checksumAlgorithm.hash(contents).hexadecimalRepresentation
+    }
+    #endif
 }
 
 #if swift(>=5.6)