Update SwiftPM branch to 5.8 and fix build errors (#395)

* Update SwiftPM branch to 5.8 and fix build errors

* Make swift-format 5.8 happy :)

* Make swift-format 5.8 happy for Tests

* Fix wrong formatting

* Resolve AbsolutePath(validating:) rename warnings

* Fix wrong formatting

* Resolve remaining deprecation warnings

* Fix Linux build failure

Author: kateinoigakukun

Package.resolved

@@ -27,14 +27,14 @@ let package = Package(
     .package(
       name: "SwiftPM",
       url: "https://github.com/apple/swift-package-manager.git",
-      .branch("release/5.7")
+      .branch("release/5.8")
     ),
     .package(
       url: "https://github.com/apple/swift-tools-support-core.git",
-      .branch("release/5.7")
+      .branch("release/5.8")
     ),
     .package(url: "https://github.com/vapor/vapor.git", from: "4.57.1"),
-    .package(url: "https://github.com/apple/swift-crypto.git", from: "1.1.0"),
+    .package(url: "https://github.com/apple/swift-crypto.git", from: "2.2.0"),
     .package(url: "https://github.com/JohnSundell/Splash.git", from: "0.16.0"),
     .package(
       url: "https://github.com/swiftwasm/WasmTransformer",

Package.swift

@@ -49,11 +49,11 @@ struct Bundle: AsyncParsableCommand {
   @Option(
     name: .long,
     help: """
-    Which optimizations to apply to the .wasm binary output.
-    Available values: \(
+      Which optimizations to apply to the .wasm binary output.
+      Available values: \(
       WasmOptimizations.allCases.map(\.rawValue).joined(separator: ", ")
-    )
-    """
+      )
+      """
   )
   var wasmOptimizations: WasmOptimizations = .size
 
@@ -122,7 +122,9 @@ struct Bundle: AsyncParsableCommand {
     terminal.write("Bundle generation finished successfully\n", inColor: .green, bold: true)
   }
 
-  func optimize(_ inputPath: AbsolutePath, outputPath: AbsolutePath, terminal: InteractiveWriter) async throws {
+  func optimize(_ inputPath: AbsolutePath, outputPath: AbsolutePath, terminal: InteractiveWriter)
+    async throws
+  {
     var wasmOptArgs = ["wasm-opt", "-Os", inputPath.pathString, "-o", outputPath.pathString]
     if debugInfo {
       wasmOptArgs.append("--debuginfo")
@@ -156,7 +158,7 @@ struct Bundle: AsyncParsableCommand {
     try localFileSystem.move(from: wasmOutputFilePath, to: mainModulePath)
 
     // Copy the bundle entrypoint, point to the binary, and give it a cachebuster name.
-    let (_, _, entrypointPath) = dependency.paths(on: localFileSystem)
+    let (_, _, entrypointPath) = try dependency.paths(on: localFileSystem)
     let entrypoint = try ByteString(
       encodingAsUTF8: localFileSystem.readFileContents(entrypointPath)
         .description
@@ -173,10 +175,11 @@ struct Bundle: AsyncParsableCommand {
 
     try localFileSystem.writeFileContents(
       AbsolutePath(bundleDirectory, "index.html"),
-      bytes: ByteString(encodingAsUTF8: HTML.indexPage(
-        customContent: HTML.readCustomIndexPage(at: customIndexPage, on: localFileSystem),
-        entrypointName: entrypointName
-      ))
+      bytes: ByteString(
+        encodingAsUTF8: HTML.indexPage(
+          customContent: HTML.readCustomIndexPage(at: customIndexPage, on: localFileSystem),
+          entrypointName: entrypointName
+        ))
     )
 
     let manifest = try toolchain.manifest.get()

Sources/CartonCLI/Commands/Bundle.swift

@@ -126,7 +126,9 @@ struct Dev: AsyncParsableCommand {
         verbose: verbose,
         port: port,
         host: host,
-        customIndexPath: customIndexPage.map { AbsolutePath($0, relativeTo: localFileSystem.currentWorkingDirectory!) },
+        customIndexPath: customIndexPage.map {
+          try AbsolutePath(validating: $0, relativeTo: localFileSystem.currentWorkingDirectory!)
+        },
         // swiftlint:disable:next force_try
         manifest: try! toolchain.manifest.get(),
         product: build.product,

Sources/CartonCLI/Commands/Dev.swift

@@ -25,13 +25,15 @@ struct Init: AsyncParsableCommand {
     subcommands: [ListTemplates.self]
   )
 
-  @Option(name: .long,
-          help: "The template to base the project on.",
-          transform: { Templates(rawValue: $0.lowercased()) })
+  @Option(
+    name: .long,
+    help: "The template to base the project on.",
+    transform: { Templates(rawValue: $0.lowercased()) })
   var template: Templates?
 
-  @Option(name: .long,
-          help: "The name of the project") var name: String?
+  @Option(
+    name: .long,
+    help: "The name of the project") var name: String?
 
   func run() async throws {
     let terminal = InteractiveWriter.stdout
@@ -50,9 +52,10 @@ struct Init: AsyncParsableCommand {
     terminal.write(" in ")
     terminal.write("\(name)\n", inColor: .cyan)
 
-    guard let packagePath = self.name == nil ?
-      localFileSystem.currentWorkingDirectory :
-      AbsolutePath(name, relativeTo: currentDir)
+    guard
+      let packagePath = try self.name == nil
+        ? localFileSystem.currentWorkingDirectory
+        : AbsolutePath(validating: name, relativeTo: currentDir)
     else {
       terminal.write("Path to project could be created.\n", inColor: .red)
       return

Sources/CartonCLI/Commands/Init.swift

@@ -15,9 +15,10 @@
 import ArgumentParser
 
 struct BuildOptions: ParsableArguments {
-  @Option(name: .customLong("Xswiftc", withSingleDash: true),
-          parsing: .unconditionalSingleValue,
-          help: "Pass flag through to all Swift compiler invocations")
+  @Option(
+    name: .customLong("Xswiftc", withSingleDash: true),
+    parsing: .unconditionalSingleValue,
+    help: "Pass flag through to all Swift compiler invocations")
   var swiftCompilerFlags: [String] = []
 
   init() {}

Sources/CartonCLI/Commands/Options.swift

@@ -20,9 +20,10 @@ import TSCBasic
 
 /// Proxy swift-package command to locally pinned toolchain version.
 struct Package: AsyncParsableCommand {
-  static let configuration = CommandConfiguration(abstract: """
-  Perform operations on Swift packages.
-  """)
+  static let configuration = CommandConfiguration(
+    abstract: """
+      Perform operations on Swift packages.
+      """)
 
   @Argument(wrappedValue: [], parsing: .remaining)
   var arguments: [String]

Sources/CartonCLI/Commands/Package.swift

@@ -18,17 +18,18 @@ import SwiftToolchain
 import TSCBasic
 
 struct Local: ParsableCommand {
-  static let configuration = CommandConfiguration(abstract: """
-  Prints SDK version used for the current project or saves it \
-  in the `.swift-version` file if a version is passed as an argument.
-  """)
+  static let configuration = CommandConfiguration(
+    abstract: """
+      Prints SDK version used for the current project or saves it \
+      in the `.swift-version` file if a version is passed as an argument.
+      """)
 
   @Argument() var version: String?
 
   func run() throws {
     let terminal = InteractiveWriter.stdout
-    let toolchainSystem = ToolchainSystem(fileSystem: localFileSystem)
-    
+    let toolchainSystem = try ToolchainSystem(fileSystem: localFileSystem)
+
     if let version = version {
       let versions = try toolchainSystem.fetchAllSwiftVersions()
       if versions.contains(version) {

Sources/CartonCLI/Commands/SDK/Local.swift

@@ -25,7 +25,7 @@ struct Versions: ParsableCommand {
   func run() throws {
     let terminal = InteractiveWriter.stdout
 
-    let toolchainSystem = ToolchainSystem(fileSystem: localFileSystem)
+    let toolchainSystem = try ToolchainSystem(fileSystem: localFileSystem)
     let versions = try toolchainSystem.fetchAllSwiftVersions()
     let localVersion = try toolchainSystem.fetchLocalSwiftVersion()
     if versions.count > 0 {

Sources/CartonCLI/Commands/SDK/Versions.swift

@@ -46,7 +46,7 @@ struct Test: AsyncParsableCommand {
   private var environment = Environment.wasmer
 
   /// It is implemented as a separate flag instead of a `--environment` variant because `--environment`
-  /// is designed to accept specific browser names in the future like `--environment firefox`. 
+  /// is designed to accept specific browser names in the future like `--environment firefox`.
   /// Then `--headless` should be able to be used with `defaultBrowser` and other browser values.
   @Flag(help: "When running browser tests, run the browser in headless mode")
   var headless: Bool = false
@@ -83,7 +83,8 @@ struct Test: AsyncParsableCommand {
 
   func validate() throws {
     if headless && environment != .defaultBrowser {
-      throw TestError(description: "The `--headless` flag can be applied only for browser environments")
+      throw TestError(
+        description: "The `--headless` flag can be applied only for browser environments")
     }
   }
 
@@ -92,7 +93,8 @@ struct Test: AsyncParsableCommand {
     let toolchain = try await Toolchain(localFileSystem, terminal)
     let bundlePath: AbsolutePath
     if let preBundlePath = self.prebuiltTestBundlePath {
-      bundlePath = AbsolutePath(preBundlePath, relativeTo: localFileSystem.currentWorkingDirectory!)
+      bundlePath = try AbsolutePath(
+        validating: preBundlePath, relativeTo: localFileSystem.currentWorkingDirectory!)
       guard localFileSystem.exists(bundlePath) else {
         terminal.write(
           "No prebuilt binary found at \(bundlePath)\n",