Remove path property from Project

Author: giginet

Sources/Commands/SwiftPackageTool.swift

@@ -162,13 +162,12 @@ public class SwiftPackageTool: SwiftTool<PackageToolOptions> {
                 dstdir = try getPackageRoot()
                 projectName = graph.rootPackages[0].name
             }
-            let project = try Xcodeproj.generate(
+            let (_, xcodeProjPath) = try Xcodeproj.generate(
                 outputDir: dstdir,
                 projectName: projectName,
                 graph: graph,
                 options: options.xcodeprojOptions)
-
-            print("generated:", project.path.prettyPath(cwd: originalWorkingDirectory))
+            print("generated:", xcodeProjPath.prettyPath(cwd: originalWorkingDirectory))
 
         case .describe:
             let graph = try loadPackageGraph()

Sources/Xcodeproj/XcodeProjectModel.swift

@@ -66,10 +66,8 @@ public struct Xcode {
         var productGroup: Group?
         var projectDir: String
         var targets: [Target]
-        public let path: AbsolutePath
 
-        init(path: AbsolutePath) {
-            self.path = path
+        init() {
             self.mainGroup = Group(path: "")
             self.buildSettings = BuildSettingsTable()
             self.productGroup = nil

Sources/Xcodeproj/generate().swift

@@ -48,7 +48,7 @@ public func generate(
     projectName: String,
     graph: PackageGraph,
     options: XcodeprojOptions
-) throws -> Xcode.Project {
+) throws -> (Xcode.Project, AbsolutePath) {
     // Note that the output directory might be completely separate from the
     // path of the root package (which is where the sources live).
 
@@ -149,7 +149,7 @@ public func generate(
         }
     }
 
-    return project
+    return (project, xcodeprojPath)
 }
 
 /// Writes the contents to the file specified.

Sources/Xcodeproj/pbxproj().swift

@@ -34,16 +34,13 @@ public func pbxproj(
         extraDirs: [AbsolutePath],
         options: XcodeprojOptions,
         fileSystem: FileSystem = localFileSystem
-    ) throws -> String {
-    let project = try xcodeProject(
+    ) throws -> Xcode.Project {
+    return try xcodeProject(
         xcodeprojPath: xcodeprojPath,
         graph: graph,
         extraDirs: extraDirs,
         options: options,
         fileSystem: fileSystem)
-    // Serialize the project model we created to a plist, and return
-    // its string description.
-    return "// !$*UTF8*$!\n" + project.generatePlist().description
 }
 
 /// A set of c99 target names that are invalid for Xcode Framework targets.
@@ -62,7 +59,7 @@ func xcodeProject(
     ) throws -> Xcode.Project {
 
     // Create the project.
-    let project = Xcode.Project(path: xcodeprojPath)
+    let project = Xcode.Project()
 
     // Generates a dummy target to provide autocompletion for the manifest file.
     func createPackageDescriptionTarget(for package: ResolvedPackage, manifestFileRef: Xcode.FileReference) {

Tests/XcodeprojTests/GenerateXcodeprojTests.swift

@@ -28,7 +28,7 @@ class GenerateXcodeprojTests: XCTestCase {
             XCTAssertFalse(diagnostics.hasErrors)
 
             let projectName = "DummyProjectName"
-            let outpath = try Xcodeproj.generate(outputDir: dstdir, projectName: projectName, graph: graph, options: XcodeprojOptions())
+            let (_, outpath) = try Xcodeproj.generate(outputDir: dstdir, projectName: projectName, graph: graph, options: XcodeprojOptions())
 
             XCTAssertDirectoryExists(outpath)
             XCTAssertEqual(outpath, dstdir.appending(component: projectName + ".xcodeproj"))