Merge branch 'bsneed/warnings_fix'

Author: bsneed

.gitignore

@@ -5,3 +5,5 @@
 /*.xcodeproj
 xcuserdata/
 DerivedData/
+
+.vscode/

Package.resolved

@@ -6,8 +6,26 @@
         "repositoryURL": "https://github.com/apple/swift-argument-parser.git",
         "state": {
           "branch": null,
-          "revision": "e394bf350e38cb100b6bc4172834770ede1b7232",
-          "version": "1.0.3"
+          "revision": "8f4d2753f0e4778c76d5f05ad16c74f707390531",
+          "version": "1.2.3"
+        }
+      },
+      {
+        "package": "swift-asn1",
+        "repositoryURL": "https://github.com/apple/swift-asn1.git",
+        "state": {
+          "branch": null,
+          "revision": "805deae27a7506dcad043604c00a9dc52d465dcb",
+          "version": "0.7.0"
+        }
+      },
+      {
+        "package": "swift-certificates",
+        "repositoryURL": "https://github.com/apple/swift-certificates.git",
+        "state": {
+          "branch": null,
+          "revision": "35a7df2d9d71c401a47de9be2e3de629a01370c2",
+          "version": "0.4.1"
         }
       },
       {
@@ -24,34 +42,34 @@
         "repositoryURL": "https://github.com/apple/swift-crypto.git",
         "state": {
           "branch": null,
-          "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",
-          "version": "1.1.7"
+          "revision": "33a20e650c33f6d72d822d558333f2085effa3dc",
+          "version": "2.5.0"
         }
       },
       {
         "package": "swift-driver",
         "repositoryURL": "https://github.com/apple/swift-driver.git",
         "state": {
-          "branch": "release/5.7",
-          "revision": "82b274af66cfbb8f3131677676517b34d01e30fd",
+          "branch": "release/5.9",
+          "revision": "1b2b851ae4718caffa5f18fd1861bc0ddd1791a3",
           "version": null
         }
       },
       {
         "package": "llbuild",
         "repositoryURL": "https://github.com/apple/swift-llbuild.git",
         "state": {
-          "branch": "release/5.7",
-          "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b",
+          "branch": "release/5.9",
+          "revision": "d73a305d6e5a82e4bf3bf1727da3d1376e87efab",
           "version": null
         }
       },
       {
         "package": "SwiftPM",
         "repositoryURL": "https://github.com/apple/swift-package-manager.git",
         "state": {
-          "branch": "release/5.7",
-          "revision": "c6e40adbfc78acc60ca464ae482b56442f9f34f4",
+          "branch": "release/5.9",
+          "revision": "732d5406df67b64d266c5689454cf52aecbb4d57",
           "version": null
         }
       },
@@ -68,8 +86,8 @@
         "package": "swift-tools-support-core",
         "repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
         "state": {
-          "branch": "release/5.7",
-          "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3",
+          "branch": "release/5.9",
+          "revision": "5665fc7641ce1a971ad06faaa476862b222ef44b",
           "version": null
         }
       },
@@ -78,8 +96,8 @@
         "repositoryURL": "https://github.com/jpsim/Yams.git",
         "state": {
           "branch": null,
-          "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
-          "version": "4.0.6"
+          "revision": "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
+          "version": "5.0.6"
         }
       }
     ]

Sources/CreateXCFramework/Command.swift

@@ -78,14 +78,14 @@ struct Command: ParsableCommand {
         // we've applied the xcconfig to everything, but some dependencies (*cough* swift-nio)
         // have build errors, so we remove it from targets we're not building
         if self.options.stackEvolution == false {
-            try project.enableDistribution(targets: productNames, xcconfig: AbsolutePath(package.distributionBuildXcconfig.path).relative(to: AbsolutePath(package.rootDirectory.path)))
+            try project.enableDistribution(targets: productNames, xcconfig: AbsolutePath(validating: package.distributionBuildXcconfig.path).relative(to: AbsolutePath(validating: package.rootDirectory.path)))
         }
 
         // save the project
-        try project.save(to: generator.projectPath)
+        try project.save(to: try generator.projectPath())
 
         // start building
-        let builder = XcodeBuilder(project: project, projectPath: generator.projectPath, package: package, options: self.options)
+        let builder = XcodeBuilder(project: project, projectPath: try generator.projectPath(), package: package, options: self.options)
 
         // clean first
         if self.options.clean {

Sources/CreateXCFramework/PackageInfo.swift

@@ -84,7 +84,7 @@ struct PackageInfo {
         self.rootDirectory = Foundation.URL(fileURLWithPath: options.packagePath, isDirectory: true).absoluteURL
         self.buildDirectory = self.rootDirectory.appendingPathComponent(options.buildPath, isDirectory: true).absoluteURL
 
-        let root = AbsolutePath(self.rootDirectory.path)
+        let root = try AbsolutePath(validating: self.rootDirectory.path)
 
         self.toolchain = try UserToolchain(destination: try .hostDestination())
 
@@ -252,13 +252,6 @@ struct PackageInfo {
         return target
     }
 
-
-    // MARK: - Helpers
-
-    private var absoluteRootDirectory: AbsolutePath {
-        AbsolutePath(self.rootDirectory.path)
-    }
-
 }
 
 

Sources/CreateXCFramework/ProjectGenerator.swift

@@ -21,10 +21,10 @@ struct ProjectGenerator {
 
     let package: PackageInfo
 
-    var projectPath: AbsolutePath {
-        let dir = AbsolutePath(self.package.projectBuildDirectory.path)
+    func projectPath() throws -> AbsolutePath {
+        let dir = try AbsolutePath(validating: self.package.projectBuildDirectory.path)
         #if swift(>=5.7)
-        return XcodeProject.makePath(outputDir: dir, projectName: self.package.manifest.displayName)
+        return try XcodeProject.makePath(outputDir: dir, projectName: self.package.manifest.displayName)
         #else
         return buildXcodeprojPath(outputDir: dir, projectName: self.package.manifest.displayName)
         #endif
@@ -46,14 +46,14 @@ struct ProjectGenerator {
             return
         }
 
-        try makeDirectories(self.projectPath)
+        try makeDirectories(self.projectPath())
 
-        let path = AbsolutePath(self.package.distributionBuildXcconfig.path)
+        let path = try AbsolutePath(validating: self.package.distributionBuildXcconfig.path)
         try open(path) { stream in
             if let absolutePath = self.package.overridesXcconfig?.path {
                 stream (
                     """
-                    #include "\(AbsolutePath(absolutePath).relative(to: AbsolutePath(path.dirname)).pathString)"
+                    #include "\(try AbsolutePath(validating: absolutePath).relative(to: AbsolutePath(validating: path.dirname)).pathString)"
 
                     """
                 )
@@ -72,7 +72,7 @@ struct ProjectGenerator {
     /// This is basically a copy of Xcodeproj.generate()
     ///
     func generate () throws -> Xcode.Project {
-        let path = self.projectPath
+        let path = try self.projectPath()
         try makeDirectories(path)
 
         // Generate the contents of project.xcodeproj (inside the .xcodeproj).
@@ -83,7 +83,7 @@ struct ProjectGenerator {
             extraDirs: [],
             extraFiles: [],
             options: XcodeprojOptions (
-                xcconfigOverrides: (self.package.overridesXcconfig?.path).flatMap { AbsolutePath($0) },
+                xcconfigOverrides: (self.package.overridesXcconfig?.path).flatMap { try AbsolutePath(validating: $0) },
                 useLegacySchemeGenerator: true
             ),
             fileSystem: localFileSystem,

Sources/CreateXCFramework/Zipper.swift

@@ -58,7 +58,7 @@ struct Zipper {
 
     func checksum (file: Foundation.URL) throws -> Foundation.URL {
 #if swift(>=5.7)
-        let sum = try checksum(forBinaryArtifactAt: AbsolutePath(file.path))
+        let sum = try checksum(forBinaryArtifactAt: AbsolutePath(validating: file.path))
 #elseif swift(>=5.6)
         let sum = try self.package.workspace.checksum(forBinaryArtifactAt: AbsolutePath(file.path))
 #else

Sources/Xcodeproj/SchemesGenerator.swift

@@ -208,12 +208,12 @@ public final class SchemesGenerator {
 
             """
 
-        let file = AbsolutePath(scheme.filename, relativeTo: schemesDir)
+        let file = try AbsolutePath(validating: scheme.filename, relativeTo: schemesDir)
         try fs.writeFileContents(file, bytes: stream.bytes)
     }
 
     private func disableSchemeAutoCreation() throws {
-        let workspacePath = AbsolutePath("../../project.xcworkspace", relativeTo: schemesDir)
+        let workspacePath = try AbsolutePath(validating: "../../project.xcworkspace", relativeTo: schemesDir)
 
         // Write the settings file to disable automatic scheme creation.
         var stream = BufferedOutputByteStream()
@@ -227,12 +227,12 @@ public final class SchemesGenerator {
             </dict>
             </plist>
             """
-        let settingsPlist = AbsolutePath("xcshareddata/WorkspaceSettings.xcsettings", relativeTo: workspacePath)
+        let settingsPlist = try AbsolutePath(validating: "xcshareddata/WorkspaceSettings.xcsettings", relativeTo: workspacePath)
         try fs.createDirectory(settingsPlist.parentDirectory, recursive: true)
         try fs.writeFileContents(settingsPlist, bytes: stream.bytes)
 
         // Write workspace contents file.
-        let contentsFile = AbsolutePath("contents.xcworkspacedata", relativeTo: workspacePath)
+        let contentsFile = try AbsolutePath(validating: "contents.xcworkspacedata", relativeTo: workspacePath)
         stream = BufferedOutputByteStream()
         stream <<< """
             <?xml version="1.0" encoding="UTF-8"?>

Sources/Xcodeproj/generate.swift

@@ -23,7 +23,7 @@ import struct TSCUtility.BuildFlags
 
 public struct XcodeprojOptions {
     /// The build flags.
-    public var flags: BuildFlags
+    public var flags: PackageModel.BuildFlags
 
     /// If provided, a path to an xcconfig file to be included by the project.
     ///
@@ -46,7 +46,7 @@ public struct XcodeprojOptions {
     public var manifestLoader: ManifestLoader?
 
     public init(
-        flags: BuildFlags = BuildFlags(),
+        flags: PackageModel.BuildFlags = PackageModel.BuildFlags(),
         xcconfigOverrides: AbsolutePath? = nil,
         isCodeCoverageEnabled: Bool? = nil,
         useLegacySchemeGenerator: Bool? = nil,
@@ -64,9 +64,9 @@ public struct XcodeprojOptions {
 
 public enum XcodeProject {
     // Determine the path of the .xcodeproj wrapper directory.
-    public static func makePath(outputDir: AbsolutePath, projectName: String) -> AbsolutePath {
+    public static func makePath(outputDir: AbsolutePath, projectName: String) throws -> AbsolutePath {
         let xcodeprojName = "\(projectName).xcodeproj"
-        return AbsolutePath(xcodeprojName, relativeTo: outputDir)
+        return try AbsolutePath(validating: xcodeprojName, relativeTo: outputDir)
     }
 
     /// Generates an Xcode project and all needed support files.  The .xcodeproj
@@ -146,7 +146,7 @@ public enum XcodeProject {
             ///// For framework targets, generate target.c99Name_Info.plist files in the
             ///// directory that Xcode project is generated
             let name = target.infoPlistFileName
-            try open(AbsolutePath(name, relativeTo: xcodeprojPath)) { print in
+            try open(AbsolutePath(validating: name, relativeTo: xcodeprojPath)) { print in
                 print("""
                     <?xml version="1.0" encoding="UTF-8"?>
                     <plist version="1.0">
@@ -246,7 +246,7 @@ public enum XcodeProject {
             // -Package so its name doesn't collide with any products or target with
             // same name.
             let schemeName = "\(graph.rootPackages[0].manifest.displayName)-Package.xcscheme" // TODO: use identity instead?
-            try open(AbsolutePath(schemeName, relativeTo: schemesDir)) { stream in
+            try open(AbsolutePath(validating: schemeName, relativeTo: schemesDir)) { stream in
                 legacySchemeGenerator(
                     container: schemeContainer,
                     graph: graph,

Sources/Xcodeproj/pbxproj.swift

@@ -429,7 +429,7 @@ public func xcodeProject(
 
         // Assign the deployment target if the package is using the newer manifest version.
         if package.manifest.toolsVersion >= .v5 {
-            for supportedPlatform in target.platforms.derived {
+            for supportedPlatform in target.platforms.declared {
                 let version = supportedPlatform.version.versionString
                 switch supportedPlatform.platform {
                 case .macOS: