Fix infinity loop (#965)

Author: till0xff

Sources/ProjectDrivers/XcodeProjectDriver.swift

@@ -34,17 +34,20 @@
 
             try xcodebuild.ensureConfigured()
 
-            let project: XcodeProjectlike = if projectPath.extension == "xcworkspace" {
-                try XcodeWorkspace(
+            let project: XcodeProjectlike
+            if projectPath.extension == "xcworkspace" {
+                project = try XcodeWorkspace(
                     path: .makeAbsolute(projectPath),
                     xcodebuild: xcodebuild,
                     configuration: configuration,
                     logger: logger,
                     shell: shell
                 )
             } else {
-                try XcodeProject(
+                var loadedProjectPaths: Set<FilePath> = []
+                project = try XcodeProject(
                     path: .makeAbsolute(projectPath),
+                    loadedProjectPaths: &loadedProjectPaths,
                     xcodebuild: xcodebuild,
                     shell: shell,
                     logger: logger

Sources/XcodeSupport/XcodeProject.swift

@@ -17,7 +17,7 @@ public final class XcodeProject: XcodeProjectlike {
 
     convenience init?(
         path: FilePath,
-        loadedProjectPaths: Set<FilePath> = [],
+        loadedProjectPaths: inout Set<FilePath>,
         referencedBy refPath:
         FilePath,
         shell: Shell,
@@ -31,7 +31,7 @@ public final class XcodeProject: XcodeProjectlike {
         let xcodebuild = Xcodebuild(shell: shell, logger: logger)
         try self.init(
             path: path,
-            loadedProjectPaths: loadedProjectPaths,
+            loadedProjectPaths: &loadedProjectPaths,
             xcodebuild: xcodebuild,
             shell: shell,
             logger: logger
@@ -40,7 +40,7 @@ public final class XcodeProject: XcodeProjectlike {
 
     public required init(
         path: FilePath,
-        loadedProjectPaths: Set<FilePath> = [],
+        loadedProjectPaths: inout Set<FilePath>,
         xcodebuild: Xcodebuild,
         shell: Shell,
         logger: Logger
@@ -59,7 +59,7 @@ public final class XcodeProject: XcodeProjectlike {
         }
 
         var subProjects: [XcodeProject] = []
-        let loadedProjectPaths = loadedProjectPaths.union([path])
+        loadedProjectPaths.insert(path)
 
         // Don't search for sub projects within CocoaPods.
         if !path.components.contains("Pods.xcodeproj") {
@@ -74,7 +74,7 @@ public final class XcodeProject: XcodeProjectlike {
 
                     return try XcodeProject(
                         path: projectPath,
-                        loadedProjectPaths: loadedProjectPaths,
+                        loadedProjectPaths: &loadedProjectPaths,
                         referencedBy: path,
                         shell: shell,
                         logger: logger

Sources/XcodeSupport/XcodeProjectSetupGuide.swift

@@ -68,8 +68,10 @@ public final class XcodeProjectSetupGuide: SetupGuideHelpers, SetupGuide {
                 shell: shell
             )
         } else if let projectPath = identifyProject() {
+            var loadedProjectPaths: Set<FilePath> = []
             project = try XcodeProject(
                 path: projectPath,
+                loadedProjectPaths: &loadedProjectPaths,
                 xcodebuild: xcodebuild,
                 shell: shell,
                 logger: logger

Sources/XcodeSupport/XcodeWorkspace.swift

@@ -31,7 +31,10 @@ public final class XcodeWorkspace: XcodeProjectlike {
         }
 
         let projectPaths = collectProjectPaths(in: xcworkspace.data.children)
-        let projects = try projectPaths.compactMapSet { try XcodeProject(path: sourceRoot.pushing($0), referencedBy: self.path, shell: shell, logger: logger) }
+        var loadedProjectPaths: Set<FilePath> = []
+        let projects = try projectPaths.compactMapSet {
+            try XcodeProject(path: sourceRoot.pushing($0), loadedProjectPaths: &loadedProjectPaths, referencedBy: self.path, shell: shell, logger: logger)
+        }
 
         targets = projects.reduce(into: .init()) { result, project in
             result.formUnion(project.targets)

Tests/XcodeTests/XcodeTargetTest.swift

@@ -1,6 +1,7 @@
 import Foundation
 import Logger
 import Shared
+import SystemPackage
 @testable import TestShared
 @testable import XcodeSupport
 import XCTest
@@ -13,8 +14,10 @@ final class XcodeTargetTest: XCTestCase {
         let logger = Logger(quiet: true)
         let shell = Shell(logger: logger)
         let xcodebuild = Xcodebuild(shell: shell, logger: logger)
+        var loadedProjectPaths: Set<FilePath> = []
         project = try! XcodeProject(
             path: UIKitProjectPath,
+            loadedProjectPaths: &loadedProjectPaths,
             xcodebuild: xcodebuild,
             shell: shell,
             logger: logger

Tests/XcodeTests/XcodebuildBuildProjectTest.swift

@@ -1,6 +1,7 @@
 import Foundation
 import Logger
 import Shared
+import SystemPackage
 @testable import XcodeSupport
 import XCTest
 
@@ -13,8 +14,9 @@ final class XcodebuildBuildProjectTest: XCTestCase {
 
         let logger = Logger(quiet: true)
         let shell = Shell(logger: logger)
+        var loadedProjectPaths: Set<FilePath> = []
         xcodebuild = Xcodebuild(shell: shell, logger: logger)
-        project = try! XcodeProject(path: UIKitProjectPath, xcodebuild: xcodebuild, shell: shell, logger: logger)
+        project = try! XcodeProject(path: UIKitProjectPath, loadedProjectPaths: &loadedProjectPaths, xcodebuild: xcodebuild, shell: shell, logger: logger)
     }
 
     override func tearDown() {

Tests/XcodeTests/XcodebuildSchemesTest.swift

@@ -1,5 +1,6 @@
 import Foundation
 import Logger
+import SystemPackage
 @testable import XcodeSupport
 import XCTest
 
@@ -13,8 +14,9 @@ final class XcodebuildSchemesTest: XCTestCase {
 
         shell = ShellMock()
         let logger = Logger(quiet: true)
+        var loadedProjectPaths: Set<FilePath> = []
         xcodebuild = Xcodebuild(shell: shell, logger: logger)
-        project = try! XcodeProject(path: UIKitProjectPath, xcodebuild: xcodebuild, shell: shell, logger: logger)
+        project = try! XcodeProject(path: UIKitProjectPath, loadedProjectPaths: &loadedProjectPaths, xcodebuild: xcodebuild, shell: shell, logger: logger)
     }
 
     override func tearDown() {