diff --git a/Package.resolved b/Package.resolved index b61467f4e12..e293da34791 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "d37db3f22e16eeca44eacdba528daf5f694b1c811b68c38e2fd77199db920165", + "originHash" : "355f9ed60b1d843fa8956e1b2c94f0be3e9c4591068b9955a571c0456e0e8a6c", "pins" : [ { "identity" : "aexml", @@ -91,6 +91,15 @@ "version" : "1.1.3" } }, + { + "identity" : "path", + "kind" : "remoteSourceControl", + "location" : "https://github.com/tuist/Path.git", + "state" : { + "revision" : "4490da629937fc3994f72dd787dcc3f50d6973fe", + "version" : "0.3.0" + } + }, { "identity" : "pathkit", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index ec71d4fb85b..24881eb68a1 100644 --- a/Package.swift +++ b/Package.swift @@ -3,6 +3,7 @@ import PackageDescription let swiftToolsSupportDependency: Target.Dependency = .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core") +let pathDependency: Target.Dependency = .product(name: "Path", package: "Path") let loggingDependency: Target.Dependency = .product(name: "Logging", package: "swift-log") let argumentParserDependency: Target.Dependency = .product(name: "ArgumentParser", package: "swift-argument-parser") let swiftGenKitDependency: Target.Dependency = .product(name: "SwiftGenKit", package: "SwiftGen") @@ -12,6 +13,7 @@ var targets: [Target] = [ name: "tuistbenchmark", dependencies: [ argumentParserDependency, + pathDependency, swiftToolsSupportDependency, ] ), @@ -19,13 +21,14 @@ var targets: [Target] = [ name: "tuistfixturegenerator", dependencies: [ argumentParserDependency, + pathDependency, swiftToolsSupportDependency, ] ), .target( name: "XcodeGraph", dependencies: [ - swiftToolsSupportDependency, + pathDependency, "AnyCodable", "TuistSupport", "Mockable", @@ -39,7 +42,7 @@ var targets: [Target] = [ dependencies: [ "XcodeGraph", "TuistSupportTesting", - swiftToolsSupportDependency, + pathDependency, "AnyCodable", ], linkerSettings: [.linkedFramework("XCTest")] @@ -47,7 +50,7 @@ var targets: [Target] = [ .target( name: "TuistCore", dependencies: [ - swiftToolsSupportDependency, + pathDependency, "ProjectDescription", "TuistSupport", "XcodeGraph", @@ -64,7 +67,7 @@ var targets: [Target] = [ "TuistCore", "TuistSupportTesting", "XcodeGraphTesting", - swiftToolsSupportDependency, + pathDependency, ], linkerSettings: [.linkedFramework("XCTest")] ), @@ -72,7 +75,7 @@ var targets: [Target] = [ name: "TuistKit", dependencies: [ "XcodeProj", - swiftToolsSupportDependency, + pathDependency, argumentParserDependency, "TuistSupport", "TuistGenerator", @@ -101,6 +104,7 @@ var targets: [Target] = [ "TuistKit", "ProjectDescription", "ProjectAutomation", + swiftToolsSupportDependency, ] ), .target( @@ -113,7 +117,7 @@ var targets: [Target] = [ .target( name: "TuistSupport", dependencies: [ - swiftToolsSupportDependency, + pathDependency, loggingDependency, "KeychainAccess", "ZIPFoundation", @@ -129,7 +133,7 @@ var targets: [Target] = [ dependencies: [ "TuistSupport", "XcodeGraph", - swiftToolsSupportDependency, + pathDependency, "Difference", ], linkerSettings: [.linkedFramework("XCTest")] @@ -142,7 +146,7 @@ var targets: [Target] = [ "TuistSupport", "TuistSupportTesting", "XcodeProj", - swiftToolsSupportDependency, + pathDependency, ], linkerSettings: [.linkedFramework("XCTest")] ), @@ -150,7 +154,7 @@ var targets: [Target] = [ name: "TuistGenerator", dependencies: [ "XcodeProj", - swiftToolsSupportDependency, + pathDependency, "TuistCore", "XcodeGraph", "TuistSupport", @@ -167,14 +171,14 @@ var targets: [Target] = [ name: "TuistGeneratorTesting", dependencies: [ "TuistGenerator", - swiftToolsSupportDependency, + pathDependency, ], linkerSettings: [.linkedFramework("XCTest")] ), .target( name: "TuistScaffold", dependencies: [ - swiftToolsSupportDependency, + pathDependency, "TuistCore", "XcodeGraph", "TuistSupport", @@ -190,7 +194,7 @@ var targets: [Target] = [ name: "TuistAutomation", dependencies: [ "XcodeProj", - swiftToolsSupportDependency, + pathDependency, .product(name: "XcbeautifyLib", package: "xcbeautify"), "TuistCore", "XcodeGraph", @@ -210,7 +214,7 @@ var targets: [Target] = [ "TuistSupport", "TuistPlugin", "Mockable", - swiftToolsSupportDependency, + pathDependency, ], swiftSettings: [ .define("MOCKING", .when(configuration: .debug)), @@ -224,7 +228,7 @@ var targets: [Target] = [ "TuistSupport", "XcodeProj", "Mockable", - swiftToolsSupportDependency, + pathDependency, ], swiftSettings: [ .define("MOCKING", .when(configuration: .debug)), @@ -238,7 +242,7 @@ var targets: [Target] = [ "TuistSupport", "XcodeProj", "Mockable", - swiftToolsSupportDependency, + pathDependency, "Queuer", ], swiftSettings: [ @@ -249,7 +253,7 @@ var targets: [Target] = [ name: "TuistLoader", dependencies: [ "XcodeProj", - swiftToolsSupportDependency, + pathDependency, "TuistCore", "XcodeGraph", "TuistSupport", @@ -264,7 +268,7 @@ var targets: [Target] = [ name: "TuistLoaderTesting", dependencies: [ "TuistLoader", - swiftToolsSupportDependency, + pathDependency, "TuistCore", "XcodeGraphTesting", "ProjectDescription", @@ -281,7 +285,7 @@ var targets: [Target] = [ "XcodeGraph", "TuistLoader", "Mockable", - swiftToolsSupportDependency, + pathDependency, ], swiftSettings: [ .define("MOCKING", .when(configuration: .debug)), @@ -295,7 +299,7 @@ var targets: [Target] = [ "TuistSupport", "TuistScaffold", "Mockable", - swiftToolsSupportDependency, + pathDependency, ], swiftSettings: [ .define("MOCKING", .when(configuration: .debug)), @@ -306,7 +310,7 @@ var targets: [Target] = [ dependencies: [ "TuistCore", "TuistSupport", - swiftToolsSupportDependency, + pathDependency, .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"), .product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession"), ], @@ -442,6 +446,7 @@ let package = Package( .package(url: "https://github.com/Kolos65/Mockable.git", from: "0.0.2"), .package(url: "https://github.com/tuist/swift-openapi-runtime", branch: "swift-tools-version"), .package(url: "https://github.com/tuist/swift-openapi-urlsession", branch: "swift-tools-version"), + .package(url: "https://github.com/tuist/Path", .upToNextMajor(from: "0.3.0")), ], targets: targets ) diff --git a/Sources/TuistAcceptanceTesting/TuistAcceptanceTestCase+Extra.swift b/Sources/TuistAcceptanceTesting/TuistAcceptanceTestCase+Extra.swift index a96095d0e32..0ce81363f90 100644 --- a/Sources/TuistAcceptanceTesting/TuistAcceptanceTestCase+Extra.swift +++ b/Sources/TuistAcceptanceTesting/TuistAcceptanceTestCase+Extra.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import XcodeProj import XCTest diff --git a/Sources/TuistAcceptanceTesting/TuistAcceptanceTestCase.swift b/Sources/TuistAcceptanceTesting/TuistAcceptanceTestCase.swift index 9aee901ecb8..b7f60a3c32e 100644 --- a/Sources/TuistAcceptanceTesting/TuistAcceptanceTestCase.swift +++ b/Sources/TuistAcceptanceTesting/TuistAcceptanceTestCase.swift @@ -1,5 +1,5 @@ // swiftlint:disable force_try -import TSCBasic +import Path import TuistCore @_exported import TuistKit import XcodeGraph diff --git a/Sources/TuistAnalytics/TuistAnalytics.swift b/Sources/TuistAnalytics/TuistAnalytics.swift index aa06b3c173a..968a5273215 100644 --- a/Sources/TuistAnalytics/TuistAnalytics.swift +++ b/Sources/TuistAnalytics/TuistAnalytics.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistAsyncQueue import TuistLoader import XcodeGraph diff --git a/Sources/TuistAsyncQueue/AsyncQueuePersistor.swift b/Sources/TuistAsyncQueue/AsyncQueuePersistor.swift index 056fe00dd77..ead9a03ea6e 100644 --- a/Sources/TuistAsyncQueue/AsyncQueuePersistor.swift +++ b/Sources/TuistAsyncQueue/AsyncQueuePersistor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport diff --git a/Sources/TuistAutomation/ProjectMappers/SkipUITestsProjectMapper.swift b/Sources/TuistAutomation/ProjectMappers/SkipUITestsProjectMapper.swift index 533abb47092..a62b7acef40 100644 --- a/Sources/TuistAutomation/ProjectMappers/SkipUITestsProjectMapper.swift +++ b/Sources/TuistAutomation/ProjectMappers/SkipUITestsProjectMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistAutomation/ProjectMappers/SourceRootPathProjectMapper.swift b/Sources/TuistAutomation/ProjectMappers/SourceRootPathProjectMapper.swift index e9a3f30061e..0dd41a88f4b 100644 --- a/Sources/TuistAutomation/ProjectMappers/SourceRootPathProjectMapper.swift +++ b/Sources/TuistAutomation/ProjectMappers/SourceRootPathProjectMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistAutomation/Utilities/BuildGraphInspector.swift b/Sources/TuistAutomation/Utilities/BuildGraphInspector.swift index 3a6d55ac7d2..3a9b95af270 100644 --- a/Sources/TuistAutomation/Utilities/BuildGraphInspector.swift +++ b/Sources/TuistAutomation/Utilities/BuildGraphInspector.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistAutomation/Utilities/TargetBuilder.swift b/Sources/TuistAutomation/Utilities/TargetBuilder.swift index b37070f932c..7e8348fea24 100644 --- a/Sources/TuistAutomation/Utilities/TargetBuilder.swift +++ b/Sources/TuistAutomation/Utilities/TargetBuilder.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistAutomation/Utilities/TargetRunner.swift b/Sources/TuistAutomation/Utilities/TargetRunner.swift index a0f127a2eb0..f0c82ad2308 100644 --- a/Sources/TuistAutomation/Utilities/TargetRunner.swift +++ b/Sources/TuistAutomation/Utilities/TargetRunner.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import struct TSCUtility.Version import TuistCore import TuistSupport diff --git a/Sources/TuistAutomation/Utilities/XcodeBuildDestination+Find.swift b/Sources/TuistAutomation/Utilities/XcodeBuildDestination+Find.swift index 376959ee92c..fd4514f0e24 100644 --- a/Sources/TuistAutomation/Utilities/XcodeBuildDestination+Find.swift +++ b/Sources/TuistAutomation/Utilities/XcodeBuildDestination+Find.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistAutomation/XcodeBuild/XcodeBuildController.swift b/Sources/TuistAutomation/XcodeBuild/XcodeBuildController.swift index 741cfc9c844..a89a21385ab 100644 --- a/Sources/TuistAutomation/XcodeBuild/XcodeBuildController.swift +++ b/Sources/TuistAutomation/XcodeBuild/XcodeBuildController.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport diff --git a/Sources/TuistAutomationTesting/Utilities/MockBuildGraphInspector.swift b/Sources/TuistAutomationTesting/Utilities/MockBuildGraphInspector.swift index e6ea4c42bf1..d93db664fe5 100644 --- a/Sources/TuistAutomationTesting/Utilities/MockBuildGraphInspector.swift +++ b/Sources/TuistAutomationTesting/Utilities/MockBuildGraphInspector.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Sources/TuistAutomationTesting/Utilities/MockTargetBuilder.swift b/Sources/TuistAutomationTesting/Utilities/MockTargetBuilder.swift index 1a9f4962b1c..4bab2a0bd38 100644 --- a/Sources/TuistAutomationTesting/Utilities/MockTargetBuilder.swift +++ b/Sources/TuistAutomationTesting/Utilities/MockTargetBuilder.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TSCUtility import TuistAutomation import TuistCore diff --git a/Sources/TuistAutomationTesting/Utilities/MockTargetRunner.swift b/Sources/TuistAutomationTesting/Utilities/MockTargetRunner.swift index 1c71ae478a3..f8c750db285 100644 --- a/Sources/TuistAutomationTesting/Utilities/MockTargetRunner.swift +++ b/Sources/TuistAutomationTesting/Utilities/MockTargetRunner.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import struct TSCUtility.Version import TuistAutomation import XcodeGraph diff --git a/Sources/TuistCore/Analytics/CommandEvent.swift b/Sources/TuistCore/Analytics/CommandEvent.swift index 27fd82d2563..907751240b7 100644 --- a/Sources/TuistCore/Analytics/CommandEvent.swift +++ b/Sources/TuistCore/Analytics/CommandEvent.swift @@ -1,6 +1,6 @@ import AnyCodable import Foundation -import TSCBasic +import Path /// A `CommandEvent` is the analytics event to track the execution of a Tuist command public struct CommandEvent: Codable, Equatable, AsyncQueueEvent { diff --git a/Sources/TuistCore/Automation/XcodeBuildArgument.swift b/Sources/TuistCore/Automation/XcodeBuildArgument.swift index c360e4de78a..e4514b0daa1 100644 --- a/Sources/TuistCore/Automation/XcodeBuildArgument.swift +++ b/Sources/TuistCore/Automation/XcodeBuildArgument.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// It represents arguments that can be passed to the xcodebuild command. public enum XcodeBuildArgument: Equatable, CustomStringConvertible { diff --git a/Sources/TuistCore/Automation/XcodeBuildControlling.swift b/Sources/TuistCore/Automation/XcodeBuildControlling.swift index f6319eea082..8a8d41ff99e 100644 --- a/Sources/TuistCore/Automation/XcodeBuildControlling.swift +++ b/Sources/TuistCore/Automation/XcodeBuildControlling.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport public enum XcodeBuildDestination: Equatable { diff --git a/Sources/TuistCore/Automation/XcodeBuildSettings.swift b/Sources/TuistCore/Automation/XcodeBuildSettings.swift index fecf8c62fba..ebfee4426e2 100644 --- a/Sources/TuistCore/Automation/XcodeBuildSettings.swift +++ b/Sources/TuistCore/Automation/XcodeBuildSettings.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct XcodeBuildSettings { public typealias DictionaryType = [String: String] diff --git a/Sources/TuistCore/Automation/XcodeBuildTarget.swift b/Sources/TuistCore/Automation/XcodeBuildTarget.swift index fd0e2b39db9..5a02d7dede6 100644 --- a/Sources/TuistCore/Automation/XcodeBuildTarget.swift +++ b/Sources/TuistCore/Automation/XcodeBuildTarget.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum XcodeBuildTarget: Equatable { /// The target is an Xcode project. diff --git a/Sources/TuistCore/Cache/CacheDirectoriesProvider.swift b/Sources/TuistCore/Cache/CacheDirectoriesProvider.swift index 40451b204f2..e46d25702e6 100644 --- a/Sources/TuistCore/Cache/CacheDirectoriesProvider.swift +++ b/Sources/TuistCore/Cache/CacheDirectoriesProvider.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistSupport import XcodeGraph @@ -36,7 +36,7 @@ public final class CacheDirectoriesProvider: CacheDirectoriesProviding { return cacheDirectory.appending(components: ["tuist", category.directoryName]) } - public func cacheDirectory() throws -> TSCBasic.AbsolutePath { + public func cacheDirectory() throws -> Path.AbsolutePath { if let xdgCacheHome = ProcessInfo.processInfo.environment["XDG_CACHE_HOME"] { return try AbsolutePath(validating: xdgCacheHome) } else { diff --git a/Sources/TuistCore/Cache/FileContentHashing.swift b/Sources/TuistCore/Cache/FileContentHashing.swift index 8795493f48a..ca68fab0468 100644 --- a/Sources/TuistCore/Cache/FileContentHashing.swift +++ b/Sources/TuistCore/Cache/FileContentHashing.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public protocol FileContentHashing { func hash(path: AbsolutePath) throws -> String diff --git a/Sources/TuistCore/ContentHashing/ContentHasher.swift b/Sources/TuistCore/ContentHashing/ContentHasher.swift index aec292ccf45..004060d17e9 100644 --- a/Sources/TuistCore/ContentHashing/ContentHasher.swift +++ b/Sources/TuistCore/ContentHashing/ContentHasher.swift @@ -1,6 +1,6 @@ import CryptoKit import Foundation -import TSCBasic +import Path import TuistSupport /// `ContentHasher` diff --git a/Sources/TuistCore/ContentHashing/ContentHashingError.swift b/Sources/TuistCore/ContentHashing/ContentHashingError.swift index bc0779bbcf0..ee095188b9c 100644 --- a/Sources/TuistCore/ContentHashing/ContentHashingError.swift +++ b/Sources/TuistCore/ContentHashing/ContentHashingError.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport /// `ContentHashingError` diff --git a/Sources/TuistCore/ContentHashing/HashingFilesFilter.swift b/Sources/TuistCore/ContentHashing/HashingFilesFilter.swift index c1031e2e576..a71d9e858bb 100644 --- a/Sources/TuistCore/ContentHashing/HashingFilesFilter.swift +++ b/Sources/TuistCore/ContentHashing/HashingFilesFilter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path class HashingFilesFilter { /// an array of filters, which should return if a path should be included in hashing calculations or not. diff --git a/Sources/TuistCore/Descriptors/DirectoryDescriptor.swift b/Sources/TuistCore/Descriptors/DirectoryDescriptor.swift index ce831ab73e2..794c7c6ea24 100644 --- a/Sources/TuistCore/Descriptors/DirectoryDescriptor.swift +++ b/Sources/TuistCore/Descriptors/DirectoryDescriptor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Directory Descriptor /// diff --git a/Sources/TuistCore/Descriptors/FileDescriptor.swift b/Sources/TuistCore/Descriptors/FileDescriptor.swift index 5aab4563677..37cfac0fd1d 100644 --- a/Sources/TuistCore/Descriptors/FileDescriptor.swift +++ b/Sources/TuistCore/Descriptors/FileDescriptor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// File Descriptor /// diff --git a/Sources/TuistCore/Descriptors/SideEffectDescriptor.swift b/Sources/TuistCore/Descriptors/SideEffectDescriptor.swift index d7a42f30883..45e2e82f171 100644 --- a/Sources/TuistCore/Descriptors/SideEffectDescriptor.swift +++ b/Sources/TuistCore/Descriptors/SideEffectDescriptor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Side Effect Descriptor /// diff --git a/Sources/TuistCore/Graph/CircularDependencyLinter.swift b/Sources/TuistCore/Graph/CircularDependencyLinter.swift index fb6e564c727..9f4bf94b366 100644 --- a/Sources/TuistCore/Graph/CircularDependencyLinter.swift +++ b/Sources/TuistCore/Graph/CircularDependencyLinter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph // MARK: - CircularDependencyLinting diff --git a/Sources/TuistCore/Graph/GraphCircularDetector.swift b/Sources/TuistCore/Graph/GraphCircularDetector.swift index 96adb1037b9..1694589fe0d 100644 --- a/Sources/TuistCore/Graph/GraphCircularDetector.swift +++ b/Sources/TuistCore/Graph/GraphCircularDetector.swift @@ -1,8 +1,9 @@ import Foundation +import Path import TSCBasic struct GraphCircularDetectorNode: Hashable { - let path: AbsolutePath + let path: Path.AbsolutePath let name: String } diff --git a/Sources/TuistCore/Graph/GraphDependencyReference.swift b/Sources/TuistCore/Graph/GraphDependencyReference.swift index 6a6f6885fb3..f6794d1afdd 100644 --- a/Sources/TuistCore/Graph/GraphDependencyReference.swift +++ b/Sources/TuistCore/Graph/GraphDependencyReference.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph public enum GraphDependencyReference: Equatable, Comparable, Hashable { diff --git a/Sources/TuistCore/Graph/GraphLoader.swift b/Sources/TuistCore/Graph/GraphLoader.swift index 4a53b647f6b..3c1ce02b6b8 100644 --- a/Sources/TuistCore/Graph/GraphLoader.swift +++ b/Sources/TuistCore/Graph/GraphLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph // MARK: - GraphLoading diff --git a/Sources/TuistCore/Graph/GraphLoadingError.swift b/Sources/TuistCore/Graph/GraphLoadingError.swift index 272912d0d5b..016261b63fd 100644 --- a/Sources/TuistCore/Graph/GraphLoadingError.swift +++ b/Sources/TuistCore/Graph/GraphLoadingError.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport enum GraphLoadingError: FatalError, Equatable { diff --git a/Sources/TuistCore/Graph/GraphTraverser.swift b/Sources/TuistCore/Graph/GraphTraverser.swift index 9bb7802afe6..3af1f870f61 100644 --- a/Sources/TuistCore/Graph/GraphTraverser.swift +++ b/Sources/TuistCore/Graph/GraphTraverser.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import TuistSupport import XcodeGraph @@ -7,14 +8,14 @@ import XcodeGraph public class GraphTraverser: GraphTraversing { public var name: String { graph.name } public var hasPackages: Bool { !graph.packages.flatMap(\.value).isEmpty } - public var path: AbsolutePath { graph.path } + public var path: Path.AbsolutePath { graph.path } public var workspace: Workspace { graph.workspace } - public var projects: [AbsolutePath: Project] { graph.projects } + public var projects: [Path.AbsolutePath: Project] { graph.projects } /// It returns the targets of the graph projects. /// - Returns: A dictionary where the key is the path to the project, and the value are a dictionary where /// the keys are the name of the targets, and the value the target representation. - public func targets() -> [AbsolutePath: [String: Target]] { + public func targets() -> [Path.AbsolutePath: [String: Target]] { return projects.mapValues { $0.targets } } @@ -74,12 +75,12 @@ public class GraphTraverser: GraphTraversing { projects.values.flatMap(\.schemes) + graph.workspace.schemes } - public func precompiledFrameworksPaths() -> Set { + public func precompiledFrameworksPaths() -> Set { let dependencies = graph.dependencies.reduce(into: Set()) { acc, next in acc.formUnion([next.key]) acc.formUnion(next.value) } - return Set(dependencies.compactMap { dependency -> AbsolutePath? in + return Set(dependencies.compactMap { dependency -> Path.AbsolutePath? in guard case let GraphDependency.framework(path, _, _, _, _, _, _) = dependency else { return nil } return path }) @@ -97,13 +98,13 @@ public class GraphTraverser: GraphTraversing { return filteredTargets } - public func target(path: AbsolutePath, name: String) -> GraphTarget? { + public func target(path: Path.AbsolutePath, name: String) -> GraphTarget? { guard let project = graph.projects[path], let target = project.targets[name] else { return nil } return GraphTarget(path: path, target: target, project: project) } - public func targets(at path: AbsolutePath) -> Set { + public func targets(at path: Path.AbsolutePath) -> Set { guard let project = graph.projects[path] else { return Set() } return Set(project.targets.values.map { GraphTarget(path: path, target: $0, project: project) }) } @@ -112,7 +113,7 @@ public class GraphTraverser: GraphTraversing { allTestPlans().first { $0.name == name } } - public func allTargetDependencies(path: AbsolutePath, name: String) -> Set { + public func allTargetDependencies(path: Path.AbsolutePath, name: String) -> Set { guard let target = target(path: path, name: name) else { return [] } return transitiveClosure([target]) { target in Array( @@ -124,7 +125,7 @@ public class GraphTraverser: GraphTraversing { } } - public func directTargetDependencies(path: AbsolutePath, name: String) -> Set { + public func directTargetDependencies(path: Path.AbsolutePath, name: String) -> Set { let target = GraphDependency.target(name: name, path: path) guard let dependencies = graph.dependencies[target] else { return [] } @@ -135,7 +136,7 @@ public class GraphTraverser: GraphTraversing { return Set(convertToGraphTargetReferences(targetDependencies, for: target)) } - public func directLocalTargetDependencies(path: AbsolutePath, name: String) -> Set { + public func directLocalTargetDependencies(path: Path.AbsolutePath, name: String) -> Set { let target = GraphDependency.target(name: name, path: path) guard let dependencies = graph.dependencies[target], graph.projects[path] != nil @@ -149,7 +150,7 @@ public class GraphTraverser: GraphTraversing { } func convertToGraphTargetReferences( - _ dependencies: [(name: String, path: AbsolutePath)], + _ dependencies: [(name: String, path: Path.AbsolutePath)], for target: GraphDependency ) -> [GraphTargetReference] { dependencies.compactMap { dependencyName, dependencyPath -> GraphTargetReference? in @@ -165,7 +166,7 @@ public class GraphTraverser: GraphTraversing { } } - public func resourceBundleDependencies(path: AbsolutePath, name: String) -> Set { + public func resourceBundleDependencies(path: Path.AbsolutePath, name: String) -> Set { guard let target = graph.projects[path]?.targets[name] else { return [] } guard target.supportsResources else { return [] } @@ -191,7 +192,7 @@ public class GraphTraverser: GraphTraversing { return GraphTarget(path: path, target: target, project: project) } - public func appExtensionDependencies(path: AbsolutePath, name: String) -> Set { + public func appExtensionDependencies(path: Path.AbsolutePath, name: String) -> Set { let validProducts: [Product] = [ .appExtension, .stickerPackExtension, .watch2Extension, .tvTopShelfExtension, .messagesExtension, ] @@ -201,7 +202,7 @@ public class GraphTraverser: GraphTraversing { ) } - public func extensionKitExtensionDependencies(path: TSCBasic.AbsolutePath, name: String) -> Set { + public func extensionKitExtensionDependencies(path: Path.AbsolutePath, name: String) -> Set { let validProducts: [Product] = [ .extensionKitExtension, ] @@ -211,12 +212,12 @@ public class GraphTraverser: GraphTraversing { ) } - public func appClipDependencies(path: AbsolutePath, name: String) -> GraphTargetReference? { + public func appClipDependencies(path: Path.AbsolutePath, name: String) -> GraphTargetReference? { directLocalTargetDependencies(path: path, name: name) .first { $0.target.product == .appClip } } - public func buildsForMacCatalyst(path: AbsolutePath, name: String) -> Bool { + public func buildsForMacCatalyst(path: Path.AbsolutePath, name: String) -> Bool { guard target(path: path, name: name)?.target.supportsCatalyst ?? false else { return false } @@ -232,7 +233,7 @@ public class GraphTraverser: GraphTraversing { } // Filter based on edges - public func directStaticDependencies(path: AbsolutePath, name: String) -> Set { + public func directStaticDependencies(path: Path.AbsolutePath, name: String) -> Set { Set( graph.dependencies[.target(name: name, path: path)]? .compactMap { (dependency: GraphDependency) -> GraphDependencyReference? in @@ -252,7 +253,7 @@ public class GraphTraverser: GraphTraversing { ) } - public func embeddableFrameworks(path: AbsolutePath, name: String) -> Set { + public func embeddableFrameworks(path: Path.AbsolutePath, name: String) -> Set { guard let target = target(path: path, name: name), canEmbedProducts(target: target.target) else { return Set() } var references: Set = Set([]) @@ -301,18 +302,18 @@ public class GraphTraverser: GraphTraversing { return references } - public func searchablePathDependencies(path: AbsolutePath, name: String) throws -> Set { + public func searchablePathDependencies(path: Path.AbsolutePath, name: String) throws -> Set { try linkableDependencies(path: path, name: name, shouldExcludeHostAppDependencies: false) .union(staticPrecompiledFrameworksDependencies(path: path, name: name)) } - public func linkableDependencies(path: AbsolutePath, name: String) throws -> Set { + public func linkableDependencies(path: Path.AbsolutePath, name: String) throws -> Set { try linkableDependencies(path: path, name: name, shouldExcludeHostAppDependencies: true) } // swiftlint:disable:next function_body_length public func linkableDependencies( - path: AbsolutePath, + path: Path.AbsolutePath, name: String, shouldExcludeHostAppDependencies: Bool ) throws -> Set { @@ -429,7 +430,7 @@ public class GraphTraverser: GraphTraversing { return references } - public func copyProductDependencies(path: AbsolutePath, name: String) -> Set { + public func copyProductDependencies(path: Path.AbsolutePath, name: String) -> Set { guard let target = target(path: path, name: name) else { return Set() } var dependencies = Set() @@ -444,7 +445,7 @@ public class GraphTraverser: GraphTraversing { return Set(dependencies) } - public func directSwiftMacroExecutables(path: AbsolutePath, name: String) -> Set { + public func directSwiftMacroExecutables(path: Path.AbsolutePath, name: String) -> Set { let dependencies = directTargetDependencies(path: path, name: name) .filter { $0.target.product == .macro } .map { GraphDependencyReference.product( @@ -456,14 +457,14 @@ public class GraphTraverser: GraphTraversing { return Set(dependencies) } - public func directSwiftMacroTargets(path: AbsolutePath, name: String) -> Set { + public func directSwiftMacroTargets(path: Path.AbsolutePath, name: String) -> Set { let dependencies = directTargetDependencies(path: path, name: name) .filter { [.staticFramework, .framework, .dynamicLibrary, .staticLibrary].contains($0.target.product) } .filter { self.directSwiftMacroExecutables(path: $0.graphTarget.path, name: $0.graphTarget.target.name).count != 0 } return Set(dependencies) } - public func allSwiftMacroTargets(path: AbsolutePath, name: String) -> Set { + public func allSwiftMacroTargets(path: Path.AbsolutePath, name: String) -> Set { var dependencies = allTargetDependencies(path: path, name: name) .filter { [.staticFramework, .framework, .dynamicLibrary, .staticLibrary].contains($0.target.product) } .filter { self.directSwiftMacroExecutables(path: $0.path, name: $0.target.name).count != 0 } @@ -475,25 +476,25 @@ public class GraphTraverser: GraphTraversing { return Set(dependencies) } - public func librariesPublicHeadersFolders(path: AbsolutePath, name: String) -> Set { + public func librariesPublicHeadersFolders(path: Path.AbsolutePath, name: String) -> Set { let dependencies = graph.dependencies[.target(name: name, path: path), default: []] - let libraryPublicHeaders = dependencies.compactMap { dependency -> AbsolutePath? in + let libraryPublicHeaders = dependencies.compactMap { dependency -> Path.AbsolutePath? in guard case let GraphDependency.library(_, publicHeaders, _, _, _) = dependency else { return nil } return publicHeaders } return Set(libraryPublicHeaders) } - public func librariesSearchPaths(path: AbsolutePath, name: String) throws -> Set { + public func librariesSearchPaths(path: Path.AbsolutePath, name: String) throws -> Set { let directDependencies = graph.dependencies[.target(name: name, path: path), default: []] - let directDependenciesLibraryPaths = directDependencies.compactMap { dependency -> AbsolutePath? in + let directDependenciesLibraryPaths = directDependencies.compactMap { dependency -> Path.AbsolutePath? in guard case let GraphDependency.library(path, _, _, _, _) = dependency else { return nil } return path } // In addition to any directly linked libraries, search paths for any transitivley linked libraries // are also needed. - let linkedLibraryPaths: [AbsolutePath] = try linkableDependencies( + let linkedLibraryPaths: [Path.AbsolutePath] = try linkableDependencies( path: path, name: name, shouldExcludeHostAppDependencies: false @@ -509,16 +510,16 @@ public class GraphTraverser: GraphTraversing { return Set((directDependenciesLibraryPaths + linkedLibraryPaths).compactMap { $0.removingLastComponent() }) } - public func librariesSwiftIncludePaths(path: AbsolutePath, name: String) -> Set { + public func librariesSwiftIncludePaths(path: Path.AbsolutePath, name: String) -> Set { let dependencies = graph.dependencies[.target(name: name, path: path), default: []] - let librarySwiftModuleMapPaths = dependencies.compactMap { dependency -> AbsolutePath? in + let librarySwiftModuleMapPaths = dependencies.compactMap { dependency -> Path.AbsolutePath? in guard case let GraphDependency.library(_, _, _, _, swiftModuleMapPath) = dependency else { return nil } return swiftModuleMapPath } return Set(librarySwiftModuleMapPaths.compactMap { $0.removingLastComponent() }) } - public func runPathSearchPaths(path: AbsolutePath, name: String) -> Set { + public func runPathSearchPaths(path: Path.AbsolutePath, name: String) -> Set { guard let target = target(path: path, name: name), canEmbedProducts(target: target.target), target.target.product == .unitTests, @@ -527,7 +528,7 @@ public class GraphTraverser: GraphTraversing { return Set() } - var references: Set = Set([]) + var references: Set = Set([]) let from = GraphDependency.target(name: name, path: path) let precompiledFrameworksPaths = filterDependencies( @@ -536,7 +537,7 @@ public class GraphTraverser: GraphTraversing { skip: canDependencyEmbedProducts ) .lazy - .compactMap { (dependency: GraphDependency) -> AbsolutePath? in + .compactMap { (dependency: GraphDependency) -> Path.AbsolutePath? in switch dependency { case let .xcframework(xcframework): return xcframework.path case let .framework(path, _, _, _, _, _, _): return path @@ -554,7 +555,7 @@ public class GraphTraverser: GraphTraversing { return references } - public func hostTargetFor(path: AbsolutePath, name: String) -> GraphTarget? { + public func hostTargetFor(path: Path.AbsolutePath, name: String) -> GraphTarget? { guard let project = graph.projects[path] else { return nil } let targets = project.targets @@ -570,7 +571,7 @@ public class GraphTraverser: GraphTraversing { }.first } - public func allProjectDependencies(path: AbsolutePath) throws -> Set { + public func allProjectDependencies(path: Path.AbsolutePath) throws -> Set { let targets = targets(at: path) if targets.isEmpty { return Set() } var references: Set = Set() @@ -584,11 +585,11 @@ public class GraphTraverser: GraphTraversing { return references } - public func needsEnableTestingSearchPaths(path: AbsolutePath, name: String) -> Bool { + public func needsEnableTestingSearchPaths(path: Path.AbsolutePath, name: String) -> Bool { var cache: [GraphTarget: Bool] = [:] func _needsEnableTestingSearchPaths( - path: AbsolutePath, + path: Path.AbsolutePath, name: String ) -> Bool { // Target could not be created, something must be wrong @@ -640,7 +641,7 @@ public class GraphTraverser: GraphTraversing { return _needsEnableTestingSearchPaths(path: path, name: name) } - public func dependsOnXCTest(path: AbsolutePath, name: String) -> Bool { + public func dependsOnXCTest(path: Path.AbsolutePath, name: String) -> Bool { guard let target = target(path: path, name: name) else { return false } @@ -674,7 +675,7 @@ public class GraphTraverser: GraphTraversing { allInternalTargets().filter { directTargetExternalDependencies(path: $0.path, name: $0.target.name).count != 0 } } - public func directTargetExternalDependencies(path: AbsolutePath, name: String) -> Set { + public func directTargetExternalDependencies(path: Path.AbsolutePath, name: String) -> Set { directTargetDependencies(path: path, name: name).filter(\.graphTarget.project.isExternal) } @@ -709,8 +710,8 @@ public class GraphTraverser: GraphTraversing { } // swiftlint:disable:next function_body_length - public func allSwiftPluginExecutables(path: TSCBasic.AbsolutePath, name: String) -> Set { - func precompiledMacroDependencies(_ graphDependency: GraphDependency) -> Set { + public func allSwiftPluginExecutables(path: Path.AbsolutePath, name: String) -> Set { + func precompiledMacroDependencies(_ graphDependency: GraphDependency) -> Set { Set( dependencies[graphDependency, default: Set()] .lazy @@ -1096,7 +1097,7 @@ public class GraphTraverser: GraphTraversing { } } - func unitTestHost(path: AbsolutePath, name: String) -> GraphTarget? { + func unitTestHost(path: Path.AbsolutePath, name: String) -> GraphTarget? { directLocalTargetDependencies(path: path, name: name) .first(where: { $0.target.product.canHostTests() })?.graphTarget } @@ -1197,7 +1198,7 @@ public class GraphTraverser: GraphTraversing { } private func staticPrecompiledFrameworksDependencies( - path: AbsolutePath, + path: Path.AbsolutePath, name: String ) -> [GraphDependencyReference] { let precompiledStatic = graph.dependencies[.target(name: name, path: path), default: []] @@ -1218,7 +1219,7 @@ public class GraphTraverser: GraphTraversing { } private func staticPrecompiledXCFrameworksDependencies( - path: AbsolutePath, + path: Path.AbsolutePath, name: String ) -> [GraphDependencyReference] { let dependencies = filterDependencies( diff --git a/Sources/TuistCore/Graph/Mappers/GraphMapper.swift b/Sources/TuistCore/Graph/Mappers/GraphMapper.swift index c46b5cbe27b..100b96302de 100644 --- a/Sources/TuistCore/Graph/Mappers/GraphMapper.swift +++ b/Sources/TuistCore/Graph/Mappers/GraphMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph /// A protocol that defines an interface to map dependency graphs. diff --git a/Sources/TuistCore/Graph/ModelExtensions/Project+Core.swift b/Sources/TuistCore/Graph/ModelExtensions/Project+Core.swift index f985f68409b..16d02acd4fb 100644 --- a/Sources/TuistCore/Graph/ModelExtensions/Project+Core.swift +++ b/Sources/TuistCore/Graph/ModelExtensions/Project+Core.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/Graph/ModelExtensions/Target+Core.swift b/Sources/TuistCore/Graph/ModelExtensions/Target+Core.swift index 6cb1b85776d..a37ed67b64e 100644 --- a/Sources/TuistCore/Graph/ModelExtensions/Target+Core.swift +++ b/Sources/TuistCore/Graph/ModelExtensions/Target+Core.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/Graph/ModelExtensions/TargetScript+Core.swift b/Sources/TuistCore/Graph/ModelExtensions/TargetScript+Core.swift index 08db67134d8..d620a27652f 100644 --- a/Sources/TuistCore/Graph/ModelExtensions/TargetScript+Core.swift +++ b/Sources/TuistCore/Graph/ModelExtensions/TargetScript+Core.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/GraphTraverser/GraphTraversing.swift b/Sources/TuistCore/GraphTraverser/GraphTraversing.swift index a7e1acd49d5..ae904ca902f 100644 --- a/Sources/TuistCore/GraphTraverser/GraphTraversing.swift +++ b/Sources/TuistCore/GraphTraverser/GraphTraversing.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph public protocol GraphTraversing { diff --git a/Sources/TuistCore/MetadataProviders/FrameworkMetadataProvider.swift b/Sources/TuistCore/MetadataProviders/FrameworkMetadataProvider.swift index eebc00de738..baf32027349 100644 --- a/Sources/TuistCore/MetadataProviders/FrameworkMetadataProvider.swift +++ b/Sources/TuistCore/MetadataProviders/FrameworkMetadataProvider.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/MetadataProviders/LibraryMetadataProvider.swift b/Sources/TuistCore/MetadataProviders/LibraryMetadataProvider.swift index ce964081f11..99515fb9d83 100644 --- a/Sources/TuistCore/MetadataProviders/LibraryMetadataProvider.swift +++ b/Sources/TuistCore/MetadataProviders/LibraryMetadataProvider.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/MetadataProviders/PrecompiledMetadataProvider.swift b/Sources/TuistCore/MetadataProviders/PrecompiledMetadataProvider.swift index f3d2bfc97a4..a48ac31b4dd 100644 --- a/Sources/TuistCore/MetadataProviders/PrecompiledMetadataProvider.swift +++ b/Sources/TuistCore/MetadataProviders/PrecompiledMetadataProvider.swift @@ -1,6 +1,6 @@ import Foundation import MachO -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/MetadataProviders/SystemFrameworksMetadataProvider.swift b/Sources/TuistCore/MetadataProviders/SystemFrameworksMetadataProvider.swift index a72fa2b4419..0bb0833f89f 100644 --- a/Sources/TuistCore/MetadataProviders/SystemFrameworksMetadataProvider.swift +++ b/Sources/TuistCore/MetadataProviders/SystemFrameworksMetadataProvider.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/MetadataProviders/XCFrameworkMetadataProvider.swift b/Sources/TuistCore/MetadataProviders/XCFrameworkMetadataProvider.swift index c26c18c63a8..e2836f3fc49 100644 --- a/Sources/TuistCore/MetadataProviders/XCFrameworkMetadataProvider.swift +++ b/Sources/TuistCore/MetadataProviders/XCFrameworkMetadataProvider.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/NodeLoaders/FrameworkLoader.swift b/Sources/TuistCore/NodeLoaders/FrameworkLoader.swift index eb479dd5689..c80356504f7 100644 --- a/Sources/TuistCore/NodeLoaders/FrameworkLoader.swift +++ b/Sources/TuistCore/NodeLoaders/FrameworkLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/NodeLoaders/XCFrameworkLoader.swift b/Sources/TuistCore/NodeLoaders/XCFrameworkLoader.swift index 8865a4e28bd..1585a9ea374 100644 --- a/Sources/TuistCore/NodeLoaders/XCFrameworkLoader.swift +++ b/Sources/TuistCore/NodeLoaders/XCFrameworkLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/Simulator/SimulatorController.swift b/Sources/TuistCore/Simulator/SimulatorController.swift index c109e1a91f4..41904726750 100644 --- a/Sources/TuistCore/Simulator/SimulatorController.swift +++ b/Sources/TuistCore/Simulator/SimulatorController.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import struct TSCUtility.Version import TuistSupport import XcodeGraph diff --git a/Sources/TuistCore/Simulator/SimulatorDevice.swift b/Sources/TuistCore/Simulator/SimulatorDevice.swift index eb76245a558..dcdcf611572 100644 --- a/Sources/TuistCore/Simulator/SimulatorDevice.swift +++ b/Sources/TuistCore/Simulator/SimulatorDevice.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// It represents a simulator device. Devices are obtained using Xcode's CLI simctl public struct SimulatorDevice: Decodable, Hashable, CustomStringConvertible { diff --git a/Sources/TuistCore/Simulator/SimulatorRuntime.swift b/Sources/TuistCore/Simulator/SimulatorRuntime.swift index c4f94ef603d..a4e615282c6 100644 --- a/Sources/TuistCore/Simulator/SimulatorRuntime.swift +++ b/Sources/TuistCore/Simulator/SimulatorRuntime.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// It represents a runtime that is available in the system. The list of available runtimes is obtained /// using Xcode's simctl cli tool. diff --git a/Sources/TuistCore/Utils/RootDirectoryLocator.swift b/Sources/TuistCore/Utils/RootDirectoryLocator.swift index 72c3ea9735e..fd35a427e59 100644 --- a/Sources/TuistCore/Utils/RootDirectoryLocator.swift +++ b/Sources/TuistCore/Utils/RootDirectoryLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport public protocol RootDirectoryLocating { diff --git a/Sources/TuistCore/Utils/XcodeProjectBuildDirectoryLocator.swift b/Sources/TuistCore/Utils/XcodeProjectBuildDirectoryLocator.swift index 683838ff796..d69904e111e 100644 --- a/Sources/TuistCore/Utils/XcodeProjectBuildDirectoryLocator.swift +++ b/Sources/TuistCore/Utils/XcodeProjectBuildDirectoryLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistCoreTesting/Automation/MockXcodeBuildController.swift b/Sources/TuistCoreTesting/Automation/MockXcodeBuildController.swift index d99c718a3ee..7b010da409f 100644 --- a/Sources/TuistCoreTesting/Automation/MockXcodeBuildController.swift +++ b/Sources/TuistCoreTesting/Automation/MockXcodeBuildController.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport @testable import TuistSupportTesting diff --git a/Sources/TuistCoreTesting/Cache/MockContentHasher.swift b/Sources/TuistCoreTesting/Cache/MockContentHasher.swift index 42d59844e7d..9615eb3e827 100644 --- a/Sources/TuistCoreTesting/Cache/MockContentHasher.swift +++ b/Sources/TuistCoreTesting/Cache/MockContentHasher.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore public final class MockContentHasher: ContentHashing { diff --git a/Sources/TuistCoreTesting/Extensions/TuistTestCase+LintingIssue.swift b/Sources/TuistCoreTesting/Extensions/TuistTestCase+LintingIssue.swift index e2977740f04..e2ba2195e99 100644 --- a/Sources/TuistCoreTesting/Extensions/TuistTestCase+LintingIssue.swift +++ b/Sources/TuistCoreTesting/Extensions/TuistTestCase+LintingIssue.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupportTesting import XCTest diff --git a/Sources/TuistCoreTesting/Graph/DependenciesGraph+TestData.swift b/Sources/TuistCoreTesting/Graph/DependenciesGraph+TestData.swift index e5891ac26d7..e05b573528e 100644 --- a/Sources/TuistCoreTesting/Graph/DependenciesGraph+TestData.swift +++ b/Sources/TuistCoreTesting/Graph/DependenciesGraph+TestData.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import TuistSupportTesting diff --git a/Sources/TuistCoreTesting/Graph/GraphDependencyReference+TestData.swift b/Sources/TuistCoreTesting/Graph/GraphDependencyReference+TestData.swift index bd200129508..e07b61e7249 100644 --- a/Sources/TuistCoreTesting/Graph/GraphDependencyReference+TestData.swift +++ b/Sources/TuistCoreTesting/Graph/GraphDependencyReference+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistCoreTesting/Graph/MockGraphLoader.swift b/Sources/TuistCoreTesting/Graph/MockGraphLoader.swift index def47363f25..5d4a789972c 100644 --- a/Sources/TuistCoreTesting/Graph/MockGraphLoader.swift +++ b/Sources/TuistCoreTesting/Graph/MockGraphLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph @testable import XcodeGraphTesting diff --git a/Sources/TuistCoreTesting/Graph/WorkspaceWithProjects+TestData.swift b/Sources/TuistCoreTesting/Graph/WorkspaceWithProjects+TestData.swift index 8639a3f00fe..129ca0aeeb0 100644 --- a/Sources/TuistCoreTesting/Graph/WorkspaceWithProjects+TestData.swift +++ b/Sources/TuistCoreTesting/Graph/WorkspaceWithProjects+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph import XcodeGraphTesting @testable import TuistCore diff --git a/Sources/TuistCoreTesting/GraphTraverser/MockGraphTraverser.swift b/Sources/TuistCoreTesting/GraphTraverser/MockGraphTraverser.swift index 9f5164d67f6..4d2573dafc3 100644 --- a/Sources/TuistCoreTesting/GraphTraverser/MockGraphTraverser.swift +++ b/Sources/TuistCoreTesting/GraphTraverser/MockGraphTraverser.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistCore @@ -68,7 +68,7 @@ final class MockGraphTraverser: GraphTraversing { var invokedTargets = false var invokedTargetsCount = 0 var stubbedTargets: [AbsolutePath: [String: Target]]! = [:] - func targets() -> [TSCBasic.AbsolutePath: [String: XcodeGraph.Target]] { + func targets() -> [Path.AbsolutePath: [String: XcodeGraph.Target]] { invokedTargets = true invokedTargetsCount += 1 return stubbedTargets @@ -198,7 +198,7 @@ final class MockGraphTraverser: GraphTraversing { var invokedBuildsForMacCatalystParametersList = [(path: AbsolutePath, name: String)]() var stubbedBuildsForMacCatalystResult: Bool! - func buildsForMacCatalyst(path: TSCBasic.AbsolutePath, name: String) -> Bool { + func buildsForMacCatalyst(path: Path.AbsolutePath, name: String) -> Bool { invokedBuildsForMacCatalyst = true invokedBuildsForMacCatalystCount += 1 invokedBuildsForMacCatalystParameters = (path, name) @@ -241,7 +241,7 @@ final class MockGraphTraverser: GraphTraversing { name: String )? var invokedAllTargetDependenciesResult: Set = [] - func allTargetDependencies(path: TSCBasic.AbsolutePath, name: String) -> Set { + func allTargetDependencies(path: Path.AbsolutePath, name: String) -> Set { invokedAllTargetDependencies = true invokedAllTargetDependenciesCount += 1 invokedAllTargetDependenciesParameters = (path, name) @@ -565,7 +565,7 @@ final class MockGraphTraverser: GraphTraversing { [(path: AbsolutePath, name: String)]() var stubbedExtensionKitExtensionDependenciesResult: Set! = [] - func extensionKitExtensionDependencies(path: TSCBasic.AbsolutePath, name: String) -> Set { + func extensionKitExtensionDependencies(path: Path.AbsolutePath, name: String) -> Set { invokedExtensionKitExtensionDependencies = true invokedExtensionKitExtensionDependenciesCount += 1 invokedExtensionKitExtensionDependenciesParameters = (path, name) @@ -582,7 +582,7 @@ final class MockGraphTraverser: GraphTraversing { [(path: AbsolutePath, name: String)]() var stubbedExtensionKitExtensionDependenciesWithConditionsResult: [(GraphTarget, PlatformCondition?)]! = [] - func extensionKitExtensionDependenciesWithConditions(path: TSCBasic.AbsolutePath, name: String) -> [( + func extensionKitExtensionDependenciesWithConditions(path: Path.AbsolutePath, name: String) -> [( XcodeGraph.GraphTarget, XcodeGraph.PlatformCondition? )] { @@ -600,7 +600,7 @@ final class MockGraphTraverser: GraphTraversing { [(path: AbsolutePath, name: String)]() var stubbedDirectSwiftMacroExecutablesResult: Set! = [] - func directSwiftMacroExecutables(path: TSCBasic.AbsolutePath, name: String) -> Set { + func directSwiftMacroExecutables(path: Path.AbsolutePath, name: String) -> Set { invokedDirectSwiftMacroExecutables = true invokedDirectSwiftMacroExecutablesCount += 1 invokedDirectSwiftMacroExecutablesParameters = (path, name) @@ -614,7 +614,7 @@ final class MockGraphTraverser: GraphTraversing { var invokedDirectSwiftMacroTargetsParametersList = [(path: AbsolutePath, name: String)]() var stubbedDirectSwiftMacroTargetsResult: Set! = [] - func directSwiftMacroTargets(path: TSCBasic.AbsolutePath, name: String) -> Set { + func directSwiftMacroTargets(path: Path.AbsolutePath, name: String) -> Set { invokedDirectSwiftMacroTargets = true invokedDirectSwiftMacroTargetsCount += 1 invokedDirectSwiftMacroTargetsParameters = (path, name) @@ -628,7 +628,7 @@ final class MockGraphTraverser: GraphTraversing { var invokedAllSwiftMacroTargetsParametersList = [(path: AbsolutePath, name: String)]() var stubbedAllSwiftMacroTargetsResult: Set! = [] - func allSwiftMacroTargets(path: TSCBasic.AbsolutePath, name: String) -> Set { + func allSwiftMacroTargets(path: Path.AbsolutePath, name: String) -> Set { invokedAllSwiftMacroTargets = true invokedAllSwiftMacroTargetsCount += 1 invokedAllSwiftMacroTargetsParameters = (path, name) @@ -692,7 +692,7 @@ final class MockGraphTraverser: GraphTraversing { var invokedAllSwiftPluginExecutablesParametersList = [(path: AbsolutePath, name: String)]() var stubbedAllSwiftPluginExecutablesResult: Set! = [] - func allSwiftPluginExecutables(path: TSCBasic.AbsolutePath, name: String) -> Set { + func allSwiftPluginExecutables(path: Path.AbsolutePath, name: String) -> Set { invokedAllSwiftPluginExecutables = true invokedAllSwiftPluginExecutablesCount += 1 invokedAllSwiftPluginExecutablesParameters = (path, name) diff --git a/Sources/TuistCoreTesting/Mappers/MockProjectMapper.swift b/Sources/TuistCoreTesting/Mappers/MockProjectMapper.swift index f34d1a92194..d1a58618f33 100644 --- a/Sources/TuistCoreTesting/Mappers/MockProjectMapper.swift +++ b/Sources/TuistCoreTesting/Mappers/MockProjectMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistCore diff --git a/Sources/TuistCoreTesting/Mappers/MockWorkspaceMapper.swift b/Sources/TuistCoreTesting/Mappers/MockWorkspaceMapper.swift index 3f45a3a7a7b..9a1e3859901 100644 --- a/Sources/TuistCoreTesting/Mappers/MockWorkspaceMapper.swift +++ b/Sources/TuistCoreTesting/Mappers/MockWorkspaceMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistCore diff --git a/Sources/TuistCoreTesting/MetadataProviders/MockFrameworkMetadataProvider.swift b/Sources/TuistCoreTesting/MetadataProviders/MockFrameworkMetadataProvider.swift index 98e4166dc37..8b100bb4546 100644 --- a/Sources/TuistCoreTesting/MetadataProviders/MockFrameworkMetadataProvider.swift +++ b/Sources/TuistCoreTesting/MetadataProviders/MockFrameworkMetadataProvider.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistCore diff --git a/Sources/TuistCoreTesting/MetadataProviders/MockLibraryMetadataProvider.swift b/Sources/TuistCoreTesting/MetadataProviders/MockLibraryMetadataProvider.swift index 306cc39d0c0..a8e38b88dd8 100644 --- a/Sources/TuistCoreTesting/MetadataProviders/MockLibraryMetadataProvider.swift +++ b/Sources/TuistCoreTesting/MetadataProviders/MockLibraryMetadataProvider.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistCore diff --git a/Sources/TuistCoreTesting/MetadataProviders/MockPrecompiledMetadataProvider.swift b/Sources/TuistCoreTesting/MetadataProviders/MockPrecompiledMetadataProvider.swift index 040b2fdeb3f..d18b14e9484 100644 --- a/Sources/TuistCoreTesting/MetadataProviders/MockPrecompiledMetadataProvider.swift +++ b/Sources/TuistCoreTesting/MetadataProviders/MockPrecompiledMetadataProvider.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistCore diff --git a/Sources/TuistCoreTesting/MetadataProviders/MockXCFrameworkMetadataProvider.swift b/Sources/TuistCoreTesting/MetadataProviders/MockXCFrameworkMetadataProvider.swift index f02fea09ead..c8a9cc03cee 100644 --- a/Sources/TuistCoreTesting/MetadataProviders/MockXCFrameworkMetadataProvider.swift +++ b/Sources/TuistCoreTesting/MetadataProviders/MockXCFrameworkMetadataProvider.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistCore diff --git a/Sources/TuistCoreTesting/NodeLoaders/MockFrameworkNodeLoader.swift b/Sources/TuistCoreTesting/NodeLoaders/MockFrameworkNodeLoader.swift index 0dc8667c3d5..c22c2c226bb 100644 --- a/Sources/TuistCoreTesting/NodeLoaders/MockFrameworkNodeLoader.swift +++ b/Sources/TuistCoreTesting/NodeLoaders/MockFrameworkNodeLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistCoreTesting/NodeLoaders/MockXCFrameworkLoader.swift b/Sources/TuistCoreTesting/NodeLoaders/MockXCFrameworkLoader.swift index e31e6e2542f..389e5deaa3b 100644 --- a/Sources/TuistCoreTesting/NodeLoaders/MockXCFrameworkLoader.swift +++ b/Sources/TuistCoreTesting/NodeLoaders/MockXCFrameworkLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistCoreTesting/Simulator/MockSimulatorController.swift b/Sources/TuistCoreTesting/Simulator/MockSimulatorController.swift index 37938b0973f..09be1abd98f 100644 --- a/Sources/TuistCoreTesting/Simulator/MockSimulatorController.swift +++ b/Sources/TuistCoreTesting/Simulator/MockSimulatorController.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import struct TSCUtility.Version import TuistSupport import XcodeGraph diff --git a/Sources/TuistCoreTesting/Simulator/SimulatorDevice+TestData.swift b/Sources/TuistCoreTesting/Simulator/SimulatorDevice+TestData.swift index 4c5718aac32..dea705dc735 100644 --- a/Sources/TuistCoreTesting/Simulator/SimulatorDevice+TestData.swift +++ b/Sources/TuistCoreTesting/Simulator/SimulatorDevice+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistCore extension SimulatorDevice { diff --git a/Sources/TuistCoreTesting/Simulator/SimulatorDeviceAndRuntime+TestData.swift b/Sources/TuistCoreTesting/Simulator/SimulatorDeviceAndRuntime+TestData.swift index 997c8247368..2d2adfde6f4 100644 --- a/Sources/TuistCoreTesting/Simulator/SimulatorDeviceAndRuntime+TestData.swift +++ b/Sources/TuistCoreTesting/Simulator/SimulatorDeviceAndRuntime+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistCore extension SimulatorDeviceAndRuntime { diff --git a/Sources/TuistCoreTesting/Simulator/SimulatorRuntime+TestData.swift b/Sources/TuistCoreTesting/Simulator/SimulatorRuntime+TestData.swift index fbaf5a61fc4..4062e3915fb 100644 --- a/Sources/TuistCoreTesting/Simulator/SimulatorRuntime+TestData.swift +++ b/Sources/TuistCoreTesting/Simulator/SimulatorRuntime+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistCore extension SimulatorRuntime { diff --git a/Sources/TuistCoreTesting/Utils/MockRootDirectoryLocator.swift b/Sources/TuistCoreTesting/Utils/MockRootDirectoryLocator.swift index db8141d2747..7611537892e 100644 --- a/Sources/TuistCoreTesting/Utils/MockRootDirectoryLocator.swift +++ b/Sources/TuistCoreTesting/Utils/MockRootDirectoryLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistCore public final class MockRootDirectoryLocator: RootDirectoryLocating { diff --git a/Sources/TuistCoreTesting/Utils/MockXcodeProjectBuildDirectoryLocator.swift b/Sources/TuistCoreTesting/Utils/MockXcodeProjectBuildDirectoryLocator.swift index e2c340d7d81..89a9fd9df78 100644 --- a/Sources/TuistCoreTesting/Utils/MockXcodeProjectBuildDirectoryLocator.swift +++ b/Sources/TuistCoreTesting/Utils/MockXcodeProjectBuildDirectoryLocator.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistDependencies/Mappers/ExternalDependencyPathWorkspaceMapper.swift b/Sources/TuistDependencies/Mappers/ExternalDependencyPathWorkspaceMapper.swift index fcf5fd9a6c8..5a7edd37bde 100644 --- a/Sources/TuistDependencies/Mappers/ExternalDependencyPathWorkspaceMapper.swift +++ b/Sources/TuistDependencies/Mappers/ExternalDependencyPathWorkspaceMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Descriptors/ProjectDescriptor.swift b/Sources/TuistGenerator/Descriptors/ProjectDescriptor.swift index a5e12017740..2985a2f7e95 100644 --- a/Sources/TuistGenerator/Descriptors/ProjectDescriptor.swift +++ b/Sources/TuistGenerator/Descriptors/ProjectDescriptor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeProj diff --git a/Sources/TuistGenerator/Descriptors/WorkspaceDescriptor.swift b/Sources/TuistGenerator/Descriptors/WorkspaceDescriptor.swift index 8a50a5a4ff0..8cfd11320c1 100644 --- a/Sources/TuistGenerator/Descriptors/WorkspaceDescriptor.swift +++ b/Sources/TuistGenerator/Descriptors/WorkspaceDescriptor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeProj diff --git a/Sources/TuistGenerator/Descriptors/WorkspaceSettingsDescriptor.swift b/Sources/TuistGenerator/Descriptors/WorkspaceSettingsDescriptor.swift index 92d8de7b6cd..3c95feaa9e8 100644 --- a/Sources/TuistGenerator/Descriptors/WorkspaceSettingsDescriptor.swift +++ b/Sources/TuistGenerator/Descriptors/WorkspaceSettingsDescriptor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeProj /// Workspace Settings Descriptor diff --git a/Sources/TuistGenerator/Extensions/AbsolutePath+Extras.swift b/Sources/TuistGenerator/Extensions/AbsolutePath+Extras.swift index 377caa36b2f..e55da711ab7 100644 --- a/Sources/TuistGenerator/Extensions/AbsolutePath+Extras.swift +++ b/Sources/TuistGenerator/Extensions/AbsolutePath+Extras.swift @@ -1,6 +1,6 @@ import Foundation +import Path import PathKit -import TSCBasic extension AbsolutePath { var path: Path { diff --git a/Sources/TuistGenerator/Extensions/Graph+Extras.swift b/Sources/TuistGenerator/Extensions/Graph+Extras.swift index 5589e101b87..235179e560a 100644 --- a/Sources/TuistGenerator/Extensions/Graph+Extras.swift +++ b/Sources/TuistGenerator/Extensions/Graph+Extras.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import TuistCore import XcodeGraph @@ -59,7 +60,7 @@ extension XcodeGraph.Graph { } extension GraphDependency { - fileprivate func isExternal(_ projects: [AbsolutePath: XcodeGraph.Project]) -> Bool { + fileprivate func isExternal(_ projects: [Path.AbsolutePath: XcodeGraph.Project]) -> Bool { switch self { case let .target(_, path): return projects[path]?.isExternal ?? false diff --git a/Sources/TuistGenerator/Generator/BuildPhaseGenerator.swift b/Sources/TuistGenerator/Generator/BuildPhaseGenerator.swift index 9d136f3f9f9..195b9f4c3a3 100644 --- a/Sources/TuistGenerator/Generator/BuildPhaseGenerator.swift +++ b/Sources/TuistGenerator/Generator/BuildPhaseGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Generator/ConfigGenerator.swift b/Sources/TuistGenerator/Generator/ConfigGenerator.swift index 835bb9f66da..c1c5a1dc82a 100644 --- a/Sources/TuistGenerator/Generator/ConfigGenerator.swift +++ b/Sources/TuistGenerator/Generator/ConfigGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Generator/DescriptorGenerator.swift b/Sources/TuistGenerator/Generator/DescriptorGenerator.swift index c32d88eb630..9fbffcde43e 100644 --- a/Sources/TuistGenerator/Generator/DescriptorGenerator.swift +++ b/Sources/TuistGenerator/Generator/DescriptorGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Generator/GeneratedProject.swift b/Sources/TuistGenerator/Generator/GeneratedProject.swift index f08cd316663..dd11386808f 100644 --- a/Sources/TuistGenerator/Generator/GeneratedProject.swift +++ b/Sources/TuistGenerator/Generator/GeneratedProject.swift @@ -1,6 +1,6 @@ import Foundation +import Path import PathKit -import TSCBasic import XcodeProj final class GeneratedProject { diff --git a/Sources/TuistGenerator/Generator/LinkGenerator.swift b/Sources/TuistGenerator/Generator/LinkGenerator.swift index 64bc67807fd..548768f3882 100644 --- a/Sources/TuistGenerator/Generator/LinkGenerator.swift +++ b/Sources/TuistGenerator/Generator/LinkGenerator.swift @@ -1,6 +1,6 @@ import Foundation +import Path import PathKit -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Generator/ProjectDescriptorGenerator.swift b/Sources/TuistGenerator/Generator/ProjectDescriptorGenerator.swift index 59b8d1a8dee..5983464f1a1 100644 --- a/Sources/TuistGenerator/Generator/ProjectDescriptorGenerator.swift +++ b/Sources/TuistGenerator/Generator/ProjectDescriptorGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Generator/ProjectFileElements.swift b/Sources/TuistGenerator/Generator/ProjectFileElements.swift index 2f297181e91..e8010706e55 100644 --- a/Sources/TuistGenerator/Generator/ProjectFileElements.swift +++ b/Sources/TuistGenerator/Generator/ProjectFileElements.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Generator/ProjectGroups.swift b/Sources/TuistGenerator/Generator/ProjectGroups.swift index 248165db317..df4f7a337e8 100644 --- a/Sources/TuistGenerator/Generator/ProjectGroups.swift +++ b/Sources/TuistGenerator/Generator/ProjectGroups.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import TuistCore import TuistSupport diff --git a/Sources/TuistGenerator/Generator/SchemeDescriptorsGenerator.swift b/Sources/TuistGenerator/Generator/SchemeDescriptorsGenerator.swift index 9a9dfff22c7..b8faf39fb84 100644 --- a/Sources/TuistGenerator/Generator/SchemeDescriptorsGenerator.swift +++ b/Sources/TuistGenerator/Generator/SchemeDescriptorsGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistGenerator/Generator/TargetGenerator.swift b/Sources/TuistGenerator/Generator/TargetGenerator.swift index e5c004feab0..159074d9495 100644 --- a/Sources/TuistGenerator/Generator/TargetGenerator.swift +++ b/Sources/TuistGenerator/Generator/TargetGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Generator/WorkspaceDescriptorGenerator.swift b/Sources/TuistGenerator/Generator/WorkspaceDescriptorGenerator.swift index 350ef92222a..86510f87c70 100644 --- a/Sources/TuistGenerator/Generator/WorkspaceDescriptorGenerator.swift +++ b/Sources/TuistGenerator/Generator/WorkspaceDescriptorGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeProj diff --git a/Sources/TuistGenerator/Generator/WorkspaceStructureGenerator.swift b/Sources/TuistGenerator/Generator/WorkspaceStructureGenerator.swift index cbc5edf2737..512c2fccb6d 100644 --- a/Sources/TuistGenerator/Generator/WorkspaceStructureGenerator.swift +++ b/Sources/TuistGenerator/Generator/WorkspaceStructureGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Linter/EnvironmentLinter.swift b/Sources/TuistGenerator/Linter/EnvironmentLinter.swift index a0ebbfb565e..081a5b2890f 100644 --- a/Sources/TuistGenerator/Linter/EnvironmentLinter.swift +++ b/Sources/TuistGenerator/Linter/EnvironmentLinter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Linter/PackageLinter.swift b/Sources/TuistGenerator/Linter/PackageLinter.swift index 52eea27d598..b00999ce227 100644 --- a/Sources/TuistGenerator/Linter/PackageLinter.swift +++ b/Sources/TuistGenerator/Linter/PackageLinter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Linter/ProjectLinter.swift b/Sources/TuistGenerator/Linter/ProjectLinter.swift index 6bc2bfa790e..234c5887164 100644 --- a/Sources/TuistGenerator/Linter/ProjectLinter.swift +++ b/Sources/TuistGenerator/Linter/ProjectLinter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Linter/SettingsLinter.swift b/Sources/TuistGenerator/Linter/SettingsLinter.swift index b06cb476fc8..7a80359dfe8 100644 --- a/Sources/TuistGenerator/Linter/SettingsLinter.swift +++ b/Sources/TuistGenerator/Linter/SettingsLinter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Linter/StaticProductsGraphLinter.swift b/Sources/TuistGenerator/Linter/StaticProductsGraphLinter.swift index 479e9c2c11f..be930cd5733 100644 --- a/Sources/TuistGenerator/Linter/StaticProductsGraphLinter.swift +++ b/Sources/TuistGenerator/Linter/StaticProductsGraphLinter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/AutogeneratedSchemesProjectMapper.swift b/Sources/TuistGenerator/Mappers/AutogeneratedSchemesProjectMapper.swift index 107bc16f617..9f16040a950 100644 --- a/Sources/TuistGenerator/Mappers/AutogeneratedSchemesProjectMapper.swift +++ b/Sources/TuistGenerator/Mappers/AutogeneratedSchemesProjectMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/ExplicitDependencyGraphMapper.swift b/Sources/TuistGenerator/Mappers/ExplicitDependencyGraphMapper.swift index 6b5e14f0540..5d9dcbeae42 100644 --- a/Sources/TuistGenerator/Mappers/ExplicitDependencyGraphMapper.swift +++ b/Sources/TuistGenerator/Mappers/ExplicitDependencyGraphMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/GenerateEntitlementsProjectMapper.swift b/Sources/TuistGenerator/Mappers/GenerateEntitlementsProjectMapper.swift index f6b09b7b8ea..070bdf7ae76 100644 --- a/Sources/TuistGenerator/Mappers/GenerateEntitlementsProjectMapper.swift +++ b/Sources/TuistGenerator/Mappers/GenerateEntitlementsProjectMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/GenerateInfoPlistProjectMapper.swift b/Sources/TuistGenerator/Mappers/GenerateInfoPlistProjectMapper.swift index 0ba1ba168e7..fa305ca867d 100644 --- a/Sources/TuistGenerator/Mappers/GenerateInfoPlistProjectMapper.swift +++ b/Sources/TuistGenerator/Mappers/GenerateInfoPlistProjectMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/GeneratePrivacyManifestProjectMapper.swift b/Sources/TuistGenerator/Mappers/GeneratePrivacyManifestProjectMapper.swift index 052a65ac0bd..19c3f0a4ef6 100644 --- a/Sources/TuistGenerator/Mappers/GeneratePrivacyManifestProjectMapper.swift +++ b/Sources/TuistGenerator/Mappers/GeneratePrivacyManifestProjectMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/IDETemplateMacrosMapper.swift b/Sources/TuistGenerator/Mappers/IDETemplateMacrosMapper.swift index 22a58effe40..c2ca8499aa6 100644 --- a/Sources/TuistGenerator/Mappers/IDETemplateMacrosMapper.swift +++ b/Sources/TuistGenerator/Mappers/IDETemplateMacrosMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/ModuleMapMapper.swift b/Sources/TuistGenerator/Mappers/ModuleMapMapper.swift index 3613f98a7c3..f000863928f 100644 --- a/Sources/TuistGenerator/Mappers/ModuleMapMapper.swift +++ b/Sources/TuistGenerator/Mappers/ModuleMapMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/ResourcesProjectMapper.swift b/Sources/TuistGenerator/Mappers/ResourcesProjectMapper.swift index 1b2aa484e3a..dba53ddf205 100644 --- a/Sources/TuistGenerator/Mappers/ResourcesProjectMapper.swift +++ b/Sources/TuistGenerator/Mappers/ResourcesProjectMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Mappers/SynthesizedResourceInterfaceProjectMapper.swift b/Sources/TuistGenerator/Mappers/SynthesizedResourceInterfaceProjectMapper.swift index 97bf5fd13aa..9852cd95623 100644 --- a/Sources/TuistGenerator/Mappers/SynthesizedResourceInterfaceProjectMapper.swift +++ b/Sources/TuistGenerator/Mappers/SynthesizedResourceInterfaceProjectMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import SwiftGenKit -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Utils/EmbedScriptGenerator.swift b/Sources/TuistGenerator/Utils/EmbedScriptGenerator.swift index 9e375b85b82..4f664288c8f 100644 --- a/Sources/TuistGenerator/Utils/EmbedScriptGenerator.swift +++ b/Sources/TuistGenerator/Utils/EmbedScriptGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore /// This protocols defines the interface of an utility that given a list of embeddable frameworks diff --git a/Sources/TuistGenerator/Utils/SwiftPackageManagerInteractor.swift b/Sources/TuistGenerator/Utils/SwiftPackageManagerInteractor.swift index 6aed76bc92a..09d29bac3d7 100644 --- a/Sources/TuistGenerator/Utils/SwiftPackageManagerInteractor.swift +++ b/Sources/TuistGenerator/Utils/SwiftPackageManagerInteractor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Utils/SynthesizedResourceInterfacesGenerator.swift b/Sources/TuistGenerator/Utils/SynthesizedResourceInterfacesGenerator.swift index 18d2a5ccffc..d5dc1ad21cf 100644 --- a/Sources/TuistGenerator/Utils/SynthesizedResourceInterfacesGenerator.swift +++ b/Sources/TuistGenerator/Utils/SynthesizedResourceInterfacesGenerator.swift @@ -1,8 +1,8 @@ +import Path import PathKit import Stencil import StencilSwiftKit import SwiftGenKit -import TSCBasic import TuistSupport import XcodeGraph diff --git a/Sources/TuistGenerator/Writers/XcodeProjWriter.swift b/Sources/TuistGenerator/Writers/XcodeProjWriter.swift index 912113a7337..bc30bd0920c 100644 --- a/Sources/TuistGenerator/Writers/XcodeProjWriter.swift +++ b/Sources/TuistGenerator/Writers/XcodeProjWriter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeProj diff --git a/Sources/TuistGeneratorTesting/Descriptors/Mocks/MockSideEffectDescriptorExecutor.swift b/Sources/TuistGeneratorTesting/Descriptors/Mocks/MockSideEffectDescriptorExecutor.swift index 72e75721727..3c058ef2967 100644 --- a/Sources/TuistGeneratorTesting/Descriptors/Mocks/MockSideEffectDescriptorExecutor.swift +++ b/Sources/TuistGeneratorTesting/Descriptors/Mocks/MockSideEffectDescriptorExecutor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore @testable import TuistGenerator diff --git a/Sources/TuistGeneratorTesting/Descriptors/TestData/ProjectDescriptor+TestData.swift b/Sources/TuistGeneratorTesting/Descriptors/TestData/ProjectDescriptor+TestData.swift index 5afdcce3cb5..b26af76ca3b 100644 --- a/Sources/TuistGeneratorTesting/Descriptors/TestData/ProjectDescriptor+TestData.swift +++ b/Sources/TuistGeneratorTesting/Descriptors/TestData/ProjectDescriptor+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeProj diff --git a/Sources/TuistGeneratorTesting/Descriptors/TestData/SchemeDescriptor+TestData.swift b/Sources/TuistGeneratorTesting/Descriptors/TestData/SchemeDescriptor+TestData.swift index 73faf2df283..96ef54e437d 100644 --- a/Sources/TuistGeneratorTesting/Descriptors/TestData/SchemeDescriptor+TestData.swift +++ b/Sources/TuistGeneratorTesting/Descriptors/TestData/SchemeDescriptor+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeProj @testable import TuistGenerator diff --git a/Sources/TuistGeneratorTesting/Descriptors/TestData/WorkspaceDescriptor+TestData.swift b/Sources/TuistGeneratorTesting/Descriptors/TestData/WorkspaceDescriptor+TestData.swift index c98867a6acc..53c5c47f53e 100644 --- a/Sources/TuistGeneratorTesting/Descriptors/TestData/WorkspaceDescriptor+TestData.swift +++ b/Sources/TuistGeneratorTesting/Descriptors/TestData/WorkspaceDescriptor+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeProj diff --git a/Sources/TuistGeneratorTesting/Generator/MockDescriptorGenerator.swift b/Sources/TuistGeneratorTesting/Generator/MockDescriptorGenerator.swift index 44fdd053b35..28cc8b5049c 100644 --- a/Sources/TuistGeneratorTesting/Generator/MockDescriptorGenerator.swift +++ b/Sources/TuistGeneratorTesting/Generator/MockDescriptorGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph import XcodeProj diff --git a/Sources/TuistGeneratorTesting/Linter/MockEnvironmentLinter.swift b/Sources/TuistGeneratorTesting/Linter/MockEnvironmentLinter.swift index b663452d8c8..43be18152ca 100644 --- a/Sources/TuistGeneratorTesting/Linter/MockEnvironmentLinter.swift +++ b/Sources/TuistGeneratorTesting/Linter/MockEnvironmentLinter.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistKit/Commands/BuildCommand.swift b/Sources/TuistKit/Commands/BuildCommand.swift index 5dab010805c..97fbe9218e9 100644 --- a/Sources/TuistKit/Commands/BuildCommand.swift +++ b/Sources/TuistKit/Commands/BuildCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TSCUtility import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Commands/Cloud/CloudAnalyticsCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudAnalyticsCommand.swift index 28ee50d25b9..e4f139da07f 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudAnalyticsCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudAnalyticsCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudAnalyticsCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudAuthCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudAuthCommand.swift index 8ae33f2b481..f7422880f6a 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudAuthCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudAuthCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct CloudAuthCommand: AsyncParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Cloud/CloudCleanCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudCleanCommand.swift index 83c1314bae5..164142e7c7d 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudCleanCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudCleanCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudCleanCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudInitCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudInitCommand.swift index 007bf99519f..d3075793f75 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudInitCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudInitCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudInitCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudLogoutCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudLogoutCommand.swift index 83691fe86d8..2329a129049 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudLogoutCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudLogoutCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct CloudLogoutCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationBillingCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationBillingCommand.swift index 66188710c49..fac07ea3445 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationBillingCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationBillingCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationBillingCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationCommand.swift index dca1e589613..75c6a90d31f 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct CloudOrganizationCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationCreateCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationCreateCommand.swift index b110ce6e266..dc0d251295a 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationCreateCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationCreateCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationCreateCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationDeleteCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationDeleteCommand.swift index 48c18647439..339d20fab47 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationDeleteCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationDeleteCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationDeleteCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationInviteCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationInviteCommand.swift index 37d4cf15327..54f594183e9 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationInviteCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationInviteCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationInviteCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationListCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationListCommand.swift index 8a9f79cae48..9fce3010523 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationListCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationListCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationListCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveCommand.swift index 2625a55aede..2cefd925617 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct CloudOrganizationRemoveCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveInviteCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveInviteCommand.swift index 832ee37d9ba..1a473abd515 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveInviteCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveInviteCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationRemoveInviteCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveMemberCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveMemberCommand.swift index 95ee194100e..5c7f748c9b9 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveMemberCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveMemberCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationRemoveMemberCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveSSOCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveSSOCommand.swift index 8897c856628..a78146d9ef4 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveSSOCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationRemoveSSOCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationRemoveSSOCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationShowCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationShowCommand.swift index 9d27d5da835..95130ee83ee 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationShowCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationShowCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationShowCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateCommand.swift index 0b05955941d..ff37a85beda 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct CloudOrganizationUpdateCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateMemberCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateMemberCommand.swift index c407918186e..29269e8cb4b 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateMemberCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateMemberCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudOrganizationUpdateMemberCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateSSOCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateSSOCommand.swift index 0b1ec7355d4..a450deff330 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateSSOCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudOrganizationUpdateSSOCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport enum SSOProvider: String, ExpressibleByArgument, CaseIterable { diff --git a/Sources/TuistKit/Commands/Cloud/CloudProjectCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudProjectCommand.swift index 09543d9e397..16300130840 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudProjectCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudProjectCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct CloudProjectCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Cloud/CloudProjectCreateCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudProjectCreateCommand.swift index 82f6ea57e07..0063f07684d 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudProjectCreateCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudProjectCreateCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudProjectCreateCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudProjectListCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudProjectListCommand.swift index 2c58f7fbea7..233bf296166 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudProjectListCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudProjectListCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudProjectListCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudProjectTokenCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudProjectTokenCommand.swift index 371a95f4441..f8003f51fec 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudProjectTokenCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudProjectTokenCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct CloudProjectTokenCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Cloud/CloudSessionCommand.swift b/Sources/TuistKit/Commands/Cloud/CloudSessionCommand.swift index 295f518350c..17c739838fd 100644 --- a/Sources/TuistKit/Commands/Cloud/CloudSessionCommand.swift +++ b/Sources/TuistKit/Commands/Cloud/CloudSessionCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct CloudSessionCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/CloudCommand.swift b/Sources/TuistKit/Commands/CloudCommand.swift index 371a1c47ad0..647c4a6559f 100644 --- a/Sources/TuistKit/Commands/CloudCommand.swift +++ b/Sources/TuistKit/Commands/CloudCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct CloudCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/DumpCommand.swift b/Sources/TuistKit/Commands/DumpCommand.swift index 1b5e2401919..078762d8144 100644 --- a/Sources/TuistKit/Commands/DumpCommand.swift +++ b/Sources/TuistKit/Commands/DumpCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistLoader import TuistSupport diff --git a/Sources/TuistKit/Commands/EditCommand.swift b/Sources/TuistKit/Commands/EditCommand.swift index f36cdb3fb28..f03edf85359 100644 --- a/Sources/TuistKit/Commands/EditCommand.swift +++ b/Sources/TuistKit/Commands/EditCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistGenerator import TuistSupport diff --git a/Sources/TuistKit/Commands/GraphCommand.swift b/Sources/TuistKit/Commands/GraphCommand.swift index ee7413c479e..a974fb3bd2b 100644 --- a/Sources/TuistKit/Commands/GraphCommand.swift +++ b/Sources/TuistKit/Commands/GraphCommand.swift @@ -2,7 +2,7 @@ import AnyCodable import ArgumentParser import Foundation import GraphViz -import TSCBasic +import Path import TuistGenerator import TuistLoader import TuistSupport diff --git a/Sources/TuistKit/Commands/InitCommand.swift b/Sources/TuistKit/Commands/InitCommand.swift index f800ef1a532..8a57a1a097c 100644 --- a/Sources/TuistKit/Commands/InitCommand.swift +++ b/Sources/TuistKit/Commands/InitCommand.swift @@ -1,7 +1,7 @@ import AnyCodable import ArgumentParser import Foundation -import TSCBasic +import Path import TuistCore import TuistGenerator import TuistLoader diff --git a/Sources/TuistKit/Commands/InstallCommand.swift b/Sources/TuistKit/Commands/InstallCommand.swift index d981a9c788b..c921d8129f7 100644 --- a/Sources/TuistKit/Commands/InstallCommand.swift +++ b/Sources/TuistKit/Commands/InstallCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path /// A command to install the remote content the project depends on. public struct InstallCommand: AsyncParsableCommand { diff --git a/Sources/TuistKit/Commands/Migration/MigrationCheckEmptyBuildSettingsCommand.swift b/Sources/TuistKit/Commands/Migration/MigrationCheckEmptyBuildSettingsCommand.swift index 89a4cc0dedd..e520ffbfecb 100644 --- a/Sources/TuistKit/Commands/Migration/MigrationCheckEmptyBuildSettingsCommand.swift +++ b/Sources/TuistKit/Commands/Migration/MigrationCheckEmptyBuildSettingsCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct MigrationCheckEmptyBuildSettingsCommand: ParsableCommand { diff --git a/Sources/TuistKit/Commands/Migration/MigrationSettingsToXCConfigCommand.swift b/Sources/TuistKit/Commands/Migration/MigrationSettingsToXCConfigCommand.swift index 3b67107d822..f8ccb3e1d8f 100644 --- a/Sources/TuistKit/Commands/Migration/MigrationSettingsToXCConfigCommand.swift +++ b/Sources/TuistKit/Commands/Migration/MigrationSettingsToXCConfigCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport struct MigrationSettingsToXCConfigCommand: ParsableCommand { diff --git a/Sources/TuistKit/Commands/Migration/MigrationTargetsByDependenciesCommand.swift b/Sources/TuistKit/Commands/Migration/MigrationTargetsByDependenciesCommand.swift index e0e82c689f9..b2e966857d1 100644 --- a/Sources/TuistKit/Commands/Migration/MigrationTargetsByDependenciesCommand.swift +++ b/Sources/TuistKit/Commands/Migration/MigrationTargetsByDependenciesCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistSupport public struct MigrationTargetsByDependenciesCommand: ParsableCommand { diff --git a/Sources/TuistKit/Commands/MigrationCommand.swift b/Sources/TuistKit/Commands/MigrationCommand.swift index b450e003e72..59adc3fc69f 100644 --- a/Sources/TuistKit/Commands/MigrationCommand.swift +++ b/Sources/TuistKit/Commands/MigrationCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct MigrationCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Plugin/PluginArchiveCommand.swift b/Sources/TuistKit/Commands/Plugin/PluginArchiveCommand.swift index 5e56107ae11..4ea1c49278f 100644 --- a/Sources/TuistKit/Commands/Plugin/PluginArchiveCommand.swift +++ b/Sources/TuistKit/Commands/Plugin/PluginArchiveCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct PluginArchiveCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Plugin/PluginBuildCommand.swift b/Sources/TuistKit/Commands/Plugin/PluginBuildCommand.swift index 1611c0a138e..91096b8a33f 100644 --- a/Sources/TuistKit/Commands/Plugin/PluginBuildCommand.swift +++ b/Sources/TuistKit/Commands/Plugin/PluginBuildCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path public struct PluginBuildCommand: ParsableCommand { public init() {} diff --git a/Sources/TuistKit/Commands/Plugin/PluginCommand.swift b/Sources/TuistKit/Commands/Plugin/PluginCommand.swift index de8d6df3052..0790e590977 100644 --- a/Sources/TuistKit/Commands/Plugin/PluginCommand.swift +++ b/Sources/TuistKit/Commands/Plugin/PluginCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path struct PluginCommand: ParsableCommand { static var configuration: CommandConfiguration { diff --git a/Sources/TuistKit/Commands/Plugin/PluginRunCommand.swift b/Sources/TuistKit/Commands/Plugin/PluginRunCommand.swift index 3bd646e05de..9bb6454036d 100644 --- a/Sources/TuistKit/Commands/Plugin/PluginRunCommand.swift +++ b/Sources/TuistKit/Commands/Plugin/PluginRunCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path public struct PluginRunCommand: ParsableCommand { public init() {} diff --git a/Sources/TuistKit/Commands/Plugin/PluginTestCommand.swift b/Sources/TuistKit/Commands/Plugin/PluginTestCommand.swift index ad447945a26..96420c8024d 100644 --- a/Sources/TuistKit/Commands/Plugin/PluginTestCommand.swift +++ b/Sources/TuistKit/Commands/Plugin/PluginTestCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path public struct PluginTestCommand: ParsableCommand { public init() {} diff --git a/Sources/TuistKit/Commands/RunCommand.swift b/Sources/TuistKit/Commands/RunCommand.swift index 4f4948dfea4..850bbc56eda 100644 --- a/Sources/TuistKit/Commands/RunCommand.swift +++ b/Sources/TuistKit/Commands/RunCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TSCUtility import TuistSupport diff --git a/Sources/TuistKit/Commands/ScaffoldCommand.swift b/Sources/TuistKit/Commands/ScaffoldCommand.swift index 49af18a6230..e2ca8607585 100644 --- a/Sources/TuistKit/Commands/ScaffoldCommand.swift +++ b/Sources/TuistKit/Commands/ScaffoldCommand.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import TuistPlugin diff --git a/Sources/TuistKit/Commands/TestCommand.swift b/Sources/TuistKit/Commands/TestCommand.swift index 19b8d13cd5f..eb568f62a0d 100644 --- a/Sources/TuistKit/Commands/TestCommand.swift +++ b/Sources/TuistKit/Commands/TestCommand.swift @@ -1,7 +1,7 @@ import AnyCodable import ArgumentParser import Foundation -import TSCBasic +import Path import TuistCore import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Commands/TuistCommand.swift b/Sources/TuistKit/Commands/TuistCommand.swift index d989d86eba1..9084616f74b 100644 --- a/Sources/TuistKit/Commands/TuistCommand.swift +++ b/Sources/TuistKit/Commands/TuistCommand.swift @@ -1,6 +1,6 @@ @_exported import ArgumentParser import Foundation -import TSCBasic +import Path import TuistAnalytics import TuistLoader import TuistSupport diff --git a/Sources/TuistKit/Generator/Generator.swift b/Sources/TuistKit/Generator/Generator.swift index a2d5f4e57bd..a1e88378ef2 100644 --- a/Sources/TuistKit/Generator/Generator.swift +++ b/Sources/TuistKit/Generator/Generator.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistDependencies import TuistGenerator diff --git a/Sources/TuistKit/Generator/GeneratorFactory.swift b/Sources/TuistKit/Generator/GeneratorFactory.swift index 04eae2dec35..db3db09a7d5 100644 --- a/Sources/TuistKit/Generator/GeneratorFactory.swift +++ b/Sources/TuistKit/Generator/GeneratorFactory.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistCore import TuistGenerator import TuistLoader diff --git a/Sources/TuistKit/Mappers/Factories/GraphMapperFactory.swift b/Sources/TuistKit/Mappers/Factories/GraphMapperFactory.swift index dcc366c55c8..a2626549f0b 100644 --- a/Sources/TuistKit/Mappers/Factories/GraphMapperFactory.swift +++ b/Sources/TuistKit/Mappers/Factories/GraphMapperFactory.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistDependencies import TuistGenerator diff --git a/Sources/TuistKit/Mappers/Factories/WorkspaceMapperFactory.swift b/Sources/TuistKit/Mappers/Factories/WorkspaceMapperFactory.swift index 0254c32a188..371f14bf1e3 100644 --- a/Sources/TuistKit/Mappers/Factories/WorkspaceMapperFactory.swift +++ b/Sources/TuistKit/Mappers/Factories/WorkspaceMapperFactory.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility import TuistAutomation import TuistCore diff --git a/Sources/TuistKit/Mappers/FocusTargetsGraphMappers.swift b/Sources/TuistKit/Mappers/FocusTargetsGraphMappers.swift index d49982bc24c..90f061bb94c 100644 --- a/Sources/TuistKit/Mappers/FocusTargetsGraphMappers.swift +++ b/Sources/TuistKit/Mappers/FocusTargetsGraphMappers.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import TuistCore import TuistSupport diff --git a/Sources/TuistKit/Mappers/TreeShakePrunedTargetsGraphMapper.swift b/Sources/TuistKit/Mappers/TreeShakePrunedTargetsGraphMapper.swift index bca39277d5e..2b3dd817ceb 100644 --- a/Sources/TuistKit/Mappers/TreeShakePrunedTargetsGraphMapper.swift +++ b/Sources/TuistKit/Mappers/TreeShakePrunedTargetsGraphMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistKit/ProjectEditor/EditablePluginManifest.swift b/Sources/TuistKit/ProjectEditor/EditablePluginManifest.swift index 911316abe85..dd0473733f0 100644 --- a/Sources/TuistKit/ProjectEditor/EditablePluginManifest.swift +++ b/Sources/TuistKit/ProjectEditor/EditablePluginManifest.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// A plugin which is loaded & editable as part of the `tuist edit` command. struct EditablePluginManifest { diff --git a/Sources/TuistKit/ProjectEditor/ProjectEditor.swift b/Sources/TuistKit/ProjectEditor/ProjectEditor.swift index 56c6dd61e9e..dc549fcfec1 100644 --- a/Sources/TuistKit/ProjectEditor/ProjectEditor.swift +++ b/Sources/TuistKit/ProjectEditor/ProjectEditor.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistCore import TuistGenerator import TuistLoader diff --git a/Sources/TuistKit/ProjectEditor/ProjectEditorMapper.swift b/Sources/TuistKit/ProjectEditor/ProjectEditorMapper.swift index b5f795aad96..30462c74f6f 100644 --- a/Sources/TuistKit/ProjectEditor/ProjectEditorMapper.swift +++ b/Sources/TuistKit/ProjectEditor/ProjectEditorMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import TuistSupport diff --git a/Sources/TuistKit/Services/BuildService.swift b/Sources/TuistKit/Services/BuildService.swift index 95a7ffc5afa..39ae782fd51 100644 --- a/Sources/TuistKit/Services/BuildService.swift +++ b/Sources/TuistKit/Services/BuildService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistAutomation import TuistCore import TuistLoader diff --git a/Sources/TuistKit/Services/CleanService.swift b/Sources/TuistKit/Services/CleanService.swift index 45310adc7ab..5b11b58bfff 100644 --- a/Sources/TuistKit/Services/CleanService.swift +++ b/Sources/TuistKit/Services/CleanService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import TuistSupport @@ -55,7 +55,7 @@ enum TuistCleanCategory: CleanCategory, Equatable { func directory( packageDirectory: AbsolutePath?, cacheDirectory: AbsolutePath - ) throws -> TSCBasic.AbsolutePath? { + ) throws -> Path.AbsolutePath? { switch self { case let .global(category): return CacheDirectoriesProvider.tuistCacheDirectory(for: category, cacheDirectory: cacheDirectory) diff --git a/Sources/TuistKit/Services/Cloud/CloudAnalyticsService.swift b/Sources/TuistKit/Services/Cloud/CloudAnalyticsService.swift index f6b9432b999..395b2c69848 100644 --- a/Sources/TuistKit/Services/Cloud/CloudAnalyticsService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudAnalyticsService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudAuthService.swift b/Sources/TuistKit/Services/Cloud/CloudAuthService.swift index f698a90814d..04843bebf24 100644 --- a/Sources/TuistKit/Services/Cloud/CloudAuthService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudAuthService.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistCore import TuistLoader import TuistServer diff --git a/Sources/TuistKit/Services/Cloud/CloudCleanService.swift b/Sources/TuistKit/Services/Cloud/CloudCleanService.swift index 72df4e2a584..122efee76d3 100644 --- a/Sources/TuistKit/Services/Cloud/CloudCleanService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudCleanService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudInitService.swift b/Sources/TuistKit/Services/Cloud/CloudInitService.swift index db36500bdf3..9937a4f6d77 100644 --- a/Sources/TuistKit/Services/Cloud/CloudInitService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudInitService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudLogoutService.swift b/Sources/TuistKit/Services/Cloud/CloudLogoutService.swift index ee7c30c4620..ac3382ff76a 100644 --- a/Sources/TuistKit/Services/Cloud/CloudLogoutService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudLogoutService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import TuistServer diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationBillingService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationBillingService.swift index 6a34395ad8b..01fcefd4f13 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationBillingService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationBillingService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationCreateService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationCreateService.swift index 7d6568c00f2..9a64a950c99 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationCreateService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationCreateService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationDeleteService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationDeleteService.swift index 33de52f0a4f..dc73b9fdaa2 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationDeleteService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationDeleteService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationInviteService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationInviteService.swift index 1f05293029f..03d8a332bfb 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationInviteService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationInviteService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationListService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationListService.swift index 8925ae8d2bc..8dba691b90c 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationListService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationListService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveInviteService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveInviteService.swift index 0ea6af1a439..049e7de2003 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveInviteService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveInviteService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveMemberService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveMemberService.swift index 48008f45d76..da21a40b48d 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveMemberService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveMemberService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveSSOService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveSSOService.swift index b94cfbbb849..62086f47deb 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveSSOService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationRemoveSSOService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationShowService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationShowService.swift index 7a321979476..de630514f4b 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationShowService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationShowService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationUpdateMemberService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationUpdateMemberService.swift index fc8aefc6290..9ae3c7f1f8f 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationUpdateMemberService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationUpdateMemberService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudOrganizationUpdateService.swift b/Sources/TuistKit/Services/Cloud/CloudOrganizationUpdateService.swift index 793064c5721..bd89ba78282 100644 --- a/Sources/TuistKit/Services/Cloud/CloudOrganizationUpdateService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudOrganizationUpdateService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudProjectCreateService.swift b/Sources/TuistKit/Services/Cloud/CloudProjectCreateService.swift index 171ebf6df9f..f2f9998b6f6 100644 --- a/Sources/TuistKit/Services/Cloud/CloudProjectCreateService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudProjectCreateService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudProjectDeleteService.swift b/Sources/TuistKit/Services/Cloud/CloudProjectDeleteService.swift index 5024e28be12..af895bc37d5 100644 --- a/Sources/TuistKit/Services/Cloud/CloudProjectDeleteService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudProjectDeleteService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudProjectListService.swift b/Sources/TuistKit/Services/Cloud/CloudProjectListService.swift index 1a1332afa94..182f2eaa1dd 100644 --- a/Sources/TuistKit/Services/Cloud/CloudProjectListService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudProjectListService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudProjectTokenService.swift b/Sources/TuistKit/Services/Cloud/CloudProjectTokenService.swift index 92f46c4a903..2f4ae3224db 100644 --- a/Sources/TuistKit/Services/Cloud/CloudProjectTokenService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudProjectTokenService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Sources/TuistKit/Services/Cloud/CloudSessionService.swift b/Sources/TuistKit/Services/Cloud/CloudSessionService.swift index f42e980715a..536e236cf2d 100644 --- a/Sources/TuistKit/Services/Cloud/CloudSessionService.swift +++ b/Sources/TuistKit/Services/Cloud/CloudSessionService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import TuistServer diff --git a/Sources/TuistKit/Services/DumpService.swift b/Sources/TuistKit/Services/DumpService.swift index db49c264cc2..3c070c4bc90 100644 --- a/Sources/TuistKit/Services/DumpService.swift +++ b/Sources/TuistKit/Services/DumpService.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import TuistCore import TuistLoader @@ -13,7 +14,7 @@ final class DumpService { } func run(path: String?, manifest: DumpableManifest) async throws { - let projectPath: AbsolutePath + let projectPath: Path.AbsolutePath if let path { projectPath = try AbsolutePath(validating: path, relativeTo: AbsolutePath.current) } else { diff --git a/Sources/TuistKit/Services/EditService.swift b/Sources/TuistKit/Services/EditService.swift index d3a90a1b2af..4cd03ebe2a0 100644 --- a/Sources/TuistKit/Services/EditService.swift +++ b/Sources/TuistKit/Services/EditService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistGenerator import TuistLoader diff --git a/Sources/TuistKit/Services/GenerateService.swift b/Sources/TuistKit/Services/GenerateService.swift index cd74790d72a..33b4689c268 100644 --- a/Sources/TuistKit/Services/GenerateService.swift +++ b/Sources/TuistKit/Services/GenerateService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistGenerator import TuistLoader diff --git a/Sources/TuistKit/Services/GraphService.swift b/Sources/TuistKit/Services/GraphService.swift index 62750241d50..a9c69ad8cc2 100644 --- a/Sources/TuistKit/Services/GraphService.swift +++ b/Sources/TuistKit/Services/GraphService.swift @@ -1,9 +1,9 @@ import DOT import Foundation import GraphViz +import Path import ProjectAutomation import Tools -import TSCBasic import TuistCore import TuistGenerator import TuistLoader diff --git a/Sources/TuistKit/Services/InitService.swift b/Sources/TuistKit/Services/InitService.swift index 21e50244410..3f1d84f959a 100644 --- a/Sources/TuistKit/Services/InitService.swift +++ b/Sources/TuistKit/Services/InitService.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistLoader import TuistScaffold diff --git a/Sources/TuistKit/Services/InstallService.swift b/Sources/TuistKit/Services/InstallService.swift index b02c0143c59..0c09424cf14 100644 --- a/Sources/TuistKit/Services/InstallService.swift +++ b/Sources/TuistKit/Services/InstallService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistDependencies import TuistLoader diff --git a/Sources/TuistKit/Services/ListService.swift b/Sources/TuistKit/Services/ListService.swift index f8ac510e132..89d80fe02e3 100644 --- a/Sources/TuistKit/Services/ListService.swift +++ b/Sources/TuistKit/Services/ListService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import TuistPlugin import TuistScaffold diff --git a/Sources/TuistKit/Services/Migration/MigrationCheckEmptyBuildSettingsService.swift b/Sources/TuistKit/Services/Migration/MigrationCheckEmptyBuildSettingsService.swift index f996a701934..08cd799cae7 100644 --- a/Sources/TuistKit/Services/Migration/MigrationCheckEmptyBuildSettingsService.swift +++ b/Sources/TuistKit/Services/Migration/MigrationCheckEmptyBuildSettingsService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistMigration import TuistSupport diff --git a/Sources/TuistKit/Services/Migration/MigrationSettingsToXCConfigService.swift b/Sources/TuistKit/Services/Migration/MigrationSettingsToXCConfigService.swift index 93b2dfbe06c..db90fd3418b 100644 --- a/Sources/TuistKit/Services/Migration/MigrationSettingsToXCConfigService.swift +++ b/Sources/TuistKit/Services/Migration/MigrationSettingsToXCConfigService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistMigration import TuistSupport diff --git a/Sources/TuistKit/Services/Migration/MigrationTargetsByDependenciesService.swift b/Sources/TuistKit/Services/Migration/MigrationTargetsByDependenciesService.swift index b7b10d5cb25..70fe5aad208 100644 --- a/Sources/TuistKit/Services/Migration/MigrationTargetsByDependenciesService.swift +++ b/Sources/TuistKit/Services/Migration/MigrationTargetsByDependenciesService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistMigration import TuistSupport diff --git a/Sources/TuistKit/Services/Plugin/PluginArchiveService.swift b/Sources/TuistKit/Services/Plugin/PluginArchiveService.swift index a81027649f9..8b2506e0e48 100644 --- a/Sources/TuistKit/Services/Plugin/PluginArchiveService.swift +++ b/Sources/TuistKit/Services/Plugin/PluginArchiveService.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistDependencies import TuistLoader import TuistSupport diff --git a/Sources/TuistKit/Services/Plugin/PluginBuildService.swift b/Sources/TuistKit/Services/Plugin/PluginBuildService.swift index 29e0f208a79..b3d512a38c8 100644 --- a/Sources/TuistKit/Services/Plugin/PluginBuildService.swift +++ b/Sources/TuistKit/Services/Plugin/PluginBuildService.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport final class PluginBuildService { diff --git a/Sources/TuistKit/Services/Plugin/PluginRunService.swift b/Sources/TuistKit/Services/Plugin/PluginRunService.swift index 4a8ae101a3b..2d3ef938905 100644 --- a/Sources/TuistKit/Services/Plugin/PluginRunService.swift +++ b/Sources/TuistKit/Services/Plugin/PluginRunService.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport final class PluginRunService { diff --git a/Sources/TuistKit/Services/Plugin/PluginTestService.swift b/Sources/TuistKit/Services/Plugin/PluginTestService.swift index b761322eefc..dad1c14d4f6 100644 --- a/Sources/TuistKit/Services/Plugin/PluginTestService.swift +++ b/Sources/TuistKit/Services/Plugin/PluginTestService.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport final class PluginTestService { diff --git a/Sources/TuistKit/Services/ProjectAutomation+ManifestMapper.swift b/Sources/TuistKit/Services/ProjectAutomation+ManifestMapper.swift index 18b42507341..6c547b40ab1 100644 --- a/Sources/TuistKit/Services/ProjectAutomation+ManifestMapper.swift +++ b/Sources/TuistKit/Services/ProjectAutomation+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectAutomation -import TSCBasic import TuistSupport import XcodeGraph diff --git a/Sources/TuistKit/Services/RunService.swift b/Sources/TuistKit/Services/RunService.swift index 071ce6f0bd8..5e72345ffbd 100644 --- a/Sources/TuistKit/Services/RunService.swift +++ b/Sources/TuistKit/Services/RunService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import struct TSCUtility.Version import TuistAutomation import TuistCore diff --git a/Sources/TuistKit/Services/ScaffoldService.swift b/Sources/TuistKit/Services/ScaffoldService.swift index cf6dc9a5113..1ecca3cf859 100644 --- a/Sources/TuistKit/Services/ScaffoldService.swift +++ b/Sources/TuistKit/Services/ScaffoldService.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistLoader import TuistPlugin diff --git a/Sources/TuistKit/Services/TestService.swift b/Sources/TuistKit/Services/TestService.swift index 809dd996d73..78274717b40 100644 --- a/Sources/TuistKit/Services/TestService.swift +++ b/Sources/TuistKit/Services/TestService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import struct TSCUtility.Version import TuistAutomation import TuistCore diff --git a/Sources/TuistKit/Services/TuistService.swift b/Sources/TuistKit/Services/TuistService.swift index 1219d5abfeb..424cd9384ce 100644 --- a/Sources/TuistKit/Services/TuistService.swift +++ b/Sources/TuistKit/Services/TuistService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import TuistPlugin diff --git a/Sources/TuistKit/Utils/ManifestGraphLoader.swift b/Sources/TuistKit/Utils/ManifestGraphLoader.swift index 0acb759348c..e66120ee321 100644 --- a/Sources/TuistKit/Utils/ManifestGraphLoader.swift +++ b/Sources/TuistKit/Utils/ManifestGraphLoader.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistDependencies import TuistLoader diff --git a/Sources/TuistKit/Utils/TuistAnalyticsCloudBackend.swift b/Sources/TuistKit/Utils/TuistAnalyticsCloudBackend.swift index 12dae9f6377..47147181583 100644 --- a/Sources/TuistKit/Utils/TuistAnalyticsCloudBackend.swift +++ b/Sources/TuistKit/Utils/TuistAnalyticsCloudBackend.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistAnalytics import TuistAsyncQueue import TuistCore diff --git a/Sources/TuistLoader/Loaders/CachedManifestLoader.swift b/Sources/TuistLoader/Loaders/CachedManifestLoader.swift index 5bc4cd1bea1..02aeefa1403 100644 --- a/Sources/TuistLoader/Loaders/CachedManifestLoader.swift +++ b/Sources/TuistLoader/Loaders/CachedManifestLoader.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import struct XcodeGraph.Config diff --git a/Sources/TuistLoader/Loaders/ConfigLoader.swift b/Sources/TuistLoader/Loaders/ConfigLoader.swift index d3a04457133..9e5e67a5ef8 100644 --- a/Sources/TuistLoader/Loaders/ConfigLoader.swift +++ b/Sources/TuistLoader/Loaders/ConfigLoader.swift @@ -1,7 +1,7 @@ import Foundation import Mockable +import Path import struct ProjectDescription.Config -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Loaders/ManifestLoader.swift b/Sources/TuistLoader/Loaders/ManifestLoader.swift index ea3b3ac230b..15a3a6e806f 100644 --- a/Sources/TuistLoader/Loaders/ManifestLoader.swift +++ b/Sources/TuistLoader/Loaders/ManifestLoader.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Loaders/ManifestModelConverter.swift b/Sources/TuistLoader/Loaders/ManifestModelConverter.swift index 45ea5b81573..b2f9de4860e 100644 --- a/Sources/TuistLoader/Loaders/ManifestModelConverter.swift +++ b/Sources/TuistLoader/Loaders/ManifestModelConverter.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Loaders/PackageSettingsLoader.swift b/Sources/TuistLoader/Loaders/PackageSettingsLoader.swift index b10df7e5ad4..4b86ecf84f5 100644 --- a/Sources/TuistLoader/Loaders/PackageSettingsLoader.swift +++ b/Sources/TuistLoader/Loaders/PackageSettingsLoader.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Loaders/RecursiveManifestLoader.swift b/Sources/TuistLoader/Loaders/RecursiveManifestLoader.swift index 4e54105d9a9..c982084db5e 100644 --- a/Sources/TuistLoader/Loaders/RecursiveManifestLoader.swift +++ b/Sources/TuistLoader/Loaders/RecursiveManifestLoader.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistSupport import XcodeGraph @@ -49,7 +49,7 @@ public class RecursiveManifestLoader: RecursiveManifestLoading { self.packageInfoMapper = packageInfoMapper } - public func loadWorkspace(at path: TSCBasic.AbsolutePath) throws -> LoadedWorkspace { + public func loadWorkspace(at path: AbsolutePath) throws -> LoadedWorkspace { let loadedWorkspace: ProjectDescription.Workspace? do { loadedWorkspace = try manifestLoader.loadWorkspace(at: path) diff --git a/Sources/TuistLoader/Loaders/SwiftPackageManagerGraphLoader.swift b/Sources/TuistLoader/Loaders/SwiftPackageManagerGraphLoader.swift index 6bb671a9cdc..717d134b07c 100644 --- a/Sources/TuistLoader/Loaders/SwiftPackageManagerGraphLoader.swift +++ b/Sources/TuistLoader/Loaders/SwiftPackageManagerGraphLoader.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Loaders/TemplateLoader.swift b/Sources/TuistLoader/Loaders/TemplateLoader.swift index 513a79b47e3..40730fbc66d 100644 --- a/Sources/TuistLoader/Loaders/TemplateLoader.swift +++ b/Sources/TuistLoader/Loaders/TemplateLoader.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Loaders/UmbrellaHeaderHeadersExtractor.swift b/Sources/TuistLoader/Loaders/UmbrellaHeaderHeadersExtractor.swift index 69510dd46c6..19cfc08e888 100644 --- a/Sources/TuistLoader/Loaders/UmbrellaHeaderHeadersExtractor.swift +++ b/Sources/TuistLoader/Loaders/UmbrellaHeaderHeadersExtractor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport public enum UmbrellaHeaderHeadersExtractor { diff --git a/Sources/TuistLoader/Models+ManifestMappers/AnalyzeAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/AnalyzeAction+ManifestMapper.swift index 44921e963f6..e19cbeff570 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/AnalyzeAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/AnalyzeAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/ArchiveAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/ArchiveAction+ManifestMapper.swift index 2b5f349053e..4ac3cb2722e 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/ArchiveAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/ArchiveAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/BuildAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/BuildAction+ManifestMapper.swift index 5259cd87703..0d64ae043ba 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/BuildAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/BuildAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Cache+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Cache+ManifestMapper.swift index 4fc9db4f41a..c32dfbb8acf 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Cache+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Cache+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import struct TSCUtility.Version import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Cloud+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Cloud+ManifestMapper.swift index f7f4dbd90e5..e4bd5b9d68f 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Cloud+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Cloud+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/CompatibleXcodeVersions+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/CompatibleXcodeVersions+ManifestMapper.swift index dc31358aadd..4ae5485595c 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/CompatibleXcodeVersions+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/CompatibleXcodeVersions+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Config+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Config+ManifestMapper.swift index 6474038ce5a..f50381dd73a 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Config+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Config+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Models+ManifestMappers/Configuration+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Configuration+ManifestMapper.swift index dba6676649b..be7bfb7c260 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Configuration+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Configuration+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/CopyFileElement+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/CopyFileElement+ManifestMapper.swift index a1b73a6df50..444516a5d8c 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/CopyFileElement+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/CopyFileElement+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/CopyFilesAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/CopyFilesAction+ManifestMapper.swift index 4657e25dde2..687a52979ab 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/CopyFilesAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/CopyFilesAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/CoreDataModel+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/CoreDataModel+ManifestMapper.swift index 18f64b44c65..23b5ea4ad8b 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/CoreDataModel+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/CoreDataModel+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/DefaultSettings+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/DefaultSettings+ManifestMapper.swift index 3ee6084f426..b1d0250d1da 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/DefaultSettings+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/DefaultSettings+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Entitlements+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Entitlements+ManifestMapper.swift index 13bcd6d9a5f..8dca99e1caa 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Entitlements+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Entitlements+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/ExecutionAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/ExecutionAction+ManifestMapper.swift index f37ded268cc..d40c388973d 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/ExecutionAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/ExecutionAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import XcodeGraph extension XcodeGraph.ExecutionAction { diff --git a/Sources/TuistLoader/Models+ManifestMappers/FileCodeGen+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/FileCodeGen+ManifestMapper.swift index 77c3cec438f..b87dfd1b448 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/FileCodeGen+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/FileCodeGen+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/FileElement+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/FileElement+ManifestMapper.swift index 542fb5e2914..8555b0b05dc 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/FileElement+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/FileElement+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Headers+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Headers+ManifestMapper.swift index 59c9a5e51d5..843011f5ec4 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Headers+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Headers+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/IDETemplateMacros+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/IDETemplateMacros+ManifestMapper.swift index 8462acfa5ea..f314a26d6a9 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/IDETemplateMacros+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/IDETemplateMacros+ManifestMapper.swift @@ -10,7 +10,7 @@ extension IDETemplateMacros { switch manifest { case let .file(path): let templatePath = try generatorPaths.resolve(path: path) - let templateContent = try String(contentsOf: templatePath.asURL) + let templateContent = try String(contentsOf: URL(fileURLWithPath: templatePath.pathString)) return IDETemplateMacros(fileHeader: templateContent) case let .string(templateContent): return IDETemplateMacros(fileHeader: templateContent) diff --git a/Sources/TuistLoader/Models+ManifestMappers/InfoPlist+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/InfoPlist+ManifestMapper.swift index 846314ee28d..e029d557b27 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/InfoPlist+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/InfoPlist+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Package+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Package+ManifestMapper.swift index 3c8632d5f28..b11b0732000 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Package+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Package+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/PackageSettings+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/PackageSettings+ManifestMapper.swift index e9306a9bf05..ba4aeec0701 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/PackageSettings+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/PackageSettings+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Models+ManifestMappers/Plist+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Plist+ManifestMapper.swift index 2af554b8f8b..00ee7fb28c9 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Plist+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Plist+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/ProfileAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/ProfileAction+ManifestMapper.swift index e077e933d74..c7a056580cd 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/ProfileAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/ProfileAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import XcodeGraph extension XcodeGraph.ProfileAction { diff --git a/Sources/TuistLoader/Models+ManifestMappers/Project+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Project+ManifestMapper.swift index 66aec60679b..9400bbc4907 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Project+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Project+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import XcodeGraph extension XcodeGraph.Project { diff --git a/Sources/TuistLoader/Models+ManifestMappers/ResourceFileElement+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/ResourceFileElement+ManifestMapper.swift index 4f5a68e6032..20f3bc83e52 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/ResourceFileElement+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/ResourceFileElement+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/ResourceSynthesizer+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/ResourceSynthesizer+ManifestMapper.swift index a514b50c1b2..f362cde38c1 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/ResourceSynthesizer+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/ResourceSynthesizer+ManifestMapper.swift @@ -1,5 +1,5 @@ +import Path import ProjectDescription -import TSCBasic import XcodeGraph extension XcodeGraph.ResourceSynthesizer { diff --git a/Sources/TuistLoader/Models+ManifestMappers/RunAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/RunAction+ManifestMapper.swift index 0487421ce7d..b8de5f91815 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/RunAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/RunAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/RunActionOptions+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/RunActionOptions+ManifestMapper.swift index dc27f303391..abb8f58245a 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/RunActionOptions+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/RunActionOptions+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import XcodeGraph extension XcodeGraph.RunActionOptions { diff --git a/Sources/TuistLoader/Models+ManifestMappers/Scheme+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Scheme+ManifestMapper.swift index 5fe28ddebb2..098581e1b4d 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Scheme+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Scheme+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/SchemeDiagnosticsOption+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/SchemeDiagnosticsOption+ManifestMapper.swift index 3b31d646ee7..5350a83ca62 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/SchemeDiagnosticsOption+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/SchemeDiagnosticsOption+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/SettingValue+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/SettingValue+ManifestMapper.swift index fdeb20b08e2..673da04b904 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/SettingValue+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/SettingValue+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Settings+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Settings+ManifestMapper.swift index ee45210c743..31f522f64f9 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Settings+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Settings+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Target+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Target+ManifestMapper.swift index b655985a1c7..b6cc610ac8f 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Target+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Target+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/TargetAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/TargetAction+ManifestMapper.swift index b32538d69ba..834ce127b44 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/TargetAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/TargetAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/TargetDependency+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/TargetDependency+ManifestMapper.swift index 7c00b35b9fd..0390e28b231 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/TargetDependency+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/TargetDependency+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/TestAction+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/TestAction+ManifestMapper.swift index 7db63cd87f1..51611623559 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/TestAction+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/TestAction+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/TestPlan+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/TestPlan+ManifestMapper.swift index c5007a7d3a1..c6a0ea31e9d 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/TestPlan+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/TestPlan+ManifestMapper.swift @@ -1,11 +1,11 @@ import Foundation -import TSCBasic +import Path import XcodeGraph extension TestPlan { init(path: AbsolutePath, isDefault: Bool, generatorPaths: GeneratorPaths) throws { let jsonDecoder = JSONDecoder() - let testPlanData = try Data(contentsOf: path.asURL) + let testPlanData = try Data(contentsOf: URL(fileURLWithPath: path.pathString)) let xcTestPlan = try jsonDecoder.decode(XCTestPlan.self, from: testPlanData) try self.init( diff --git a/Sources/TuistLoader/Models+ManifestMappers/TestableTarget+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/TestableTarget+ManifestMapper.swift index b0c1bdfa663..c583f1365c0 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/TestableTarget+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/TestableTarget+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph diff --git a/Sources/TuistLoader/Models+ManifestMappers/Workspace+ManifestMapper.swift b/Sources/TuistLoader/Models+ManifestMappers/Workspace+ManifestMapper.swift index d8c489da74d..6b97ac59649 100644 --- a/Sources/TuistLoader/Models+ManifestMappers/Workspace+ManifestMapper.swift +++ b/Sources/TuistLoader/Models+ManifestMappers/Workspace+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models/FileListGlob+Unfold.swift b/Sources/TuistLoader/Models/FileListGlob+Unfold.swift index 53cb144d424..9ce57d8cc86 100644 --- a/Sources/TuistLoader/Models/FileListGlob+Unfold.swift +++ b/Sources/TuistLoader/Models/FileListGlob+Unfold.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Models/GeneratorPaths.swift b/Sources/TuistLoader/Models/GeneratorPaths.swift index 32eaca0b906..8608d79a1b8 100644 --- a/Sources/TuistLoader/Models/GeneratorPaths.swift +++ b/Sources/TuistLoader/Models/GeneratorPaths.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Models/Manifest.swift b/Sources/TuistLoader/Models/Manifest.swift index c2f2e057feb..4c12a57ec0f 100644 --- a/Sources/TuistLoader/Models/Manifest.swift +++ b/Sources/TuistLoader/Models/Manifest.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum Manifest: CaseIterable { case project diff --git a/Sources/TuistLoader/Models/PluginStencil.swift b/Sources/TuistLoader/Models/PluginStencil.swift index d2ebef81114..0c42cede60b 100644 --- a/Sources/TuistLoader/Models/PluginStencil.swift +++ b/Sources/TuistLoader/Models/PluginStencil.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Stencil plugin model public struct PluginStencil: Equatable { diff --git a/Sources/TuistLoader/Models/ProjectDescriptionHelpersModule.swift b/Sources/TuistLoader/Models/ProjectDescriptionHelpersModule.swift index d0b986417ce..43f859ed6f2 100644 --- a/Sources/TuistLoader/Models/ProjectDescriptionHelpersModule.swift +++ b/Sources/TuistLoader/Models/ProjectDescriptionHelpersModule.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Defines a module for a project description helper. /// Project description helpers are modules which can be imported wherever "ProjectDescription" can be imported. diff --git a/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilder.swift b/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilder.swift index 2b7b238ba1b..15e7d540654 100644 --- a/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilder.swift +++ b/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilder.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph @@ -116,7 +116,7 @@ public final class ProjectDescriptionHelpersBuilder: ProjectDescriptionHelpersBu ) throws -> ProjectDescriptionHelpersModule? { guard let tuistHelpersDirectory = helpersDirectoryLocator.locate(at: path) else { return nil } #if DEBUG - if let sourceRoot = ProcessEnv.vars["TUIST_CONFIG_SRCROOT"], + if let sourceRoot = ProcessInfo.processInfo.environment["TUIST_CONFIG_SRCROOT"], tuistHelpersDirectory.isDescendant( // swiftlint:disable:next force_try of: try! AbsolutePath(validating: sourceRoot).appending(component: Constants.tuistDirectoryName) diff --git a/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilderFactory.swift b/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilderFactory.swift index 8c16d5d2585..e748f0c0ea3 100644 --- a/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilderFactory.swift +++ b/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilderFactory.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersHasher.swift b/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersHasher.swift index 4d86228ee67..17d2f2cd153 100644 --- a/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersHasher.swift +++ b/Sources/TuistLoader/ProjectDescriptionHelpers/ProjectDescriptionHelpersHasher.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport public protocol ProjectDescriptionHelpersHashing: AnyObject { diff --git a/Sources/TuistLoader/Protocols/GraphInitiatable.swift b/Sources/TuistLoader/Protocols/GraphInitiatable.swift index 786748d6938..6d6e9bcba1e 100644 --- a/Sources/TuistLoader/Protocols/GraphInitiatable.swift +++ b/Sources/TuistLoader/Protocols/GraphInitiatable.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import TuistSupport @@ -15,5 +16,5 @@ protocol GraphInitiatable { /// - projectPath: Absolute path to the folder that contains the manifest. /// This is useful to obtain absolute paths from the relative paths provided in the manifest by the user. /// - Throws: A decoding error if an expected property is missing or has an invalid value. - init(dictionary: JSON, projectPath: AbsolutePath) throws + init(dictionary: JSON, projectPath: Path.AbsolutePath) throws } diff --git a/Sources/TuistLoader/SwiftPackageManager/PackageInfoMapper.swift b/Sources/TuistLoader/SwiftPackageManager/PackageInfoMapper.swift index 5446d8c1c92..0efe79e743d 100644 --- a/Sources/TuistLoader/SwiftPackageManager/PackageInfoMapper.swift +++ b/Sources/TuistLoader/SwiftPackageManager/PackageInfoMapper.swift @@ -1,7 +1,7 @@ import Foundation import Mockable +import Path import ProjectDescription -import TSCBasic import TSCUtility import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/SwiftPackageManager/SettingsMapper.swift b/Sources/TuistLoader/SwiftPackageManager/SettingsMapper.swift index 6889e39af43..fcb9a285764 100644 --- a/Sources/TuistLoader/SwiftPackageManager/SettingsMapper.swift +++ b/Sources/TuistLoader/SwiftPackageManager/SettingsMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/SwiftPackageManager/SwiftPackageManagerModuleMapGenerator.swift b/Sources/TuistLoader/SwiftPackageManager/SwiftPackageManagerModuleMapGenerator.swift index 20b14deffd7..f290f398391 100644 --- a/Sources/TuistLoader/SwiftPackageManager/SwiftPackageManagerModuleMapGenerator.swift +++ b/Sources/TuistLoader/SwiftPackageManager/SwiftPackageManagerModuleMapGenerator.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Utils/HelpersDirectoryLocator.swift b/Sources/TuistLoader/Utils/HelpersDirectoryLocator.swift index 6f88d26c7eb..2bd650c5d90 100644 --- a/Sources/TuistLoader/Utils/HelpersDirectoryLocator.swift +++ b/Sources/TuistLoader/Utils/HelpersDirectoryLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Utils/ManifestFilesLocator.swift b/Sources/TuistLoader/Utils/ManifestFilesLocator.swift index 275030d3661..0bbb62375ef 100644 --- a/Sources/TuistLoader/Utils/ManifestFilesLocator.swift +++ b/Sources/TuistLoader/Utils/ManifestFilesLocator.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistCore import TuistSupport diff --git a/Sources/TuistLoader/Utils/ProjectDescriptionPaths.swift b/Sources/TuistLoader/Utils/ProjectDescriptionPaths.swift index 78ed322a8fc..6cd2333fc22 100644 --- a/Sources/TuistLoader/Utils/ProjectDescriptionPaths.swift +++ b/Sources/TuistLoader/Utils/ProjectDescriptionPaths.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Project Description Paths /// diff --git a/Sources/TuistLoader/Utils/ResourceLocator.swift b/Sources/TuistLoader/Utils/ResourceLocator.swift index 3e02cc41f94..1c9bd20d84e 100644 --- a/Sources/TuistLoader/Utils/ResourceLocator.swift +++ b/Sources/TuistLoader/Utils/ResourceLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport public protocol ResourceLocating: AnyObject { @@ -58,7 +58,8 @@ public final class ResourceLocator: ResourceLocating { */ bundlePath.parentDirectory.appending(component: "lib"), ] - if let frameworkSearchPaths = ProcessEnv.vars["TUIST_FRAMEWORK_SEARCH_PATHS"]?.components(separatedBy: " ") + if let frameworkSearchPaths = ProcessInfo.processInfo.environment["TUIST_FRAMEWORK_SEARCH_PATHS"]? + .components(separatedBy: " ") .filter({ !$0.isEmpty }) { paths.append( diff --git a/Sources/TuistLoader/Utils/ResourceSynthesizerPathLocator.swift b/Sources/TuistLoader/Utils/ResourceSynthesizerPathLocator.swift index d7de9bf546c..1cefed97065 100644 --- a/Sources/TuistLoader/Utils/ResourceSynthesizerPathLocator.swift +++ b/Sources/TuistLoader/Utils/ResourceSynthesizerPathLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoader/Utils/StencilPathLocator.swift b/Sources/TuistLoader/Utils/StencilPathLocator.swift index 67795f92e36..6657875ffbf 100644 --- a/Sources/TuistLoader/Utils/StencilPathLocator.swift +++ b/Sources/TuistLoader/Utils/StencilPathLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoaderTesting/Loaders/Mocks/MockManifestLoader.swift b/Sources/TuistLoaderTesting/Loaders/Mocks/MockManifestLoader.swift index 49045beed90..3ccfde98967 100644 --- a/Sources/TuistLoaderTesting/Loaders/Mocks/MockManifestLoader.swift +++ b/Sources/TuistLoaderTesting/Loaders/Mocks/MockManifestLoader.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistSupport import struct XcodeGraph.Plugins @testable import TuistLoader diff --git a/Sources/TuistLoaderTesting/Loaders/Mocks/MockPackageSettingsLoader.swift b/Sources/TuistLoaderTesting/Loaders/Mocks/MockPackageSettingsLoader.swift index 7891e6a64cb..b23a4dd543c 100644 --- a/Sources/TuistLoaderTesting/Loaders/Mocks/MockPackageSettingsLoader.swift +++ b/Sources/TuistLoaderTesting/Loaders/Mocks/MockPackageSettingsLoader.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import XcodeGraph import XcodeGraphTesting diff --git a/Sources/TuistLoaderTesting/Loaders/Mocks/MockTemplateGitLoader.swift b/Sources/TuistLoaderTesting/Loaders/Mocks/MockTemplateGitLoader.swift index a87dc4f5519..a162400c28b 100644 --- a/Sources/TuistLoaderTesting/Loaders/Mocks/MockTemplateGitLoader.swift +++ b/Sources/TuistLoaderTesting/Loaders/Mocks/MockTemplateGitLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import XcodeGraph diff --git a/Sources/TuistLoaderTesting/Loaders/Mocks/MockTemplateLoader.swift b/Sources/TuistLoaderTesting/Loaders/Mocks/MockTemplateLoader.swift index 2d70c927361..74116dbb7f7 100644 --- a/Sources/TuistLoaderTesting/Loaders/Mocks/MockTemplateLoader.swift +++ b/Sources/TuistLoaderTesting/Loaders/Mocks/MockTemplateLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistLoader import XcodeGraph diff --git a/Sources/TuistLoaderTesting/ProjectDescriptionHelpers/MockProjectDescriptionHelpersBuilder.swift b/Sources/TuistLoaderTesting/ProjectDescriptionHelpers/MockProjectDescriptionHelpersBuilder.swift index b51a1764c07..c517bb82e93 100644 --- a/Sources/TuistLoaderTesting/ProjectDescriptionHelpers/MockProjectDescriptionHelpersBuilder.swift +++ b/Sources/TuistLoaderTesting/ProjectDescriptionHelpers/MockProjectDescriptionHelpersBuilder.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoaderTesting/ProjectDescriptionHelpers/MockProjectDescriptionHelpersBuilderFactory.swift b/Sources/TuistLoaderTesting/ProjectDescriptionHelpers/MockProjectDescriptionHelpersBuilderFactory.swift index 0b119262102..a252b27946b 100644 --- a/Sources/TuistLoaderTesting/ProjectDescriptionHelpers/MockProjectDescriptionHelpersBuilderFactory.swift +++ b/Sources/TuistLoaderTesting/ProjectDescriptionHelpers/MockProjectDescriptionHelpersBuilderFactory.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/TuistLoaderTesting/Utils/Mocks/MockHelpersDirectoryLocator.swift b/Sources/TuistLoaderTesting/Utils/Mocks/MockHelpersDirectoryLocator.swift index 0343a32d255..24173d4c4d2 100644 --- a/Sources/TuistLoaderTesting/Utils/Mocks/MockHelpersDirectoryLocator.swift +++ b/Sources/TuistLoaderTesting/Utils/Mocks/MockHelpersDirectoryLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistLoader public final class MockHelpersDirectoryLocator: HelpersDirectoryLocating { diff --git a/Sources/TuistLoaderTesting/Utils/Mocks/MockResourceLocator.swift b/Sources/TuistLoaderTesting/Utils/Mocks/MockResourceLocator.swift index 8bc29ae1a55..8ac14413d6d 100644 --- a/Sources/TuistLoaderTesting/Utils/Mocks/MockResourceLocator.swift +++ b/Sources/TuistLoaderTesting/Utils/Mocks/MockResourceLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistLoader public final class MockResourceLocator: ResourceLocating { diff --git a/Sources/TuistLoaderTesting/Utils/Mocks/MockResourceSynthesizerPathLocator.swift b/Sources/TuistLoaderTesting/Utils/Mocks/MockResourceSynthesizerPathLocator.swift index 02514a73510..ef43e9b7bf4 100644 --- a/Sources/TuistLoaderTesting/Utils/Mocks/MockResourceSynthesizerPathLocator.swift +++ b/Sources/TuistLoaderTesting/Utils/Mocks/MockResourceSynthesizerPathLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistLoader @@ -24,7 +24,7 @@ public final class MockResourceSynthesizerPathLocator: ResourceSynthesizerPathLo } public var locateStub: ((AbsolutePath) -> AbsolutePath?)? - public func locate(at: TSCBasic.AbsolutePath) -> TSCBasic.AbsolutePath? { + public func locate(at: Path.AbsolutePath) -> Path.AbsolutePath? { locateStub?(at) } } diff --git a/Sources/TuistMigration/Utilities/EmptyBuildSettingsChecker.swift b/Sources/TuistMigration/Utilities/EmptyBuildSettingsChecker.swift index 24842450ccb..404a717898c 100644 --- a/Sources/TuistMigration/Utilities/EmptyBuildSettingsChecker.swift +++ b/Sources/TuistMigration/Utilities/EmptyBuildSettingsChecker.swift @@ -1,6 +1,6 @@ import Foundation +import Path import PathKit -import TSCBasic import TuistSupport import XcodeProj diff --git a/Sources/TuistMigration/Utilities/SettingsToXCConfigExtractor.swift b/Sources/TuistMigration/Utilities/SettingsToXCConfigExtractor.swift index d22b6b5aeb1..f009afc12d5 100644 --- a/Sources/TuistMigration/Utilities/SettingsToXCConfigExtractor.swift +++ b/Sources/TuistMigration/Utilities/SettingsToXCConfigExtractor.swift @@ -1,6 +1,6 @@ import Foundation +import Path import PathKit -import TSCBasic import TuistSupport import XcodeProj diff --git a/Sources/TuistMigration/Utilities/TargetsExtractor.swift b/Sources/TuistMigration/Utilities/TargetsExtractor.swift index 62a01ac4275..850018c97d3 100644 --- a/Sources/TuistMigration/Utilities/TargetsExtractor.swift +++ b/Sources/TuistMigration/Utilities/TargetsExtractor.swift @@ -1,11 +1,11 @@ import Foundation -import PathKit +import Path import TSCBasic import TuistSupport import XcodeProj public enum TargetsExtractorError: FatalError, Equatable { - case missingXcodeProj(AbsolutePath) + case missingXcodeProj(Path.AbsolutePath) case noTargets case failedToExtractTargets(String) case failedToEncode @@ -37,7 +37,7 @@ public enum TargetsExtractorError: FatalError, Equatable { public protocol TargetsExtracting { /// - Parameters: /// - xcodeprojPath: Path to the Xcode project. - func targetsSortedByDependencies(xcodeprojPath: AbsolutePath) throws -> [TargetDependencyCount] + func targetsSortedByDependencies(xcodeprojPath: Path.AbsolutePath) throws -> [TargetDependencyCount] } public struct TargetDependencyCount: Encodable { @@ -53,9 +53,9 @@ public final class TargetsExtractor: TargetsExtracting { // MARK: - EmptyBuildSettingsChecking - public func targetsSortedByDependencies(xcodeprojPath: AbsolutePath) throws -> [TargetDependencyCount] { + public func targetsSortedByDependencies(xcodeprojPath: Path.AbsolutePath) throws -> [TargetDependencyCount] { guard FileHandler.shared.exists(xcodeprojPath) else { throw TargetsExtractorError.missingXcodeProj(xcodeprojPath) } - let pbxproj = try XcodeProj(path: Path(xcodeprojPath.pathString)).pbxproj + let pbxproj = try XcodeProj(pathString: xcodeprojPath.pathString).pbxproj let targets = pbxproj.nativeTargets + pbxproj.aggregateTargets + pbxproj.legacyTargets if targets.isEmpty { throw TargetsExtractorError.noTargets diff --git a/Sources/TuistMigrationTesting/Utilities/MockEmptyBuildSettingsChecker.swift b/Sources/TuistMigrationTesting/Utilities/MockEmptyBuildSettingsChecker.swift index 806780bbc17..4a1c1dd62a5 100644 --- a/Sources/TuistMigrationTesting/Utilities/MockEmptyBuildSettingsChecker.swift +++ b/Sources/TuistMigrationTesting/Utilities/MockEmptyBuildSettingsChecker.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistMigration public class MockEmptyBuildSettingsChecker: EmptyBuildSettingsChecking { diff --git a/Sources/TuistPlugin/PluginService.swift b/Sources/TuistPlugin/PluginService.swift index af8350d1096..d28f2755eb2 100644 --- a/Sources/TuistPlugin/PluginService.swift +++ b/Sources/TuistPlugin/PluginService.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import TuistScaffold diff --git a/Sources/TuistScaffold/TemplateGenerator.swift b/Sources/TuistScaffold/TemplateGenerator.swift index cf867a21b0c..c2dbaf1e804 100644 --- a/Sources/TuistScaffold/TemplateGenerator.swift +++ b/Sources/TuistScaffold/TemplateGenerator.swift @@ -1,7 +1,7 @@ import Foundation +import Path import PathKit import StencilSwiftKit -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Sources/TuistScaffold/TemplatesDirectoryLocator.swift b/Sources/TuistScaffold/TemplatesDirectoryLocator.swift index 5d5ac7c1221..bf9322d1ee9 100644 --- a/Sources/TuistScaffold/TemplatesDirectoryLocator.swift +++ b/Sources/TuistScaffold/TemplatesDirectoryLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport @@ -32,7 +32,7 @@ public final class TemplatesDirectoryLocator: TemplatesDirectoryLocating { public func locateTuistTemplates() -> AbsolutePath? { #if DEBUG let maybeBundlePath: AbsolutePath? - if let sourceRoot = ProcessEnv.vars["TUIST_CONFIG_SRCROOT"] { + if let sourceRoot = ProcessInfo.processInfo.environment["TUIST_CONFIG_SRCROOT"] { maybeBundlePath = try? AbsolutePath(validating: sourceRoot).appending(component: "Templates") } else { // Used only for debug purposes to find templates in your tuist working directory diff --git a/Sources/TuistScaffoldTesting/Utils/Mocks/MockTemplateGenerator.swift b/Sources/TuistScaffoldTesting/Utils/Mocks/MockTemplateGenerator.swift index d68fbcddad3..960d8a5336d 100644 --- a/Sources/TuistScaffoldTesting/Utils/Mocks/MockTemplateGenerator.swift +++ b/Sources/TuistScaffoldTesting/Utils/Mocks/MockTemplateGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph @testable import TuistCore diff --git a/Sources/TuistScaffoldTesting/Utils/Mocks/MockTemplatesDirectoryLocator.swift b/Sources/TuistScaffoldTesting/Utils/Mocks/MockTemplatesDirectoryLocator.swift index 8a897c273b5..60ec2db63fb 100644 --- a/Sources/TuistScaffoldTesting/Utils/Mocks/MockTemplatesDirectoryLocator.swift +++ b/Sources/TuistScaffoldTesting/Utils/Mocks/MockTemplatesDirectoryLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistScaffold public final class MockTemplatesDirectoryLocator: TemplatesDirectoryLocating { diff --git a/Sources/TuistServer/Cache/CacheStoring.swift b/Sources/TuistServer/Cache/CacheStoring.swift index 7341d7acc07..ceb6c90346f 100644 --- a/Sources/TuistServer/Cache/CacheStoring.swift +++ b/Sources/TuistServer/Cache/CacheStoring.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistCore import XcodeGraph diff --git a/Sources/TuistServer/Cache/EmptyCacheStorage.swift b/Sources/TuistServer/Cache/EmptyCacheStorage.swift index 95dbd52b167..717682c651e 100644 --- a/Sources/TuistServer/Cache/EmptyCacheStorage.swift +++ b/Sources/TuistServer/Cache/EmptyCacheStorage.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore /// Empty `CacheStoring` implementation as we noop cache storing in the opensource repository diff --git a/Sources/TuistServer/Services/AnalyticsArtifactUploadService.swift b/Sources/TuistServer/Services/AnalyticsArtifactUploadService.swift index a3639cf8a40..e17c858a280 100644 --- a/Sources/TuistServer/Services/AnalyticsArtifactUploadService.swift +++ b/Sources/TuistServer/Services/AnalyticsArtifactUploadService.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistSupport @Mockable diff --git a/Sources/TuistServer/Services/MultipartUploadArtifactService.swift b/Sources/TuistServer/Services/MultipartUploadArtifactService.swift index 889d408be2c..a0ce25ef3d8 100644 --- a/Sources/TuistServer/Services/MultipartUploadArtifactService.swift +++ b/Sources/TuistServer/Services/MultipartUploadArtifactService.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistSupport enum MultipartUploadArtifactServiceError: FatalError { diff --git a/Sources/TuistServer/Utilities/CloudCredentialsStore.swift b/Sources/TuistServer/Utilities/CloudCredentialsStore.swift index 4f075602c54..516a492585b 100644 --- a/Sources/TuistServer/Utilities/CloudCredentialsStore.swift +++ b/Sources/TuistServer/Utilities/CloudCredentialsStore.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path import TuistSupport public struct CloudCredentials: Codable, Equatable { diff --git a/Sources/TuistServer/Utilities/XCResultToolController.swift b/Sources/TuistServer/Utilities/XCResultToolController.swift index fe0011c91cf..121946c78e7 100644 --- a/Sources/TuistServer/Utilities/XCResultToolController.swift +++ b/Sources/TuistServer/Utilities/XCResultToolController.swift @@ -1,5 +1,5 @@ import Mockable -import TSCBasic +import Path import TuistSupport @Mockable diff --git a/Sources/TuistSupport/CoreDataVersionExtractor.swift b/Sources/TuistSupport/CoreDataVersionExtractor.swift index a0450676021..0076edc04e8 100644 --- a/Sources/TuistSupport/CoreDataVersionExtractor.swift +++ b/Sources/TuistSupport/CoreDataVersionExtractor.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Extract version from .xccurrentversion file. public enum CoreDataVersionExtractor { diff --git a/Sources/TuistSupport/Extensions/AbsolutePath+Extras.swift b/Sources/TuistSupport/Extensions/AbsolutePath+Extras.swift index 7283fde0973..0727600b185 100644 --- a/Sources/TuistSupport/Extensions/AbsolutePath+Extras.swift +++ b/Sources/TuistSupport/Extensions/AbsolutePath+Extras.swift @@ -1,6 +1,6 @@ import Darwin import Foundation -import TSCBasic +import Path import UniformTypeIdentifiers let systemGlob = Darwin.glob diff --git a/Sources/TuistSupport/Extensions/TSCBasic+Extras.swift b/Sources/TuistSupport/Extensions/TSCBasic+Extras.swift index eb3a6a734c1..b1cbf15914c 100644 --- a/Sources/TuistSupport/Extensions/TSCBasic+Extras.swift +++ b/Sources/TuistSupport/Extensions/TSCBasic+Extras.swift @@ -1,9 +1,10 @@ +import Path import TSCBasic -public func withTemporaryDirectories(body: (AbsolutePath, AbsolutePath) throws -> Result) throws -> Result { +public func withTemporaryDirectories(body: (Path.AbsolutePath, Path.AbsolutePath) throws -> Result) throws -> Result { try withTemporaryDirectory { tempDirOne in try withTemporaryDirectory { tempDirTwo in - try body(tempDirOne, tempDirTwo) + try body(.init(validating: tempDirOne.pathString), .init(validating: tempDirTwo.pathString)) } } } diff --git a/Sources/TuistSupport/HTTP/FileClient.swift b/Sources/TuistSupport/HTTP/FileClient.swift index 8ff9f14b81f..99d0e55d1b3 100644 --- a/Sources/TuistSupport/HTTP/FileClient.swift +++ b/Sources/TuistSupport/HTTP/FileClient.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path enum FileClientError: LocalizedError, FatalError { case urlSessionError(URLRequest, Error, AbsolutePath?) diff --git a/Sources/TuistSupport/Logging/FileLogger.swift b/Sources/TuistSupport/Logging/FileLogger.swift index 03c83106ff4..02e469dd10c 100644 --- a/Sources/TuistSupport/Logging/FileLogger.swift +++ b/Sources/TuistSupport/Logging/FileLogger.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct FileLogger: TextOutputStream { enum FileHandlerOutputStream: Error { diff --git a/Sources/TuistSupport/Models/InvalidGlob.swift b/Sources/TuistSupport/Models/InvalidGlob.swift index dbba010ab91..216c723d122 100644 --- a/Sources/TuistSupport/Models/InvalidGlob.swift +++ b/Sources/TuistSupport/Models/InvalidGlob.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path /// A structs that represents an invalid glob pattern. public struct InvalidGlob: Equatable, CustomStringConvertible, Sendable { diff --git a/Sources/TuistSupport/SwiftPackageManager/PackageInfo.swift b/Sources/TuistSupport/SwiftPackageManager/PackageInfo.swift index f17e0e2661a..190f6e22ed0 100644 --- a/Sources/TuistSupport/SwiftPackageManager/PackageInfo.swift +++ b/Sources/TuistSupport/SwiftPackageManager/PackageInfo.swift @@ -1,5 +1,5 @@ +import Path import ProjectDescription -import TSCBasic import TSCUtility // MARK: - PackageInfo diff --git a/Sources/TuistSupport/SwiftPackageManager/SwiftPackageManagerController.swift b/Sources/TuistSupport/SwiftPackageManager/SwiftPackageManagerController.swift index b5558d73aab..00a9ae517d8 100644 --- a/Sources/TuistSupport/SwiftPackageManager/SwiftPackageManagerController.swift +++ b/Sources/TuistSupport/SwiftPackageManager/SwiftPackageManagerController.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility /// Protocol that defines an interface to interact with the Swift Package Manager. diff --git a/Sources/TuistSupport/System/System.swift b/Sources/TuistSupport/System/System.swift index a83488f557d..b7a7ce68a14 100644 --- a/Sources/TuistSupport/System/System.swift +++ b/Sources/TuistSupport/System/System.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic extension ProcessResult { @@ -213,10 +214,10 @@ public final class System: Systeming { public func chmod( _ mode: FileMode, - path: AbsolutePath, + path: Path.AbsolutePath, options: Set ) throws { - try localFileSystem.chmod(mode, path: path, options: options) + try localFileSystem.chmod(mode, path: .init(validating: path.pathString), options: options) } public func run( diff --git a/Sources/TuistSupport/System/Systeming.swift b/Sources/TuistSupport/System/Systeming.swift index ba686be9250..568bd395c36 100644 --- a/Sources/TuistSupport/System/Systeming.swift +++ b/Sources/TuistSupport/System/Systeming.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic public protocol Systeming { @@ -97,7 +98,7 @@ public protocol Systeming { /// - mode: Defines user file mode. /// - path: Path of file for which the permissions should be changed. /// - options: Options for changing permissions. - func chmod(_ mode: FileMode, path: AbsolutePath, options: Set) throws + func chmod(_ mode: FileMode, path: Path.AbsolutePath, options: Set) throws } extension Systeming { diff --git a/Sources/TuistSupport/Utils/DerivedDataLocator.swift b/Sources/TuistSupport/Utils/DerivedDataLocator.swift index edf0cd7b1c4..b7d4c12c76c 100644 --- a/Sources/TuistSupport/Utils/DerivedDataLocator.swift +++ b/Sources/TuistSupport/Utils/DerivedDataLocator.swift @@ -1,6 +1,6 @@ import CryptoKit import Foundation -import TSCBasic +import Path public protocol DerivedDataLocating { func locate( diff --git a/Sources/TuistSupport/Utils/DeveloperEnvironment.swift b/Sources/TuistSupport/Utils/DeveloperEnvironment.swift index 2cb5d0d9b66..c73438b7282 100644 --- a/Sources/TuistSupport/Utils/DeveloperEnvironment.swift +++ b/Sources/TuistSupport/Utils/DeveloperEnvironment.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public protocol DeveloperEnvironmenting { /// Returns the derived data directory selected in the environment. diff --git a/Sources/TuistSupport/Utils/Environment.swift b/Sources/TuistSupport/Utils/Environment.swift index 9ed84db4dc0..9c3c5db0f1e 100644 --- a/Sources/TuistSupport/Utils/Environment.swift +++ b/Sources/TuistSupport/Utils/Environment.swift @@ -1,6 +1,6 @@ import Darwin import Foundation -import TSCBasic +import Path /// Protocol that defines the interface of a local environment controller. /// It manages the local directory where tuistenv stores the tuist versions and user settings. diff --git a/Sources/TuistSupport/Utils/FileArchiver.swift b/Sources/TuistSupport/Utils/FileArchiver.swift index 8bf949dc15c..85b9af3f476 100644 --- a/Sources/TuistSupport/Utils/FileArchiver.swift +++ b/Sources/TuistSupport/Utils/FileArchiver.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path /// An interface to archive files in a zip file. @Mockable diff --git a/Sources/TuistSupport/Utils/FileArchivingFactory.swift b/Sources/TuistSupport/Utils/FileArchivingFactory.swift index 5686078592b..fdc5d027a15 100644 --- a/Sources/TuistSupport/Utils/FileArchivingFactory.swift +++ b/Sources/TuistSupport/Utils/FileArchivingFactory.swift @@ -1,5 +1,5 @@ import Mockable -import TSCBasic +import Path /// An interface that defines a factory of archiver and unarchivers. @Mockable diff --git a/Sources/TuistSupport/Utils/FileHandler.swift b/Sources/TuistSupport/Utils/FileHandler.swift index da95f1ce584..c6ed0733ef4 100644 --- a/Sources/TuistSupport/Utils/FileHandler.swift +++ b/Sources/TuistSupport/Utils/FileHandler.swift @@ -1,15 +1,16 @@ import CryptoKit import Foundation +import Path import TSCBasic import ZIPFoundation public enum FileHandlerError: FatalError, Equatable { - case invalidTextEncoding(AbsolutePath) - case writingError(AbsolutePath) - case fileNotFound(AbsolutePath) - case unreachableFileSize(AbsolutePath) - case expectedAFile(AbsolutePath) - case propertyListDecodeError(AbsolutePath, description: String) + case invalidTextEncoding(Path.AbsolutePath) + case writingError(Path.AbsolutePath) + case fileNotFound(Path.AbsolutePath) + case unreachableFileSize(Path.AbsolutePath) + case expectedAFile(Path.AbsolutePath) + case propertyListDecodeError(Path.AbsolutePath, description: String) public var description: String { switch self { @@ -42,46 +43,46 @@ public enum FileHandlerError: FatalError, Equatable { /// methods to interact with the system files and folders. public protocol FileHandling: AnyObject { /// Returns the current path. - var currentPath: AbsolutePath { get } + var currentPath: Path.AbsolutePath { get } /// Returns `AbsolutePath` to home directory - var homeDirectory: AbsolutePath { get } - - func replace(_ to: AbsolutePath, with: AbsolutePath) throws - func exists(_ path: AbsolutePath) -> Bool - func move(from: AbsolutePath, to: AbsolutePath) throws - func copy(from: AbsolutePath, to: AbsolutePath) throws - func readFile(_ at: AbsolutePath) throws -> Data - func readTextFile(_ at: AbsolutePath) throws -> String - func readPlistFile(_ at: AbsolutePath) throws -> T + var homeDirectory: Path.AbsolutePath { get } + + func replace(_ to: Path.AbsolutePath, with: Path.AbsolutePath) throws + func exists(_ path: Path.AbsolutePath) -> Bool + func move(from: Path.AbsolutePath, to: Path.AbsolutePath) throws + func copy(from: Path.AbsolutePath, to: Path.AbsolutePath) throws + func readFile(_ at: Path.AbsolutePath) throws -> Data + func readTextFile(_ at: Path.AbsolutePath) throws -> String + func readPlistFile(_ at: Path.AbsolutePath) throws -> T /// Determine temporary directory either default for user or specified by ENV variable - func determineTemporaryDirectory() throws -> AbsolutePath - func temporaryDirectory() throws -> AbsolutePath - func inTemporaryDirectory(_ closure: @escaping (AbsolutePath) async throws -> Void) async throws - func inTemporaryDirectory(_ closure: (AbsolutePath) throws -> Void) throws - func inTemporaryDirectory(removeOnCompletion: Bool, _ closure: (AbsolutePath) throws -> Void) throws - func inTemporaryDirectory(_ closure: (AbsolutePath) throws -> Result) throws -> Result - func inTemporaryDirectory(removeOnCompletion: Bool, _ closure: (AbsolutePath) throws -> Result) throws -> Result - func write(_ content: String, path: AbsolutePath, atomically: Bool) throws - func locateDirectoryTraversingParents(from: AbsolutePath, path: String) -> AbsolutePath? - func locateDirectory(_ path: String, traversingFrom from: AbsolutePath) throws -> AbsolutePath? - func files(in path: AbsolutePath, nameFilter: Set?, extensionFilter: Set?) -> Set - func glob(_ path: AbsolutePath, glob: String) -> [AbsolutePath] - func throwingGlob(_ path: AbsolutePath, glob: String) throws -> [AbsolutePath] - func linkFile(atPath: AbsolutePath, toPath: AbsolutePath) throws - func createFolder(_ path: AbsolutePath) throws - func delete(_ path: AbsolutePath) throws - func isFolder(_ path: AbsolutePath) -> Bool - func touch(_ path: AbsolutePath) throws - func contentsOfDirectory(_ path: AbsolutePath) throws -> [AbsolutePath] - func urlSafeBase64MD5(path: AbsolutePath) throws -> String - func fileSize(path: AbsolutePath) throws -> UInt64 - func changeExtension(path: AbsolutePath, to newExtension: String) throws -> AbsolutePath - func resolveSymlinks(_ path: AbsolutePath) throws -> AbsolutePath - func fileAttributes(at path: AbsolutePath) throws -> [FileAttributeKey: Any] - func filesAndDirectoriesContained(in path: AbsolutePath) throws -> [AbsolutePath]? - func zipItem(at sourcePath: AbsolutePath, to destinationPath: AbsolutePath) throws - func unzipItem(at sourcePath: AbsolutePath, to destinationPath: AbsolutePath) throws + func determineTemporaryDirectory() throws -> Path.AbsolutePath + func temporaryDirectory() throws -> Path.AbsolutePath + func inTemporaryDirectory(_ closure: @escaping (Path.AbsolutePath) async throws -> Void) async throws + func inTemporaryDirectory(_ closure: (Path.AbsolutePath) throws -> Void) throws + func inTemporaryDirectory(removeOnCompletion: Bool, _ closure: (Path.AbsolutePath) throws -> Void) throws + func inTemporaryDirectory(_ closure: (Path.AbsolutePath) throws -> Result) throws -> Result + func inTemporaryDirectory(removeOnCompletion: Bool, _ closure: (Path.AbsolutePath) throws -> Result) throws -> Result + func write(_ content: String, path: Path.AbsolutePath, atomically: Bool) throws + func locateDirectoryTraversingParents(from: Path.AbsolutePath, path: String) -> Path.AbsolutePath? + func locateDirectory(_ path: String, traversingFrom from: Path.AbsolutePath) throws -> Path.AbsolutePath? + func files(in path: Path.AbsolutePath, nameFilter: Set?, extensionFilter: Set?) -> Set + func glob(_ path: Path.AbsolutePath, glob: String) -> [Path.AbsolutePath] + func throwingGlob(_ path: Path.AbsolutePath, glob: String) throws -> [Path.AbsolutePath] + func linkFile(atPath: Path.AbsolutePath, toPath: Path.AbsolutePath) throws + func createFolder(_ path: Path.AbsolutePath) throws + func delete(_ path: Path.AbsolutePath) throws + func isFolder(_ path: Path.AbsolutePath) -> Bool + func touch(_ path: Path.AbsolutePath) throws + func contentsOfDirectory(_ path: Path.AbsolutePath) throws -> [Path.AbsolutePath] + func urlSafeBase64MD5(path: Path.AbsolutePath) throws -> String + func fileSize(path: Path.AbsolutePath) throws -> UInt64 + func changeExtension(path: Path.AbsolutePath, to newExtension: String) throws -> Path.AbsolutePath + func resolveSymlinks(_ path: Path.AbsolutePath) throws -> Path.AbsolutePath + func fileAttributes(at path: Path.AbsolutePath) throws -> [FileAttributeKey: Any] + func filesAndDirectoriesContained(in path: Path.AbsolutePath) throws -> [Path.AbsolutePath]? + func zipItem(at sourcePath: Path.AbsolutePath, to destinationPath: Path.AbsolutePath) throws + func unzipItem(at sourcePath: Path.AbsolutePath, to destinationPath: Path.AbsolutePath) throws } public class FileHandler: FileHandling { @@ -98,15 +99,15 @@ public class FileHandler: FileHandling { self.fileManager = fileManager } - public var currentPath: AbsolutePath { + public var currentPath: Path.AbsolutePath { try! AbsolutePath(validating: fileManager.currentDirectoryPath) // swiftlint:disable:this force_try } - public var homeDirectory: AbsolutePath { + public var homeDirectory: Path.AbsolutePath { try! AbsolutePath(validating: NSHomeDirectory()) // swiftlint:disable:this force_try } - public func replace(_ to: AbsolutePath, with: AbsolutePath) throws { + public func replace(_ to: Path.AbsolutePath, with: Path.AbsolutePath) throws { // To support cases where the destination is on a different volume // we need to create a temporary directory that is suitable // for performing a `replaceItemAt` @@ -127,57 +128,65 @@ public class FileHandler: FileHandling { _ = try fileManager.replaceItemAt(to.url, withItemAt: tempUrl) } - public func temporaryDirectory() throws -> AbsolutePath { + public func temporaryDirectory() throws -> Path.AbsolutePath { let directory = try TemporaryDirectory(removeTreeOnDeinit: false) return directory.path } - public func determineTemporaryDirectory() throws -> AbsolutePath { - try determineTempDirectory() + public func determineTemporaryDirectory() throws -> Path.AbsolutePath { + try .init(validating: determineTempDirectory().pathString) } - public func inTemporaryDirectory(_ closure: (AbsolutePath) throws -> Result) throws -> Result { - try withTemporaryDirectory(removeTreeOnDeinit: true, closure) + public func inTemporaryDirectory(_ closure: (Path.AbsolutePath) throws -> Result) throws -> Result { + try withTemporaryDirectory(removeTreeOnDeinit: true) { path in + try closure(.init(validating: path.pathString)) + } } - public func inTemporaryDirectory(removeOnCompletion: Bool, _ closure: (AbsolutePath) throws -> Void) throws { - try withTemporaryDirectory(removeTreeOnDeinit: removeOnCompletion, closure) + public func inTemporaryDirectory(removeOnCompletion: Bool, _ closure: (Path.AbsolutePath) throws -> Void) throws { + try withTemporaryDirectory(removeTreeOnDeinit: removeOnCompletion) { path in + try closure(.init(validating: path.pathString)) + } } - public func inTemporaryDirectory(_ closure: (AbsolutePath) throws -> Void) throws { - try withTemporaryDirectory(removeTreeOnDeinit: true, closure) + public func inTemporaryDirectory(_ closure: (Path.AbsolutePath) throws -> Void) throws { + try withTemporaryDirectory(removeTreeOnDeinit: true) { path in + try closure(.init(validating: path.pathString)) + } } - public func inTemporaryDirectory(_ closure: @escaping (AbsolutePath) async throws -> Void) async throws { + public func inTemporaryDirectory(_ closure: @escaping (Path.AbsolutePath) async throws -> Void) async throws { let directory = try TemporaryDirectory(removeTreeOnDeinit: true) try await closure(directory.path) } public func inTemporaryDirectory( removeOnCompletion: Bool, - _ closure: (AbsolutePath) throws -> Result + _ closure: (Path.AbsolutePath) throws -> Result ) throws -> Result { - try withTemporaryDirectory(removeTreeOnDeinit: removeOnCompletion, closure) + try withTemporaryDirectory(removeTreeOnDeinit: removeOnCompletion) { path in + try closure(try .init(validating: path.pathString)) + } } - public func exists(_ path: AbsolutePath) -> Bool { + public func exists(_ path: Path.AbsolutePath) -> Bool { let exists = fileManager.fileExists(atPath: path.pathString) return exists } - public func copy(from: AbsolutePath, to: AbsolutePath) throws { + public func copy(from: Path.AbsolutePath, to: Path.AbsolutePath) throws { try fileManager.copyItem(atPath: from.pathString, toPath: to.pathString) } - public func move(from: AbsolutePath, to: AbsolutePath) throws { + public func move(from: Path.AbsolutePath, to: Path.AbsolutePath) throws { try fileManager.moveItem(atPath: from.pathString, toPath: to.pathString) } - public func readFile(_ at: AbsolutePath) throws -> Data { + public func readFile(_ at: Path.AbsolutePath) throws -> Data { return try Data(contentsOf: at.url) } - public func readTextFile(_ at: AbsolutePath) throws -> String { + public func readTextFile(_ at: Path.AbsolutePath) throws -> String { let data = try Data(contentsOf: at.url) if let content = String(data: data, encoding: .utf8) { return content @@ -186,7 +195,7 @@ public class FileHandler: FileHandling { } } - public func readPlistFile(_ at: AbsolutePath) throws -> T { + public func readPlistFile(_ at: Path.AbsolutePath) throws -> T { guard let data = fileManager.contents(atPath: at.pathString) else { throw FileHandlerError.fileNotFound(at) } @@ -201,17 +210,17 @@ public class FileHandler: FileHandling { } } - public func linkFile(atPath: AbsolutePath, toPath: AbsolutePath) throws { + public func linkFile(atPath: Path.AbsolutePath, toPath: Path.AbsolutePath) throws { try fileManager.linkItem(atPath: atPath.pathString, toPath: toPath.pathString) } - public func write(_ content: String, path: AbsolutePath, atomically: Bool) throws { + public func write(_ content: String, path: Path.AbsolutePath, atomically: Bool) throws { do { try content.write(to: path.url, atomically: atomically, encoding: .utf8) } catch {} } - public func locateDirectory(_ path: String, traversingFrom from: AbsolutePath) throws -> AbsolutePath? { + public func locateDirectory(_ path: String, traversingFrom from: Path.AbsolutePath) throws -> Path.AbsolutePath? { let extendedPath = from.appending(try RelativePath(validating: path)) if exists(extendedPath) { return extendedPath @@ -223,11 +232,11 @@ public class FileHandler: FileHandling { } public func files( - in path: AbsolutePath, + in path: Path.AbsolutePath, nameFilter: Set?, extensionFilter: Set? - ) -> Set { - var results = Set() + ) -> Set { + var results = Set() let enumerator = fileManager.enumerator( at: path.url, @@ -262,15 +271,15 @@ public class FileHandler: FileHandling { return results } - public func glob(_ path: AbsolutePath, glob: String) -> [AbsolutePath] { + public func glob(_ path: Path.AbsolutePath, glob: String) -> [Path.AbsolutePath] { path.glob(glob) } - public func throwingGlob(_ path: AbsolutePath, glob: String) throws -> [AbsolutePath] { + public func throwingGlob(_ path: Path.AbsolutePath, glob: String) throws -> [Path.AbsolutePath] { try path.throwingGlob(glob) } - public func createFolder(_ path: AbsolutePath) throws { + public func createFolder(_ path: Path.AbsolutePath) throws { try fileManager.createDirectory( at: path.url, withIntermediateDirectories: true, @@ -278,13 +287,13 @@ public class FileHandler: FileHandling { ) } - public func delete(_ path: AbsolutePath) throws { + public func delete(_ path: Path.AbsolutePath) throws { if exists(path) { try fileManager.removeItem(atPath: path.pathString) } } - public func touch(_ path: AbsolutePath) throws { + public func touch(_ path: Path.AbsolutePath) throws { try fileManager.createDirectory( at: path.removingLastComponent().url, withIntermediateDirectories: true, @@ -293,16 +302,16 @@ public class FileHandler: FileHandling { try Data().write(to: path.url) } - public func isFolder(_ path: AbsolutePath) -> Bool { + public func isFolder(_ path: Path.AbsolutePath) -> Bool { var isDirectory = ObjCBool(true) let exists = fileManager.fileExists(atPath: path.pathString, isDirectory: &isDirectory) return exists && isDirectory.boolValue } - public func locateDirectoryTraversingParents(from: AbsolutePath, path: String) -> AbsolutePath? { + public func locateDirectoryTraversingParents(from: Path.AbsolutePath, path: String) -> Path.AbsolutePath? { let configPath = from.appending(component: path) - let root = try! AbsolutePath(validating: "/") // swiftlint:disable:this force_try + let root = try! Path.AbsolutePath(validating: "/") // swiftlint:disable:this force_try if FileHandler.shared.exists(configPath) { return configPath } else if from == root { @@ -312,29 +321,29 @@ public class FileHandler: FileHandling { } } - public func contentsOfDirectory(_ path: AbsolutePath) throws -> [AbsolutePath] { + public func contentsOfDirectory(_ path: Path.AbsolutePath) throws -> [Path.AbsolutePath] { try fileManager.contentsOfDirectory(atPath: path.pathString).map { try AbsolutePath(validating: $0, relativeTo: path) } } - public func createSymbolicLink(at path: AbsolutePath, destination: AbsolutePath) throws { + public func createSymbolicLink(at path: Path.AbsolutePath, destination: Path.AbsolutePath) throws { try fileManager.createSymbolicLink(atPath: path.pathString, withDestinationPath: destination.pathString) } - public func resolveSymlinks(_ path: AbsolutePath) throws -> AbsolutePath { - try TSCBasic.resolveSymlinks(path) + public func resolveSymlinks(_ path: Path.AbsolutePath) throws -> Path.AbsolutePath { + try .init(validating: TSCBasic.resolveSymlinks(.init(validating: path.pathString)).pathString) } - public func fileAttributes(at path: AbsolutePath) throws -> [FileAttributeKey: Any] { + public func fileAttributes(at path: Path.AbsolutePath) throws -> [FileAttributeKey: Any] { try fileManager.attributesOfItem(atPath: path.pathString) } - public func filesAndDirectoriesContained(in path: AbsolutePath) throws -> [AbsolutePath]? { + public func filesAndDirectoriesContained(in path: Path.AbsolutePath) throws -> [Path.AbsolutePath]? { try fileManager.subpaths(atPath: path.pathString)?.map { path.appending(try RelativePath(validating: $0)) } } // MARK: - MD5 - public func urlSafeBase64MD5(path: AbsolutePath) throws -> String { + public func urlSafeBase64MD5(path: Path.AbsolutePath) throws -> String { let data = try Data(contentsOf: path.url) let digestData = Data(Insecure.MD5.hash(data: data)) return digestData.base64EncodedString() @@ -344,7 +353,7 @@ public class FileHandler: FileHandling { // MARK: - File Attributes - public func fileSize(path: AbsolutePath) throws -> UInt64 { + public func fileSize(path: Path.AbsolutePath) throws -> UInt64 { let attr = try fileManager.attributesOfItem(atPath: path.pathString) guard let size = attr[FileAttributeKey.size] as? UInt64 else { throw FileHandlerError.unreachableFileSize(path) } return size @@ -352,7 +361,7 @@ public class FileHandler: FileHandling { // MARK: - Extension - public func changeExtension(path: AbsolutePath, to fileExtension: String) throws -> AbsolutePath { + public func changeExtension(path: Path.AbsolutePath, to fileExtension: String) throws -> Path.AbsolutePath { guard isFolder(path) == false else { throw FileHandlerError.expectedAFile(path) } let sanitizedExtension = fileExtension.starts(with: ".") ? String(fileExtension.dropFirst()) : fileExtension guard path.extension != sanitizedExtension else { return path } @@ -362,11 +371,18 @@ public class FileHandler: FileHandling { return newPath } - public func zipItem(at sourcePath: AbsolutePath, to destinationPath: AbsolutePath) throws { - try fileManager.zipItem(at: sourcePath.asURL, to: destinationPath.asURL, shouldKeepParent: false) + public func zipItem(at sourcePath: Path.AbsolutePath, to destinationPath: Path.AbsolutePath) throws { + try fileManager.zipItem( + at: URL(fileURLWithPath: sourcePath.pathString), + to: URL(fileURLWithPath: destinationPath.pathString), + shouldKeepParent: false + ) } - public func unzipItem(at sourcePath: AbsolutePath, to destinationPath: AbsolutePath) throws { - try fileManager.unzipItem(at: sourcePath.asURL, to: destinationPath.asURL) + public func unzipItem(at sourcePath: Path.AbsolutePath, to destinationPath: Path.AbsolutePath) throws { + try fileManager.unzipItem( + at: URL(fileURLWithPath: sourcePath.pathString), + to: URL(fileURLWithPath: destinationPath.pathString) + ) } } diff --git a/Sources/TuistSupport/Utils/FileUnarchiver.swift b/Sources/TuistSupport/Utils/FileUnarchiver.swift index 40adc0f1f39..53b64cfd7e2 100644 --- a/Sources/TuistSupport/Utils/FileUnarchiver.swift +++ b/Sources/TuistSupport/Utils/FileUnarchiver.swift @@ -1,6 +1,6 @@ import Foundation import Mockable -import TSCBasic +import Path @Mockable public protocol FileUnarchiving { diff --git a/Sources/TuistSupport/Utils/GitHandler.swift b/Sources/TuistSupport/Utils/GitHandler.swift index dd84b7512bb..b2d932b381f 100644 --- a/Sources/TuistSupport/Utils/GitHandler.swift +++ b/Sources/TuistSupport/Utils/GitHandler.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility public protocol GitHandling { diff --git a/Sources/TuistSupport/Utils/Opener.swift b/Sources/TuistSupport/Utils/Opener.swift index ea02cffdc7e..314ba0a507a 100644 --- a/Sources/TuistSupport/Utils/Opener.swift +++ b/Sources/TuistSupport/Utils/Opener.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path enum OpeningError: FatalError, Equatable { case notFound(AbsolutePath) diff --git a/Sources/TuistSupport/Utils/TemporaryDirectory.swift b/Sources/TuistSupport/Utils/TemporaryDirectory.swift index 0f71362ba5a..eefa5f20248 100644 --- a/Sources/TuistSupport/Utils/TemporaryDirectory.swift +++ b/Sources/TuistSupport/Utils/TemporaryDirectory.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import TSCLibc @@ -8,7 +9,7 @@ public final class TemporaryDirectory { let prefix: String /// The full path of the temporary directory. - public let path: AbsolutePath + public let path: Path.AbsolutePath /// If true, try to remove the whole directory tree before deallocating. let shouldRemoveTreeOnDeinit: Bool @@ -24,14 +25,15 @@ public final class TemporaryDirectory { /// /// - Throws: MakeDirectoryError public init( - dir: AbsolutePath? = nil, + dir: Path.AbsolutePath? = nil, prefix: String = "TemporaryDirectory", removeTreeOnDeinit: Bool = false ) throws { shouldRemoveTreeOnDeinit = removeTreeOnDeinit self.prefix = prefix // Construct path to the temporary directory. - let path = try determineTempDirectory(dir).appending(try RelativePath(validating: prefix + ".XXXXXX")) + let path = try determineTempDirectory(dir.map { try .init(validating: $0.pathString) }) + .appending(try RelativePath(validating: prefix + ".XXXXXX")) // Convert path to a C style string terminating with null char to be an valid input // to mkdtemp method. The XXXXXX in this string will be replaced by a random string @@ -42,7 +44,7 @@ public final class TemporaryDirectory { throw MakeDirectoryError.other(errno) } - self.path = try AbsolutePath(validating: String(cString: template)) + self.path = try Path.AbsolutePath(validating: String(cString: template)) } /// Remove the temporary file before deallocating. diff --git a/Sources/TuistSupport/Xcode/Xcode.swift b/Sources/TuistSupport/Xcode/Xcode.swift index 04ee58324ad..92aa8f82f0d 100644 --- a/Sources/TuistSupport/Xcode/Xcode.swift +++ b/Sources/TuistSupport/Xcode/Xcode.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum XcodeError: FatalError, Equatable { case infoPlistNotFound(AbsolutePath) diff --git a/Sources/TuistSupport/Xcode/XcodeController.swift b/Sources/TuistSupport/Xcode/XcodeController.swift index 3ce5d1cb19b..0dc53524a14 100644 --- a/Sources/TuistSupport/Xcode/XcodeController.swift +++ b/Sources/TuistSupport/Xcode/XcodeController.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility public protocol XcodeControlling: Sendable { diff --git a/Sources/TuistSupportTesting/Extensions/XCTestCase+Extras.swift b/Sources/TuistSupportTesting/Extensions/XCTestCase+Extras.swift index e3cd0a2e931..22dfe313c65 100644 --- a/Sources/TuistSupportTesting/Extensions/XCTestCase+Extras.swift +++ b/Sources/TuistSupportTesting/Extensions/XCTestCase+Extras.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Sources/TuistSupportTesting/HTTP/MockFileClient.swift b/Sources/TuistSupportTesting/HTTP/MockFileClient.swift index a25bd0f8a28..02c8be98dd2 100644 --- a/Sources/TuistSupportTesting/HTTP/MockFileClient.swift +++ b/Sources/TuistSupportTesting/HTTP/MockFileClient.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport // swiftlint:disable large_tuple diff --git a/Sources/TuistSupportTesting/SwiftPackageManager/MockSwiftPackageManagerController.swift b/Sources/TuistSupportTesting/SwiftPackageManager/MockSwiftPackageManagerController.swift index 30f6cd2e995..37b847b77bd 100644 --- a/Sources/TuistSupportTesting/SwiftPackageManager/MockSwiftPackageManagerController.swift +++ b/Sources/TuistSupportTesting/SwiftPackageManager/MockSwiftPackageManagerController.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TSCUtility @testable import TuistSupport diff --git a/Sources/TuistSupportTesting/SwiftPackageManager/PackageInfo+TestData.swift b/Sources/TuistSupportTesting/SwiftPackageManager/PackageInfo+TestData.swift index fba45ecc209..0acb567a9c2 100644 --- a/Sources/TuistSupportTesting/SwiftPackageManager/PackageInfo+TestData.swift +++ b/Sources/TuistSupportTesting/SwiftPackageManager/PackageInfo+TestData.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TSCUtility import XcodeGraph @testable import TuistSupport diff --git a/Sources/TuistSupportTesting/TestCase/TuistTestCase.swift b/Sources/TuistSupportTesting/TestCase/TuistTestCase.swift index e4351d2d297..3f881b59bf9 100644 --- a/Sources/TuistSupportTesting/TestCase/TuistTestCase.swift +++ b/Sources/TuistSupportTesting/TestCase/TuistTestCase.swift @@ -1,6 +1,6 @@ import Difference import Foundation -import TSCBasic +import Path import XCTest @testable import TuistSupport diff --git a/Sources/TuistSupportTesting/Utils/MockDerivedDataLocator.swift b/Sources/TuistSupportTesting/Utils/MockDerivedDataLocator.swift index 165b1227eeb..190f253ffcf 100644 --- a/Sources/TuistSupportTesting/Utils/MockDerivedDataLocator.swift +++ b/Sources/TuistSupportTesting/Utils/MockDerivedDataLocator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport public final class MockDerivedDataLocator: DerivedDataLocating { diff --git a/Sources/TuistSupportTesting/Utils/MockDeveloperEnvironment.swift b/Sources/TuistSupportTesting/Utils/MockDeveloperEnvironment.swift index 99dc031bef0..c5443aac229 100644 --- a/Sources/TuistSupportTesting/Utils/MockDeveloperEnvironment.swift +++ b/Sources/TuistSupportTesting/Utils/MockDeveloperEnvironment.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistSupport public final class MockDeveloperEnvironment: DeveloperEnvironmenting { diff --git a/Sources/TuistSupportTesting/Utils/MockEnvironment.swift b/Sources/TuistSupportTesting/Utils/MockEnvironment.swift index 8faa0156186..fba6246d5ae 100644 --- a/Sources/TuistSupportTesting/Utils/MockEnvironment.swift +++ b/Sources/TuistSupportTesting/Utils/MockEnvironment.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Sources/TuistSupportTesting/Utils/MockGitHandler.swift b/Sources/TuistSupportTesting/Utils/MockGitHandler.swift index 07ee49e2e0a..f9946552837 100644 --- a/Sources/TuistSupportTesting/Utils/MockGitHandler.swift +++ b/Sources/TuistSupportTesting/Utils/MockGitHandler.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TSCUtility import TuistSupport diff --git a/Sources/TuistSupportTesting/Utils/MockOpener.swift b/Sources/TuistSupportTesting/Utils/MockOpener.swift index a24f402fa9a..9ccea892f3d 100644 --- a/Sources/TuistSupportTesting/Utils/MockOpener.swift +++ b/Sources/TuistSupportTesting/Utils/MockOpener.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport // swiftlint:disable large_tuple diff --git a/Sources/TuistSupportTesting/Utils/MockSystem.swift b/Sources/TuistSupportTesting/Utils/MockSystem.swift index ada38e4e397..c31e227322d 100644 --- a/Sources/TuistSupportTesting/Utils/MockSystem.swift +++ b/Sources/TuistSupportTesting/Utils/MockSystem.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import XCTest @testable import TuistSupport @@ -121,10 +122,10 @@ public final class MockSystem: Systeming { } } - public var chmodStub: ((FileMode, AbsolutePath, Set) throws -> Void)? + public var chmodStub: ((FileMode, Path.AbsolutePath, Set) throws -> Void)? public func chmod( _ mode: FileMode, - path: AbsolutePath, + path: Path.AbsolutePath, options: Set ) throws { try chmodStub?(mode, path, options) diff --git a/Sources/TuistSupportTesting/Xcode/TestData/Xcode+TestData.swift b/Sources/TuistSupportTesting/Xcode/TestData/Xcode+TestData.swift index 3a1539716ff..d07098d1b38 100644 --- a/Sources/TuistSupportTesting/Xcode/TestData/Xcode+TestData.swift +++ b/Sources/TuistSupportTesting/Xcode/TestData/Xcode+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport diff --git a/Sources/XcodeGraph/DependenciesGraph/DependenciesGraph.swift b/Sources/XcodeGraph/DependenciesGraph/DependenciesGraph.swift index bb7e7e8893f..f9927f0ac35 100644 --- a/Sources/XcodeGraph/DependenciesGraph/DependenciesGraph.swift +++ b/Sources/XcodeGraph/DependenciesGraph/DependenciesGraph.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport /// A directed acyclic graph (DAG) that Tuist uses to represent the dependency tree. diff --git a/Sources/XcodeGraph/Graph/ConditionalGraphTarget.swift b/Sources/XcodeGraph/Graph/ConditionalGraphTarget.swift index b4ee787e2f8..e132261208a 100644 --- a/Sources/XcodeGraph/Graph/ConditionalGraphTarget.swift +++ b/Sources/XcodeGraph/Graph/ConditionalGraphTarget.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct GraphTargetReference: Equatable, Comparable, Hashable, CustomDebugStringConvertible, CustomStringConvertible, Codable diff --git a/Sources/XcodeGraph/Graph/Graph.swift b/Sources/XcodeGraph/Graph/Graph.swift index a14981d639d..033b95abe50 100644 --- a/Sources/XcodeGraph/Graph/Graph.swift +++ b/Sources/XcodeGraph/Graph/Graph.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// A directed acyclic graph (DAG) that Tuist uses to represent the dependency tree. public struct Graph: Equatable, Codable { diff --git a/Sources/XcodeGraph/Graph/GraphDependency.swift b/Sources/XcodeGraph/Graph/GraphDependency.swift index 98d13d6f216..870b73c4cce 100644 --- a/Sources/XcodeGraph/Graph/GraphDependency.swift +++ b/Sources/XcodeGraph/Graph/GraphDependency.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum GraphDependency: Hashable, CustomStringConvertible, Comparable, Codable { public struct XCFramework: Hashable, CustomStringConvertible, Comparable, Codable { diff --git a/Sources/XcodeGraph/Graph/GraphTarget.swift b/Sources/XcodeGraph/Graph/GraphTarget.swift index 8c80eff6527..a2126db3812 100644 --- a/Sources/XcodeGraph/Graph/GraphTarget.swift +++ b/Sources/XcodeGraph/Graph/GraphTarget.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct GraphTarget: Equatable, Hashable, Comparable, CustomDebugStringConvertible, CustomStringConvertible, Codable { /// Path to the directory that contains the project where the target is defined. diff --git a/Sources/XcodeGraph/Models/ArchiveAction.swift b/Sources/XcodeGraph/Models/ArchiveAction.swift index 7902429b95d..da727bb996d 100644 --- a/Sources/XcodeGraph/Models/ArchiveAction.swift +++ b/Sources/XcodeGraph/Models/ArchiveAction.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct ArchiveAction: Equatable, Codable { // MARK: - Attributes diff --git a/Sources/XcodeGraph/Models/BuildAction.swift b/Sources/XcodeGraph/Models/BuildAction.swift index 792226b78ae..e539571ecba 100644 --- a/Sources/XcodeGraph/Models/BuildAction.swift +++ b/Sources/XcodeGraph/Models/BuildAction.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct BuildAction: Equatable, Codable { // MARK: - Attributes diff --git a/Sources/XcodeGraph/Models/Config.swift b/Sources/XcodeGraph/Models/Config.swift index 388536439da..8c9536c78a9 100644 --- a/Sources/XcodeGraph/Models/Config.swift +++ b/Sources/XcodeGraph/Models/Config.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility /// This model allows to configure Tuist. diff --git a/Sources/XcodeGraph/Models/ConfigGenerationOptions.swift b/Sources/XcodeGraph/Models/ConfigGenerationOptions.swift index c3912c3b184..6431908a14a 100644 --- a/Sources/XcodeGraph/Models/ConfigGenerationOptions.swift +++ b/Sources/XcodeGraph/Models/ConfigGenerationOptions.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TSCUtility extension Config { diff --git a/Sources/XcodeGraph/Models/CopyFileElement.swift b/Sources/XcodeGraph/Models/CopyFileElement.swift index b6a070c13fd..649599e385f 100644 --- a/Sources/XcodeGraph/Models/CopyFileElement.swift +++ b/Sources/XcodeGraph/Models/CopyFileElement.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum CopyFileElement: Equatable, Hashable, Codable { case file(path: AbsolutePath, condition: PlatformCondition? = nil, codeSignOnCopy: Bool = false) diff --git a/Sources/XcodeGraph/Models/CopyFilesAction.swift b/Sources/XcodeGraph/Models/CopyFilesAction.swift index 06318634ca9..d61b35d68e3 100644 --- a/Sources/XcodeGraph/Models/CopyFilesAction.swift +++ b/Sources/XcodeGraph/Models/CopyFilesAction.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct CopyFilesAction: Equatable, Codable { /// Name of the build phase when the project gets generated. diff --git a/Sources/XcodeGraph/Models/CoreDataModel.swift b/Sources/XcodeGraph/Models/CoreDataModel.swift index 4301b6cb0f2..b17b74e293c 100644 --- a/Sources/XcodeGraph/Models/CoreDataModel.swift +++ b/Sources/XcodeGraph/Models/CoreDataModel.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Represents a Core Data model public struct CoreDataModel: Equatable, Codable { diff --git a/Sources/XcodeGraph/Models/Dependencies/SwiftPackageManagerDependencies.swift b/Sources/XcodeGraph/Models/Dependencies/SwiftPackageManagerDependencies.swift index 8aba1fa5614..e61900ab763 100644 --- a/Sources/XcodeGraph/Models/Dependencies/SwiftPackageManagerDependencies.swift +++ b/Sources/XcodeGraph/Models/Dependencies/SwiftPackageManagerDependencies.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum PackagesOrManifest: Equatable { case packages([Package]) diff --git a/Sources/XcodeGraph/Models/ExecutionAction.swift b/Sources/XcodeGraph/Models/ExecutionAction.swift index 9aed0a32944..5c1f97379be 100644 --- a/Sources/XcodeGraph/Models/ExecutionAction.swift +++ b/Sources/XcodeGraph/Models/ExecutionAction.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// A execution action public struct ExecutionAction: Equatable, Codable { diff --git a/Sources/XcodeGraph/Models/FileElement.swift b/Sources/XcodeGraph/Models/FileElement.swift index bb2ed322b87..f7fe037934f 100644 --- a/Sources/XcodeGraph/Models/FileElement.swift +++ b/Sources/XcodeGraph/Models/FileElement.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum FileElement: Equatable, Hashable, Codable { case file(path: AbsolutePath) diff --git a/Sources/XcodeGraph/Models/Headers.swift b/Sources/XcodeGraph/Models/Headers.swift index e78422075f5..85e76eacbb4 100644 --- a/Sources/XcodeGraph/Models/Headers.swift +++ b/Sources/XcodeGraph/Models/Headers.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Headers public struct Headers: Equatable, Codable { diff --git a/Sources/XcodeGraph/Models/Metadata/FrameworkMetadata.swift b/Sources/XcodeGraph/Models/Metadata/FrameworkMetadata.swift index f97de4854a0..d1bf70b626b 100644 --- a/Sources/XcodeGraph/Models/Metadata/FrameworkMetadata.swift +++ b/Sources/XcodeGraph/Models/Metadata/FrameworkMetadata.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// The metadata associated with a precompiled framework (.framework) public struct FrameworkMetadata: Equatable { diff --git a/Sources/XcodeGraph/Models/Metadata/LibraryMetadata.swift b/Sources/XcodeGraph/Models/Metadata/LibraryMetadata.swift index eba1eabc992..c8aad5cc99a 100644 --- a/Sources/XcodeGraph/Models/Metadata/LibraryMetadata.swift +++ b/Sources/XcodeGraph/Models/Metadata/LibraryMetadata.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// The metadata associated with a precompiled library (.a / .dylib) public struct LibraryMetadata: Equatable { diff --git a/Sources/XcodeGraph/Models/Metadata/SystemFrameworkMetadata.swift b/Sources/XcodeGraph/Models/Metadata/SystemFrameworkMetadata.swift index 5055f531e8f..fa82494069c 100644 --- a/Sources/XcodeGraph/Models/Metadata/SystemFrameworkMetadata.swift +++ b/Sources/XcodeGraph/Models/Metadata/SystemFrameworkMetadata.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// The metadata associated with a system framework or library (e.g. UIKit.framework, libc++.tbd) public struct SystemFrameworkMetadata: Equatable { diff --git a/Sources/XcodeGraph/Models/Metadata/XCFrameworkMetadata.swift b/Sources/XcodeGraph/Models/Metadata/XCFrameworkMetadata.swift index 21e78ffd11d..707bfa74ae8 100644 --- a/Sources/XcodeGraph/Models/Metadata/XCFrameworkMetadata.swift +++ b/Sources/XcodeGraph/Models/Metadata/XCFrameworkMetadata.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// The metadata associated with a precompiled xcframework public struct XCFrameworkMetadata: Equatable { diff --git a/Sources/XcodeGraph/Models/Package.swift b/Sources/XcodeGraph/Models/Package.swift index 18847fcadbc..ac4aab84164 100644 --- a/Sources/XcodeGraph/Models/Package.swift +++ b/Sources/XcodeGraph/Models/Package.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum Package: Equatable, Codable { case remote(url: String, requirement: Requirement) diff --git a/Sources/XcodeGraph/Models/PlatformCondition.swift b/Sources/XcodeGraph/Models/PlatformCondition.swift index 1833efeb18a..9709766f436 100644 --- a/Sources/XcodeGraph/Models/PlatformCondition.swift +++ b/Sources/XcodeGraph/Models/PlatformCondition.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct PlatformCondition: Codable, Hashable, Equatable, Comparable { public static func < (lhs: PlatformCondition, rhs: PlatformCondition) -> Bool { diff --git a/Sources/XcodeGraph/Models/Plist.swift b/Sources/XcodeGraph/Models/Plist.swift index 4d0ee174cc5..1ac2ff82ab2 100644 --- a/Sources/XcodeGraph/Models/Plist.swift +++ b/Sources/XcodeGraph/Models/Plist.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path // MARK: - Plist diff --git a/Sources/XcodeGraph/Models/Plugin.swift b/Sources/XcodeGraph/Models/Plugin.swift index 4125503d171..e43cb18ea02 100644 --- a/Sources/XcodeGraph/Models/Plugin.swift +++ b/Sources/XcodeGraph/Models/Plugin.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// A `Plugin` used to extend Tuist. public struct Plugin: Equatable, Hashable { diff --git a/Sources/XcodeGraph/Models/PluginResourceSynthesizer.swift b/Sources/XcodeGraph/Models/PluginResourceSynthesizer.swift index 2137b86d707..65409941b5b 100644 --- a/Sources/XcodeGraph/Models/PluginResourceSynthesizer.swift +++ b/Sources/XcodeGraph/Models/PluginResourceSynthesizer.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Resource synthesizer plugin model public struct PluginResourceSynthesizer: Equatable { diff --git a/Sources/XcodeGraph/Models/Plugins.swift b/Sources/XcodeGraph/Models/Plugins.swift index 7f14b5c394a..61424933a7e 100644 --- a/Sources/XcodeGraph/Models/Plugins.swift +++ b/Sources/XcodeGraph/Models/Plugins.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// A model which contains all loaded plugin representations. public struct Plugins: Equatable { diff --git a/Sources/XcodeGraph/Models/Project.swift b/Sources/XcodeGraph/Models/Project.swift index 078b184b2a3..1cd9b2c6619 100644 --- a/Sources/XcodeGraph/Models/Project.swift +++ b/Sources/XcodeGraph/Models/Project.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility public struct Project: Hashable, Equatable, CustomStringConvertible, CustomDebugStringConvertible, Codable { diff --git a/Sources/XcodeGraph/Models/ProjectDescriptionHelpersPlugin.swift b/Sources/XcodeGraph/Models/ProjectDescriptionHelpersPlugin.swift index f81cf5ecfb4..2301a321164 100644 --- a/Sources/XcodeGraph/Models/ProjectDescriptionHelpersPlugin.swift +++ b/Sources/XcodeGraph/Models/ProjectDescriptionHelpersPlugin.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// A model representing a custom `ProjectDescription` helper. public struct ProjectDescriptionHelpersPlugin: Equatable { diff --git a/Sources/XcodeGraph/Models/RawScriptBuildPhase.swift b/Sources/XcodeGraph/Models/RawScriptBuildPhase.swift index 63c337ad922..a1588453550 100644 --- a/Sources/XcodeGraph/Models/RawScriptBuildPhase.swift +++ b/Sources/XcodeGraph/Models/RawScriptBuildPhase.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// It represents a raw script build phase. public struct RawScriptBuildPhase: Equatable, Codable { diff --git a/Sources/XcodeGraph/Models/ResourceFileElement.swift b/Sources/XcodeGraph/Models/ResourceFileElement.swift index d76aefd6593..5023f01e0d6 100644 --- a/Sources/XcodeGraph/Models/ResourceFileElement.swift +++ b/Sources/XcodeGraph/Models/ResourceFileElement.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum ResourceFileElement: Equatable, Hashable, Codable { /// A file path (or glob pattern) to include, a list of file paths (or glob patterns) to exclude, ODR tags list and inclusion diff --git a/Sources/XcodeGraph/Models/ResourceSynthesizer.swift b/Sources/XcodeGraph/Models/ResourceSynthesizer.swift index 9905c3759a6..67a5e5ac841 100644 --- a/Sources/XcodeGraph/Models/ResourceSynthesizer.swift +++ b/Sources/XcodeGraph/Models/ResourceSynthesizer.swift @@ -1,6 +1,6 @@ import AnyCodable import Foundation -import TSCBasic +import Path public struct ResourceSynthesizer: Equatable, Hashable, Codable { public let parser: Parser diff --git a/Sources/XcodeGraph/Models/RunAction.swift b/Sources/XcodeGraph/Models/RunAction.swift index 0c16a2247ef..a7ac3aa9934 100644 --- a/Sources/XcodeGraph/Models/RunAction.swift +++ b/Sources/XcodeGraph/Models/RunAction.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct RunAction: Equatable, Codable { // MARK: - Attributes diff --git a/Sources/XcodeGraph/Models/RunActionOptions.swift b/Sources/XcodeGraph/Models/RunActionOptions.swift index 3fe6dc8d5e4..5cae4294ac3 100644 --- a/Sources/XcodeGraph/Models/RunActionOptions.swift +++ b/Sources/XcodeGraph/Models/RunActionOptions.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// Options for the `RunAction` action public struct RunActionOptions: Equatable, Codable { diff --git a/Sources/XcodeGraph/Models/Scheme.swift b/Sources/XcodeGraph/Models/Scheme.swift index 4e1716fd53e..8440cd14aa3 100644 --- a/Sources/XcodeGraph/Models/Scheme.swift +++ b/Sources/XcodeGraph/Models/Scheme.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct Scheme: Equatable, Codable { // MARK: - Attributes diff --git a/Sources/XcodeGraph/Models/Settings.swift b/Sources/XcodeGraph/Models/Settings.swift index cd4876921f6..8e103c3da74 100644 --- a/Sources/XcodeGraph/Models/Settings.swift +++ b/Sources/XcodeGraph/Models/Settings.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public typealias SettingsDictionary = [String: SettingValue] diff --git a/Sources/XcodeGraph/Models/SimulatedLocation.swift b/Sources/XcodeGraph/Models/SimulatedLocation.swift index 587cc2d43a5..0840c6ed583 100644 --- a/Sources/XcodeGraph/Models/SimulatedLocation.swift +++ b/Sources/XcodeGraph/Models/SimulatedLocation.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum SimulatedLocation { case gpxFile(AbsolutePath) diff --git a/Sources/XcodeGraph/Models/SourceFile.swift b/Sources/XcodeGraph/Models/SourceFile.swift index b80872afc46..9defe25d3f2 100644 --- a/Sources/XcodeGraph/Models/SourceFile.swift +++ b/Sources/XcodeGraph/Models/SourceFile.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// A type that represents a source file. public struct SourceFile: ExpressibleByStringLiteral, Equatable, Codable { diff --git a/Sources/XcodeGraph/Models/Target.swift b/Sources/XcodeGraph/Models/Target.swift index f091e803a94..0216454d2ff 100644 --- a/Sources/XcodeGraph/Models/Target.swift +++ b/Sources/XcodeGraph/Models/Target.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path // swiftlint:disable:next type_body_length public struct Target: Equatable, Hashable, Comparable, Codable { diff --git a/Sources/XcodeGraph/Models/TargetDependency.swift b/Sources/XcodeGraph/Models/TargetDependency.swift index bfee06a3669..05763bc0003 100644 --- a/Sources/XcodeGraph/Models/TargetDependency.swift +++ b/Sources/XcodeGraph/Models/TargetDependency.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public enum FrameworkStatus: String, Hashable, Codable { case required diff --git a/Sources/XcodeGraph/Models/TargetReference.swift b/Sources/XcodeGraph/Models/TargetReference.swift index d6c13eb84e6..5ff8b4d76fa 100644 --- a/Sources/XcodeGraph/Models/TargetReference.swift +++ b/Sources/XcodeGraph/Models/TargetReference.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct TargetReference: Hashable, Codable { public var projectPath: AbsolutePath diff --git a/Sources/XcodeGraph/Models/TargetScript.swift b/Sources/XcodeGraph/Models/TargetScript.swift index a32b82fb043..a9cf89a567f 100644 --- a/Sources/XcodeGraph/Models/TargetScript.swift +++ b/Sources/XcodeGraph/Models/TargetScript.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// It represents a target script build phase public struct TargetScript: Equatable, Codable { diff --git a/Sources/XcodeGraph/Models/Template.swift b/Sources/XcodeGraph/Models/Template.swift index 33073447bc3..b266d05c5e4 100644 --- a/Sources/XcodeGraph/Models/Template.swift +++ b/Sources/XcodeGraph/Models/Template.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path public struct Template: Equatable { public let description: String diff --git a/Sources/XcodeGraph/Models/TestAction.swift b/Sources/XcodeGraph/Models/TestAction.swift index ee12892f46f..501251afa70 100644 --- a/Sources/XcodeGraph/Models/TestAction.swift +++ b/Sources/XcodeGraph/Models/TestAction.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct TestAction: Equatable, Codable { // MARK: - Attributes diff --git a/Sources/XcodeGraph/Models/TestPlan.swift b/Sources/XcodeGraph/Models/TestPlan.swift index aa5b7ee7a62..341603ae3b4 100644 --- a/Sources/XcodeGraph/Models/TestPlan.swift +++ b/Sources/XcodeGraph/Models/TestPlan.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path public struct TestPlan: Hashable, Codable { public let name: String diff --git a/Sources/XcodeGraph/Models/Workspace.swift b/Sources/XcodeGraph/Models/Workspace.swift index 13a3252d6b9..b384e31127a 100644 --- a/Sources/XcodeGraph/Models/Workspace.swift +++ b/Sources/XcodeGraph/Models/Workspace.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility public struct Workspace: Equatable, Codable { diff --git a/Sources/XcodeGraph/Models/XCFrameworkInfoPlist.swift b/Sources/XcodeGraph/Models/XCFrameworkInfoPlist.swift index e7b7986f208..27b56a1f675 100644 --- a/Sources/XcodeGraph/Models/XCFrameworkInfoPlist.swift +++ b/Sources/XcodeGraph/Models/XCFrameworkInfoPlist.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path /// It represents th Info.plist contained in an .xcframework bundle. public struct XCFrameworkInfoPlist: Codable, Hashable, Equatable { diff --git a/Sources/XcodeGraphTesting/DependenciesGraph/DependenciesGraph+TestData.swift b/Sources/XcodeGraphTesting/DependenciesGraph/DependenciesGraph+TestData.swift index 9d32c78031a..fe51b9b2970 100644 --- a/Sources/XcodeGraphTesting/DependenciesGraph/DependenciesGraph+TestData.swift +++ b/Sources/XcodeGraphTesting/DependenciesGraph/DependenciesGraph+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph extension DependenciesGraph { diff --git a/Sources/XcodeGraphTesting/Graph/Graph+TestData.swift b/Sources/XcodeGraphTesting/Graph/Graph+TestData.swift index 461de49a9ce..266b1c0c126 100644 --- a/Sources/XcodeGraphTesting/Graph/Graph+TestData.swift +++ b/Sources/XcodeGraphTesting/Graph/Graph+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph extension Graph { diff --git a/Sources/XcodeGraphTesting/Graph/GraphDependency+TestData.swift b/Sources/XcodeGraphTesting/Graph/GraphDependency+TestData.swift index aa88cb56cbe..8373926c6a8 100644 --- a/Sources/XcodeGraphTesting/Graph/GraphDependency+TestData.swift +++ b/Sources/XcodeGraphTesting/Graph/GraphDependency+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Graph/GraphTarget+TestData.swift b/Sources/XcodeGraphTesting/Graph/GraphTarget+TestData.swift index 7cec4e07702..5bf7fc67822 100644 --- a/Sources/XcodeGraphTesting/Graph/GraphTarget+TestData.swift +++ b/Sources/XcodeGraphTesting/Graph/GraphTarget+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/AnalyzeAction+TestData.swift b/Sources/XcodeGraphTesting/Models/AnalyzeAction+TestData.swift index 8a27641f79e..28e1b7edb24 100644 --- a/Sources/XcodeGraphTesting/Models/AnalyzeAction+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/AnalyzeAction+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension AnalyzeAction { diff --git a/Sources/XcodeGraphTesting/Models/ArchiveAction+TestData.swift b/Sources/XcodeGraphTesting/Models/ArchiveAction+TestData.swift index d6019597148..0e1e91569ee 100644 --- a/Sources/XcodeGraphTesting/Models/ArchiveAction+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/ArchiveAction+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension ArchiveAction { diff --git a/Sources/XcodeGraphTesting/Models/Arguments+TestData.swift b/Sources/XcodeGraphTesting/Models/Arguments+TestData.swift index ee73f55e01d..ed2d6c956bb 100644 --- a/Sources/XcodeGraphTesting/Models/Arguments+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Arguments+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension Arguments { diff --git a/Sources/XcodeGraphTesting/Models/BuildAction+TestData.swift b/Sources/XcodeGraphTesting/Models/BuildAction+TestData.swift index 15cc81c7c5c..b361b92e127 100644 --- a/Sources/XcodeGraphTesting/Models/BuildAction+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/BuildAction+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Cloud+TestData.swift b/Sources/XcodeGraphTesting/Models/Cloud+TestData.swift index 1a2ad042ca0..06bebd38e9e 100644 --- a/Sources/XcodeGraphTesting/Models/Cloud+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Cloud+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupportTesting @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Config+TestData.swift b/Sources/XcodeGraphTesting/Models/Config+TestData.swift index 7c088cae876..a62d32b5831 100644 --- a/Sources/XcodeGraphTesting/Models/Config+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Config+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Headers+TestData.swift b/Sources/XcodeGraphTesting/Models/Headers+TestData.swift index 868bcc86915..4a6641b54ea 100644 --- a/Sources/XcodeGraphTesting/Models/Headers+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Headers+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension Headers { diff --git a/Sources/XcodeGraphTesting/Models/Metadata/FrameworkMetadata+TestData.swift b/Sources/XcodeGraphTesting/Models/Metadata/FrameworkMetadata+TestData.swift index 5756b7dc4b4..6a016067547 100644 --- a/Sources/XcodeGraphTesting/Models/Metadata/FrameworkMetadata+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Metadata/FrameworkMetadata+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Metadata/LibraryMetadata+TestData.swift b/Sources/XcodeGraphTesting/Models/Metadata/LibraryMetadata+TestData.swift index 72b724f6584..266cddc1ed6 100644 --- a/Sources/XcodeGraphTesting/Models/Metadata/LibraryMetadata+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Metadata/LibraryMetadata+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Metadata/XCFrameworkMetadata+TestData.swift b/Sources/XcodeGraphTesting/Models/Metadata/XCFrameworkMetadata+TestData.swift index f67941869fe..c9ad0312fb1 100644 --- a/Sources/XcodeGraphTesting/Models/Metadata/XCFrameworkMetadata+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Metadata/XCFrameworkMetadata+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/PackageSettings+TestData.swift b/Sources/XcodeGraphTesting/Models/PackageSettings+TestData.swift index 5d9b9193c64..cfef21cb722 100644 --- a/Sources/XcodeGraphTesting/Models/PackageSettings+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/PackageSettings+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Plugins+TestData.swift b/Sources/XcodeGraphTesting/Models/Plugins+TestData.swift index c74be3e5ee1..073b0ad7b81 100644 --- a/Sources/XcodeGraphTesting/Models/Plugins+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Plugins+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension Plugins { diff --git a/Sources/XcodeGraphTesting/Models/ProfileAction+TestData.swift b/Sources/XcodeGraphTesting/Models/ProfileAction+TestData.swift index 0cb6d978772..18e352ba23d 100644 --- a/Sources/XcodeGraphTesting/Models/ProfileAction+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/ProfileAction+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Project+TestData.swift b/Sources/XcodeGraphTesting/Models/Project+TestData.swift index 56791acd3e6..14c83e8f6f4 100644 --- a/Sources/XcodeGraphTesting/Models/Project+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Project+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/RawScriptBuildPhase+TestData.swift b/Sources/XcodeGraphTesting/Models/RawScriptBuildPhase+TestData.swift index f3039d3e22f..4ed99315d93 100644 --- a/Sources/XcodeGraphTesting/Models/RawScriptBuildPhase+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/RawScriptBuildPhase+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension RawScriptBuildPhase { diff --git a/Sources/XcodeGraphTesting/Models/ResourceSynthesizerPlugin+TestData.swift b/Sources/XcodeGraphTesting/Models/ResourceSynthesizerPlugin+TestData.swift index e90b4670499..a2e33ac2d09 100644 --- a/Sources/XcodeGraphTesting/Models/ResourceSynthesizerPlugin+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/ResourceSynthesizerPlugin+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension PluginResourceSynthesizer { diff --git a/Sources/XcodeGraphTesting/Models/RunAction+TestData.swift b/Sources/XcodeGraphTesting/Models/RunAction+TestData.swift index 3b475940f48..03c5b69bda0 100644 --- a/Sources/XcodeGraphTesting/Models/RunAction+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/RunAction+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Scheme+TestData.swift b/Sources/XcodeGraphTesting/Models/Scheme+TestData.swift index ca88b08c5f0..4a9b51f8067 100644 --- a/Sources/XcodeGraphTesting/Models/Scheme+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Scheme+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension Scheme { diff --git a/Sources/XcodeGraphTesting/Models/Settings+TestData.swift b/Sources/XcodeGraphTesting/Models/Settings+TestData.swift index 667ad9c058a..950a79ad5ba 100644 --- a/Sources/XcodeGraphTesting/Models/Settings+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Settings+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension Configuration { diff --git a/Sources/XcodeGraphTesting/Models/Target+TestData.swift b/Sources/XcodeGraphTesting/Models/Target+TestData.swift index 4ef04acd660..ca648e6e495 100644 --- a/Sources/XcodeGraphTesting/Models/Target+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Target+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension Target { diff --git a/Sources/XcodeGraphTesting/Models/Template+TestData.swift b/Sources/XcodeGraphTesting/Models/Template+TestData.swift index 641aaf6e79c..020b6abdac0 100644 --- a/Sources/XcodeGraphTesting/Models/Template+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Template+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph extension Template { diff --git a/Sources/XcodeGraphTesting/Models/TestAction+TestData.swift b/Sources/XcodeGraphTesting/Models/TestAction+TestData.swift index a9e6ed85c5b..1459baaa4b1 100644 --- a/Sources/XcodeGraphTesting/Models/TestAction+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/TestAction+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/TestableTarget+TestData.swift b/Sources/XcodeGraphTesting/Models/TestableTarget+TestData.swift index 0b619a9a3bf..ef3a8ad6235 100644 --- a/Sources/XcodeGraphTesting/Models/TestableTarget+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/TestableTarget+TestData.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/Workspace+TestData.swift b/Sources/XcodeGraphTesting/Models/Workspace+TestData.swift index e9b21f50158..f197dafdc68 100644 --- a/Sources/XcodeGraphTesting/Models/Workspace+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/Workspace+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility @testable import XcodeGraph diff --git a/Sources/XcodeGraphTesting/Models/XCFrameworkInfoPlist+TestData.swift b/Sources/XcodeGraphTesting/Models/XCFrameworkInfoPlist+TestData.swift index de07ffa98aa..832f09e2676 100644 --- a/Sources/XcodeGraphTesting/Models/XCFrameworkInfoPlist+TestData.swift +++ b/Sources/XcodeGraphTesting/Models/XCFrameworkInfoPlist+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import XcodeGraph diff --git a/Sources/tuist/TuistApp.swift b/Sources/tuist/TuistApp.swift index dd85126e99a..d001200ec6a 100644 --- a/Sources/tuist/TuistApp.swift +++ b/Sources/tuist/TuistApp.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import TuistKit import TuistLoader diff --git a/Sources/tuistbenchmark/Benchmark/Measure.swift b/Sources/tuistbenchmark/Benchmark/Measure.swift index 98208a2c9d0..d3872b0f112 100644 --- a/Sources/tuistbenchmark/Benchmark/Measure.swift +++ b/Sources/tuistbenchmark/Benchmark/Measure.swift @@ -1,5 +1,6 @@ import Foundation import TSCBasic +import TSCUtility struct MeasureResult { var fixture: String @@ -49,6 +50,7 @@ final class Measure { fixturePath: AbsolutePath ) throws -> [TimeInterval] { try (0 ..< runs).map { _ in + try withTemporaryDirectory(removeTreeOnDeinit: true) { temporaryDirectoryPath in let temporaryPath = temporaryDirectoryPath.appending(component: "fixture") try fileHandler.copy(path: fixturePath, to: temporaryPath) diff --git a/Sources/tuistbenchmark/main.swift b/Sources/tuistbenchmark/main.swift index 0f82ad68d27..ec2ee192ad8 100644 --- a/Sources/tuistbenchmark/main.swift +++ b/Sources/tuistbenchmark/main.swift @@ -1,6 +1,6 @@ import ArgumentParser import Foundation -import TSCBasic +import Path import TSCUtility public struct TuistBenchmarkCommand: ParsableCommand { diff --git a/Sources/tuistfixturegenerator/Generator/Generator.swift b/Sources/tuistfixturegenerator/Generator/Generator.swift index cd868cad6a3..62c68870b1e 100644 --- a/Sources/tuistfixturegenerator/Generator/Generator.swift +++ b/Sources/tuistfixturegenerator/Generator/Generator.swift @@ -1,5 +1,6 @@ import Foundation import TSCBasic +import TSCUtility class Generator { private let fileSystem: FileSystem diff --git a/Sources/tuistfixturegenerator/main.swift b/Sources/tuistfixturegenerator/main.swift index aec25e2eedb..7278c9169d2 100644 --- a/Sources/tuistfixturegenerator/main.swift +++ b/Sources/tuistfixturegenerator/main.swift @@ -1,7 +1,5 @@ import ArgumentParser import Foundation -import TSCBasic -import TSCUtility public struct TuistFixtureGeneratorCommand: ParsableCommand { public init() {} diff --git a/Tests/TuistAcceptanceTests/BuildRulesAcceptanceTests.swift b/Tests/TuistAcceptanceTests/BuildRulesAcceptanceTests.swift index 64b09951dd8..56419118434 100644 --- a/Tests/TuistAcceptanceTests/BuildRulesAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/BuildRulesAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAcceptanceTests/EditAcceptanceTests.swift b/Tests/TuistAcceptanceTests/EditAcceptanceTests.swift index 8a58dfda32a..920fce49ad8 100644 --- a/Tests/TuistAcceptanceTests/EditAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/EditAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAcceptanceTests/GraphAcceptanceTests.swift b/Tests/TuistAcceptanceTests/GraphAcceptanceTests.swift index 1c35777faf2..e356963662c 100644 --- a/Tests/TuistAcceptanceTests/GraphAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/GraphAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAcceptanceTests/InitAcceptanceTests.swift b/Tests/TuistAcceptanceTests/InitAcceptanceTests.swift index 78e3cde6a38..3ff034dbcf4 100644 --- a/Tests/TuistAcceptanceTests/InitAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/InitAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAcceptanceTests/ListTargetsAcceptanceTests.swift b/Tests/TuistAcceptanceTests/ListTargetsAcceptanceTests.swift index 370d3d426ac..3bf693ef7cd 100644 --- a/Tests/TuistAcceptanceTests/ListTargetsAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/ListTargetsAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAcceptanceTests/PluginAcceptanceTests.swift b/Tests/TuistAcceptanceTests/PluginAcceptanceTests.swift index 58b96a3f342..cb27df59c7e 100644 --- a/Tests/TuistAcceptanceTests/PluginAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/PluginAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAcceptanceTests/PrecompiledAcceptanceTests.swift b/Tests/TuistAcceptanceTests/PrecompiledAcceptanceTests.swift index 4001a1dcf1c..8982dfce6ef 100644 --- a/Tests/TuistAcceptanceTests/PrecompiledAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/PrecompiledAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAcceptanceTests/RunAcceptanceTests.swift b/Tests/TuistAcceptanceTests/RunAcceptanceTests.swift index 9348443ba3a..73765f73eab 100644 --- a/Tests/TuistAcceptanceTests/RunAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/RunAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAcceptanceTests/ScaffoldAcceptanceTests.swift b/Tests/TuistAcceptanceTests/ScaffoldAcceptanceTests.swift index 2c330b3c38f..d745dc91a89 100644 --- a/Tests/TuistAcceptanceTests/ScaffoldAcceptanceTests.swift +++ b/Tests/TuistAcceptanceTests/ScaffoldAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistAsyncQueueTests/AsyncQueuePersistorTests.swift b/Tests/TuistAsyncQueueTests/AsyncQueuePersistorTests.swift index 9c8f3aa5419..f8f97b924f1 100644 --- a/Tests/TuistAsyncQueueTests/AsyncQueuePersistorTests.swift +++ b/Tests/TuistAsyncQueueTests/AsyncQueuePersistorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistAutomationAcceptanceTests/BuildAcceptanceTests.swift b/Tests/TuistAutomationAcceptanceTests/BuildAcceptanceTests.swift index 625870976ac..4d0e96a2bf5 100644 --- a/Tests/TuistAutomationAcceptanceTests/BuildAcceptanceTests.swift +++ b/Tests/TuistAutomationAcceptanceTests/BuildAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import XCTest diff --git a/Tests/TuistAutomationAcceptanceTests/TestAcceptanceTests.swift b/Tests/TuistAutomationAcceptanceTests/TestAcceptanceTests.swift index f6c65210e6c..c167fba980d 100644 --- a/Tests/TuistAutomationAcceptanceTests/TestAcceptanceTests.swift +++ b/Tests/TuistAutomationAcceptanceTests/TestAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import XCTest diff --git a/Tests/TuistAutomationIntegrationTests/Simulator/SimulatorControllerIntegrationTests.swift b/Tests/TuistAutomationIntegrationTests/Simulator/SimulatorControllerIntegrationTests.swift index 2e012b8bb4e..af05c2297ff 100644 --- a/Tests/TuistAutomationIntegrationTests/Simulator/SimulatorControllerIntegrationTests.swift +++ b/Tests/TuistAutomationIntegrationTests/Simulator/SimulatorControllerIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistAutomationIntegrationTests/XcodeBuild/XcodeBuildControllerIntegrationTests.swift b/Tests/TuistAutomationIntegrationTests/XcodeBuild/XcodeBuildControllerIntegrationTests.swift index 8e35143e554..6d3bb7aa84c 100644 --- a/Tests/TuistAutomationIntegrationTests/XcodeBuild/XcodeBuildControllerIntegrationTests.swift +++ b/Tests/TuistAutomationIntegrationTests/XcodeBuild/XcodeBuildControllerIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistCoreIntegrationTests/MetadataProviders/FrameworkMetadataProviderIntegrationTests.swift b/Tests/TuistCoreIntegrationTests/MetadataProviders/FrameworkMetadataProviderIntegrationTests.swift index 7f5c6ddcbaf..5df880ae7de 100644 --- a/Tests/TuistCoreIntegrationTests/MetadataProviders/FrameworkMetadataProviderIntegrationTests.swift +++ b/Tests/TuistCoreIntegrationTests/MetadataProviders/FrameworkMetadataProviderIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistCoreIntegrationTests/MetadataProviders/PrecompiledMetadataProviderIntegrationTests.swift b/Tests/TuistCoreIntegrationTests/MetadataProviders/PrecompiledMetadataProviderIntegrationTests.swift index ed1477183dd..cb9b445f0c7 100644 --- a/Tests/TuistCoreIntegrationTests/MetadataProviders/PrecompiledMetadataProviderIntegrationTests.swift +++ b/Tests/TuistCoreIntegrationTests/MetadataProviders/PrecompiledMetadataProviderIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistCoreIntegrationTests/RootDirectoryLocatorIntegrationTests.swift b/Tests/TuistCoreIntegrationTests/RootDirectoryLocatorIntegrationTests.swift index 6369723913d..203cd995e4b 100644 --- a/Tests/TuistCoreIntegrationTests/RootDirectoryLocatorIntegrationTests.swift +++ b/Tests/TuistCoreIntegrationTests/RootDirectoryLocatorIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistCoreTests/Automation/XcodeBuildArgumentTests.swift b/Tests/TuistCoreTests/Automation/XcodeBuildArgumentTests.swift index 4401b0b13c7..48196dd18c5 100644 --- a/Tests/TuistCoreTests/Automation/XcodeBuildArgumentTests.swift +++ b/Tests/TuistCoreTests/Automation/XcodeBuildArgumentTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistCore @testable import TuistSupportTesting diff --git a/Tests/TuistCoreTests/Automation/XcodeBuildTargetTests.swift b/Tests/TuistCoreTests/Automation/XcodeBuildTargetTests.swift index 3a986521093..b977acfa4ac 100644 --- a/Tests/TuistCoreTests/Automation/XcodeBuildTargetTests.swift +++ b/Tests/TuistCoreTests/Automation/XcodeBuildTargetTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistCoreTests/ContentHashing/ContentHasherTests.swift b/Tests/TuistCoreTests/ContentHashing/ContentHasherTests.swift index bab699cc2a5..c09a03bb0c4 100644 --- a/Tests/TuistCoreTests/ContentHashing/ContentHasherTests.swift +++ b/Tests/TuistCoreTests/ContentHashing/ContentHasherTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/Graph/CircularDependencyLinterTests.swift b/Tests/TuistCoreTests/Graph/CircularDependencyLinterTests.swift index 823fbb58f8a..4a83019248b 100644 --- a/Tests/TuistCoreTests/Graph/CircularDependencyLinterTests.swift +++ b/Tests/TuistCoreTests/Graph/CircularDependencyLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph import XCTest diff --git a/Tests/TuistCoreTests/Graph/GraphDependencyReferenceTests.swift b/Tests/TuistCoreTests/Graph/GraphDependencyReferenceTests.swift index 9638abf7b83..8fd067b6382 100644 --- a/Tests/TuistCoreTests/Graph/GraphDependencyReferenceTests.swift +++ b/Tests/TuistCoreTests/Graph/GraphDependencyReferenceTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistCoreTests/Graph/GraphDependencyTests.swift b/Tests/TuistCoreTests/Graph/GraphDependencyTests.swift index c5e3d2ede3f..0a05d977d42 100644 --- a/Tests/TuistCoreTests/Graph/GraphDependencyTests.swift +++ b/Tests/TuistCoreTests/Graph/GraphDependencyTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/Graph/GraphLoaderTests.swift b/Tests/TuistCoreTests/Graph/GraphLoaderTests.swift index 38a7b7ced17..51886be5011 100644 --- a/Tests/TuistCoreTests/Graph/GraphLoaderTests.swift +++ b/Tests/TuistCoreTests/Graph/GraphLoaderTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph import XCTest diff --git a/Tests/TuistCoreTests/Graph/GraphLoadingErrorTests.swift b/Tests/TuistCoreTests/Graph/GraphLoadingErrorTests.swift index efbab6e12bc..52731dfc1e4 100644 --- a/Tests/TuistCoreTests/Graph/GraphLoadingErrorTests.swift +++ b/Tests/TuistCoreTests/Graph/GraphLoadingErrorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/Graph/GraphTargetTests.swift b/Tests/TuistCoreTests/Graph/GraphTargetTests.swift index 9fbb1af7c0e..5c0a59f9256 100644 --- a/Tests/TuistCoreTests/Graph/GraphTargetTests.swift +++ b/Tests/TuistCoreTests/Graph/GraphTargetTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/Graph/GraphTraverserTests.swift b/Tests/TuistCoreTests/Graph/GraphTraverserTests.swift index 7fb7fa35aef..ec2956f0d03 100644 --- a/Tests/TuistCoreTests/Graph/GraphTraverserTests.swift +++ b/Tests/TuistCoreTests/Graph/GraphTraverserTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph import XCTest diff --git a/Tests/TuistCoreTests/Graph/Mappers/GraphMapperTests.swift b/Tests/TuistCoreTests/Graph/Mappers/GraphMapperTests.swift index 78d25693448..146aa22051a 100644 --- a/Tests/TuistCoreTests/Graph/Mappers/GraphMapperTests.swift +++ b/Tests/TuistCoreTests/Graph/Mappers/GraphMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Tests/TuistCoreTests/Graph/Mappers/ProjectMapperTests.swift b/Tests/TuistCoreTests/Graph/Mappers/ProjectMapperTests.swift index b3f7f05b964..89e4be55f77 100644 --- a/Tests/TuistCoreTests/Graph/Mappers/ProjectMapperTests.swift +++ b/Tests/TuistCoreTests/Graph/Mappers/ProjectMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Tests/TuistCoreTests/Graph/Mappers/WorkspaceMapperTests.swift b/Tests/TuistCoreTests/Graph/Mappers/WorkspaceMapperTests.swift index 0d21abe64c8..dbf6d0f7761 100644 --- a/Tests/TuistCoreTests/Graph/Mappers/WorkspaceMapperTests.swift +++ b/Tests/TuistCoreTests/Graph/Mappers/WorkspaceMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Tests/TuistCoreTests/MetadataProviders/FrameworkMetadataProviderTests.swift b/Tests/TuistCoreTests/MetadataProviders/FrameworkMetadataProviderTests.swift index fcabeeb31ea..d64edcc65b4 100644 --- a/Tests/TuistCoreTests/MetadataProviders/FrameworkMetadataProviderTests.swift +++ b/Tests/TuistCoreTests/MetadataProviders/FrameworkMetadataProviderTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import XcodeGraph import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/MetadataProviders/LibraryMetadataProviderTests.swift b/Tests/TuistCoreTests/MetadataProviders/LibraryMetadataProviderTests.swift index 67a4dab76f7..188e91160b7 100644 --- a/Tests/TuistCoreTests/MetadataProviders/LibraryMetadataProviderTests.swift +++ b/Tests/TuistCoreTests/MetadataProviders/LibraryMetadataProviderTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import XcodeGraph import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/MetadataProviders/PrecompiledMetadataProviderTests.swift b/Tests/TuistCoreTests/MetadataProviders/PrecompiledMetadataProviderTests.swift index d79d7601494..94139c98400 100644 --- a/Tests/TuistCoreTests/MetadataProviders/PrecompiledMetadataProviderTests.swift +++ b/Tests/TuistCoreTests/MetadataProviders/PrecompiledMetadataProviderTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph import XCTest diff --git a/Tests/TuistCoreTests/MetadataProviders/SystemFrameworkMetadataProviderTests.swift b/Tests/TuistCoreTests/MetadataProviders/SystemFrameworkMetadataProviderTests.swift index 32dc4a4fa12..56547d6b9f3 100644 --- a/Tests/TuistCoreTests/MetadataProviders/SystemFrameworkMetadataProviderTests.swift +++ b/Tests/TuistCoreTests/MetadataProviders/SystemFrameworkMetadataProviderTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import XcodeGraph import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/MetadataProviders/XCFrameworkMetadataProviderTests.swift b/Tests/TuistCoreTests/MetadataProviders/XCFrameworkMetadataProviderTests.swift index 95eee7306b3..145f8af6266 100644 --- a/Tests/TuistCoreTests/MetadataProviders/XCFrameworkMetadataProviderTests.swift +++ b/Tests/TuistCoreTests/MetadataProviders/XCFrameworkMetadataProviderTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import XCTest @testable import TuistCore @testable import TuistSupportTesting diff --git a/Tests/TuistCoreTests/NodeLoaders/FrameworkLoaderTests.swift b/Tests/TuistCoreTests/NodeLoaders/FrameworkLoaderTests.swift index fd203ac4cbf..57730f95324 100644 --- a/Tests/TuistCoreTests/NodeLoaders/FrameworkLoaderTests.swift +++ b/Tests/TuistCoreTests/NodeLoaders/FrameworkLoaderTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import XcodeGraph import XCTest diff --git a/Tests/TuistCoreTests/NodeLoaders/XCFrameworkLoaderTests.swift b/Tests/TuistCoreTests/NodeLoaders/XCFrameworkLoaderTests.swift index 890ae68314a..2534f9d7c6e 100644 --- a/Tests/TuistCoreTests/NodeLoaders/XCFrameworkLoaderTests.swift +++ b/Tests/TuistCoreTests/NodeLoaders/XCFrameworkLoaderTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import XcodeGraph import XCTest diff --git a/Tests/TuistCoreTests/Simulator/SimulatorControllerTests.swift b/Tests/TuistCoreTests/Simulator/SimulatorControllerTests.swift index 72bbd8dfdbb..14d1081a418 100644 --- a/Tests/TuistCoreTests/Simulator/SimulatorControllerTests.swift +++ b/Tests/TuistCoreTests/Simulator/SimulatorControllerTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/Utils/GraphCircularDetectorTests.swift b/Tests/TuistCoreTests/Utils/GraphCircularDetectorTests.swift index c10cf9207ba..83d82362fe0 100644 --- a/Tests/TuistCoreTests/Utils/GraphCircularDetectorTests.swift +++ b/Tests/TuistCoreTests/Utils/GraphCircularDetectorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistCore diff --git a/Tests/TuistCoreTests/Utils/XcodeProjectBuildDirectoryLocatorTests.swift b/Tests/TuistCoreTests/Utils/XcodeProjectBuildDirectoryLocatorTests.swift index 794c9724f18..eef120a4d7d 100644 --- a/Tests/TuistCoreTests/Utils/XcodeProjectBuildDirectoryLocatorTests.swift +++ b/Tests/TuistCoreTests/Utils/XcodeProjectBuildDirectoryLocatorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupportTesting import XCTest diff --git a/Tests/TuistDependenciesAcceptanceTests/DependenciesAcceptanceTests.swift b/Tests/TuistDependenciesAcceptanceTests/DependenciesAcceptanceTests.swift index f87a4dcaeb9..e477a75b6ee 100644 --- a/Tests/TuistDependenciesAcceptanceTests/DependenciesAcceptanceTests.swift +++ b/Tests/TuistDependenciesAcceptanceTests/DependenciesAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistDependenciesTests/Mappers/ExternalDependencyPathWorkspaceMapper.swift b/Tests/TuistDependenciesTests/Mappers/ExternalDependencyPathWorkspaceMapper.swift index 76aa25a1821..61e086100c3 100644 --- a/Tests/TuistDependenciesTests/Mappers/ExternalDependencyPathWorkspaceMapper.swift +++ b/Tests/TuistDependenciesTests/Mappers/ExternalDependencyPathWorkspaceMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistDependenciesTests/Mappers/PruneOrphanExternalTargetsGraphMapperTests.swift b/Tests/TuistDependenciesTests/Mappers/PruneOrphanExternalTargetsGraphMapperTests.swift index 55c0d947e86..f40b56a80b9 100644 --- a/Tests/TuistDependenciesTests/Mappers/PruneOrphanExternalTargetsGraphMapperTests.swift +++ b/Tests/TuistDependenciesTests/Mappers/PruneOrphanExternalTargetsGraphMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph import XcodeGraphTesting import XCTest diff --git a/Tests/TuistGeneratorAcceptanceTests/GenerateAcceptanceTests.swift b/Tests/TuistGeneratorAcceptanceTests/GenerateAcceptanceTests.swift index 36c778b91dc..deeae5d25ff 100644 --- a/Tests/TuistGeneratorAcceptanceTests/GenerateAcceptanceTests.swift +++ b/Tests/TuistGeneratorAcceptanceTests/GenerateAcceptanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistAcceptanceTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistGeneratorIntegrationTests/Generator/MultipleConfigurationsIntegrationTests.swift b/Tests/TuistGeneratorIntegrationTests/Generator/MultipleConfigurationsIntegrationTests.swift index 52c47379a9c..42a62f69903 100644 --- a/Tests/TuistGeneratorIntegrationTests/Generator/MultipleConfigurationsIntegrationTests.swift +++ b/Tests/TuistGeneratorIntegrationTests/Generator/MultipleConfigurationsIntegrationTests.swift @@ -1,3 +1,4 @@ +import Path import TSCBasic import TuistCore import TuistLoaderTesting @@ -352,7 +353,7 @@ final class MultipleConfigurationsIntegrationTests: TuistUnitTestCase { } @discardableResult - private func createFile(path relativePath: String, content: String) throws -> AbsolutePath { + private func createFile(path relativePath: String, content: String) throws -> Path.AbsolutePath { let temporaryPath = try temporaryPath() let absolutePath = temporaryPath.appending(try RelativePath(validating: relativePath)) try FileHandler.shared.touch(absolutePath) @@ -384,7 +385,7 @@ final class MultipleConfigurationsIntegrationTests: TuistUnitTestCase { ) } - private func createWorkspace(path: AbsolutePath, projects: [String]) throws -> Workspace { + private func createWorkspace(path: Path.AbsolutePath, projects: [String]) throws -> Workspace { Workspace( path: path, xcWorkspacePath: path.appending(component: "Workspace.xcworkspace"), @@ -395,7 +396,7 @@ final class MultipleConfigurationsIntegrationTests: TuistUnitTestCase { } private func createProject( - path: AbsolutePath, + path: Path.AbsolutePath, settings: Settings, targets: [Target], packages: [Package] = [], @@ -436,7 +437,7 @@ final class MultipleConfigurationsIntegrationTests: TuistUnitTestCase { ) } - private func pathTo(_ relativePath: String) throws -> AbsolutePath { + private func pathTo(_ relativePath: String) throws -> Path.AbsolutePath { let temporaryPath = try temporaryPath() return temporaryPath.appending(try RelativePath(validating: relativePath)) } diff --git a/Tests/TuistGeneratorIntegrationTests/Generator/StableStructureIntegrationTests.swift b/Tests/TuistGeneratorIntegrationTests/Generator/StableStructureIntegrationTests.swift index 5288b988437..d480265ea5d 100644 --- a/Tests/TuistGeneratorIntegrationTests/Generator/StableStructureIntegrationTests.swift +++ b/Tests/TuistGeneratorIntegrationTests/Generator/StableStructureIntegrationTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistLoaderTesting diff --git a/Tests/TuistGeneratorIntegrationTests/Generator/SwiftPackageManagerInteractorTests.swift b/Tests/TuistGeneratorIntegrationTests/Generator/SwiftPackageManagerInteractorTests.swift index d85206f315f..21b216a0d56 100644 --- a/Tests/TuistGeneratorIntegrationTests/Generator/SwiftPackageManagerInteractorTests.swift +++ b/Tests/TuistGeneratorIntegrationTests/Generator/SwiftPackageManagerInteractorTests.swift @@ -1,6 +1,6 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorIntegrationTests/Generator/TestModelGenerator.swift b/Tests/TuistGeneratorIntegrationTests/Generator/TestModelGenerator.swift index 486f8f358e8..87d670f05ab 100644 --- a/Tests/TuistGeneratorIntegrationTests/Generator/TestModelGenerator.swift +++ b/Tests/TuistGeneratorIntegrationTests/Generator/TestModelGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistLoaderTesting diff --git a/Tests/TuistGeneratorIntegrationTests/Generator/TuistGeneratorPerformanceTests.swift b/Tests/TuistGeneratorIntegrationTests/Generator/TuistGeneratorPerformanceTests.swift index e3f10d0f0e5..bc94fa514fd 100644 --- a/Tests/TuistGeneratorIntegrationTests/Generator/TuistGeneratorPerformanceTests.swift +++ b/Tests/TuistGeneratorIntegrationTests/Generator/TuistGeneratorPerformanceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistLoaderTesting diff --git a/Tests/TuistGeneratorIntegrationTests/Generator/WorkspaceGeneratorIntegrationTests.swift b/Tests/TuistGeneratorIntegrationTests/Generator/WorkspaceGeneratorIntegrationTests.swift index 16067c4ca63..a4c56b337fe 100644 --- a/Tests/TuistGeneratorIntegrationTests/Generator/WorkspaceGeneratorIntegrationTests.swift +++ b/Tests/TuistGeneratorIntegrationTests/Generator/WorkspaceGeneratorIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorIntegrationTests/Generator/XcodeProjWriterTests.swift b/Tests/TuistGeneratorIntegrationTests/Generator/XcodeProjWriterTests.swift index f135e1fa7be..4cab00c7570 100644 --- a/Tests/TuistGeneratorIntegrationTests/Generator/XcodeProjWriterTests.swift +++ b/Tests/TuistGeneratorIntegrationTests/Generator/XcodeProjWriterTests.swift @@ -1,6 +1,6 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistGeneratorTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Generator/BuildPhaseGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/BuildPhaseGeneratorTests.swift index 1a59612fa82..320c6fe5720 100644 --- a/Tests/TuistGeneratorTests/Generator/BuildPhaseGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/BuildPhaseGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Generator/ConfigGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/ConfigGeneratorTests.swift index 3d4c530a1a8..ba23a8187cc 100644 --- a/Tests/TuistGeneratorTests/Generator/ConfigGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/ConfigGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Generator/LinkGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/LinkGeneratorTests.swift index e4e04eb2b10..379940d6621 100644 --- a/Tests/TuistGeneratorTests/Generator/LinkGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/LinkGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph import XcodeGraphTesting diff --git a/Tests/TuistGeneratorTests/Generator/Mocks/MockProjectDescriptorGenerator.swift b/Tests/TuistGeneratorTests/Generator/Mocks/MockProjectDescriptorGenerator.swift index 52f81426af7..8a59a14c3aa 100644 --- a/Tests/TuistGeneratorTests/Generator/Mocks/MockProjectDescriptorGenerator.swift +++ b/Tests/TuistGeneratorTests/Generator/Mocks/MockProjectDescriptorGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Generator/Mocks/MockSchemeDescriptorsGenerator.swift b/Tests/TuistGeneratorTests/Generator/Mocks/MockSchemeDescriptorsGenerator.swift index b3f2402dbaf..e88adda9653 100644 --- a/Tests/TuistGeneratorTests/Generator/Mocks/MockSchemeDescriptorsGenerator.swift +++ b/Tests/TuistGeneratorTests/Generator/Mocks/MockSchemeDescriptorsGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Generator/Mocks/MockTargetGenerator.swift b/Tests/TuistGeneratorTests/Generator/Mocks/MockTargetGenerator.swift index 0d7fb42b145..a221447b250 100644 --- a/Tests/TuistGeneratorTests/Generator/Mocks/MockTargetGenerator.swift +++ b/Tests/TuistGeneratorTests/Generator/Mocks/MockTargetGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Generator/Mocks/MockWorkspaceDescriptorGenerator.swift b/Tests/TuistGeneratorTests/Generator/Mocks/MockWorkspaceDescriptorGenerator.swift index 82b0d40be69..28bd7d34f1c 100644 --- a/Tests/TuistGeneratorTests/Generator/Mocks/MockWorkspaceDescriptorGenerator.swift +++ b/Tests/TuistGeneratorTests/Generator/Mocks/MockWorkspaceDescriptorGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Generator/ProjectDescriptorGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/ProjectDescriptorGeneratorTests.swift index 5d4a881bb3a..60174e5d4d1 100644 --- a/Tests/TuistGeneratorTests/Generator/ProjectDescriptorGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/ProjectDescriptorGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import struct TSCUtility.Version import TuistCore import TuistCoreTesting diff --git a/Tests/TuistGeneratorTests/Generator/ProjectFileElementsTests.swift b/Tests/TuistGeneratorTests/Generator/ProjectFileElementsTests.swift index 916c12f5aaf..5fc01f42ac7 100644 --- a/Tests/TuistGeneratorTests/Generator/ProjectFileElementsTests.swift +++ b/Tests/TuistGeneratorTests/Generator/ProjectFileElementsTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Generator/ProjectGroupsTests.swift b/Tests/TuistGeneratorTests/Generator/ProjectGroupsTests.swift index bd74430ee72..3f705074e24 100644 --- a/Tests/TuistGeneratorTests/Generator/ProjectGroupsTests.swift +++ b/Tests/TuistGeneratorTests/Generator/ProjectGroupsTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import PathKit -import TSCBasic import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Generator/SchemeDescriptorsGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/SchemeDescriptorsGeneratorTests.swift index 1ac1884ca01..ca18ad5b80d 100644 --- a/Tests/TuistGeneratorTests/Generator/SchemeDescriptorsGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/SchemeDescriptorsGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Generator/TargetGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/TargetGeneratorTests.swift index 09ef5f38416..5a232ac5389 100644 --- a/Tests/TuistGeneratorTests/Generator/TargetGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/TargetGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Generator/TestData/GeneratedProject+TestData.swift b/Tests/TuistGeneratorTests/Generator/TestData/GeneratedProject+TestData.swift index 3daa4b3901d..7fa8929c0bd 100644 --- a/Tests/TuistGeneratorTests/Generator/TestData/GeneratedProject+TestData.swift +++ b/Tests/TuistGeneratorTests/Generator/TestData/GeneratedProject+TestData.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeProj @testable import TuistGenerator diff --git a/Tests/TuistGeneratorTests/Generator/WorkspaceDescriptorGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/WorkspaceDescriptorGeneratorTests.swift index 3b456ada95b..73063b1cc10 100644 --- a/Tests/TuistGeneratorTests/Generator/WorkspaceDescriptorGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/WorkspaceDescriptorGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Generator/WorkspaceSettingsDescriptorGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/WorkspaceSettingsDescriptorGeneratorTests.swift index beb2cb83a7a..e9b50986e16 100644 --- a/Tests/TuistGeneratorTests/Generator/WorkspaceSettingsDescriptorGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/WorkspaceSettingsDescriptorGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Generator/WorkspaceSettingsDescriptorTests.swift b/Tests/TuistGeneratorTests/Generator/WorkspaceSettingsDescriptorTests.swift index c6dd3f4f55f..12a0c23895e 100644 --- a/Tests/TuistGeneratorTests/Generator/WorkspaceSettingsDescriptorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/WorkspaceSettingsDescriptorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistGenerator diff --git a/Tests/TuistGeneratorTests/Generator/WorkspaceStructureGeneratorTests.swift b/Tests/TuistGeneratorTests/Generator/WorkspaceStructureGeneratorTests.swift index c65f826f1dd..f45801b0b5a 100644 --- a/Tests/TuistGeneratorTests/Generator/WorkspaceStructureGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Generator/WorkspaceStructureGeneratorTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/GraphMappers/AutogeneratedWorkspaceSchemeWorkspaceMapperTests.swift b/Tests/TuistGeneratorTests/GraphMappers/AutogeneratedWorkspaceSchemeWorkspaceMapperTests.swift index 0b8f44551c7..84607206c62 100644 --- a/Tests/TuistGeneratorTests/GraphMappers/AutogeneratedWorkspaceSchemeWorkspaceMapperTests.swift +++ b/Tests/TuistGeneratorTests/GraphMappers/AutogeneratedWorkspaceSchemeWorkspaceMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph import XcodeGraphTesting diff --git a/Tests/TuistGeneratorTests/GraphViz/GraphToGraphVizMapperTests.swift b/Tests/TuistGeneratorTests/GraphViz/GraphToGraphVizMapperTests.swift index c114661c723..b43db168c07 100644 --- a/Tests/TuistGeneratorTests/GraphViz/GraphToGraphVizMapperTests.swift +++ b/Tests/TuistGeneratorTests/GraphViz/GraphToGraphVizMapperTests.swift @@ -1,6 +1,6 @@ import Foundation import GraphViz -import TSCBasic +import Path import TuistCore import XcodeGraph import XcodeGraphTesting diff --git a/Tests/TuistGeneratorTests/Linter/EnvironmentLinterTests.swift b/Tests/TuistGeneratorTests/Linter/EnvironmentLinterTests.swift index 2b8e5861453..41c5d869fb3 100644 --- a/Tests/TuistGeneratorTests/Linter/EnvironmentLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/EnvironmentLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Linter/GraphLinterTests.swift b/Tests/TuistGeneratorTests/Linter/GraphLinterTests.swift index 7dc55f68c65..87d3cf2c9a3 100644 --- a/Tests/TuistGeneratorTests/Linter/GraphLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/GraphLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import struct TSCUtility.Version import TuistCore import TuistSupport diff --git a/Tests/TuistGeneratorTests/Linter/PackageLinterTests.swift b/Tests/TuistGeneratorTests/Linter/PackageLinterTests.swift index abbf2071579..fbae149394f 100644 --- a/Tests/TuistGeneratorTests/Linter/PackageLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/PackageLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Linter/ProjectLinterTests.swift b/Tests/TuistGeneratorTests/Linter/ProjectLinterTests.swift index 150236516f3..4e43a76edba 100644 --- a/Tests/TuistGeneratorTests/Linter/ProjectLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/ProjectLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Linter/SchemeLinterTests.swift b/Tests/TuistGeneratorTests/Linter/SchemeLinterTests.swift index d1450761e10..707c0935545 100644 --- a/Tests/TuistGeneratorTests/Linter/SchemeLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/SchemeLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Linter/SettingsLinterTests.swift b/Tests/TuistGeneratorTests/Linter/SettingsLinterTests.swift index 78c55e52174..401e793e27a 100644 --- a/Tests/TuistGeneratorTests/Linter/SettingsLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/SettingsLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Linter/StaticProductsGraphLinterTests.swift b/Tests/TuistGeneratorTests/Linter/StaticProductsGraphLinterTests.swift index a111d8cef3e..e85b5c19641 100644 --- a/Tests/TuistGeneratorTests/Linter/StaticProductsGraphLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/StaticProductsGraphLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph import XCTest @testable import TuistCore diff --git a/Tests/TuistGeneratorTests/Linter/TargetLinterTests.swift b/Tests/TuistGeneratorTests/Linter/TargetLinterTests.swift index 06c61c6ee52..d16df7b42eb 100644 --- a/Tests/TuistGeneratorTests/Linter/TargetLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/TargetLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/Linter/TargetScriptLinterTests.swift b/Tests/TuistGeneratorTests/Linter/TargetScriptLinterTests.swift index b0cfe5f859c..9cf10736619 100644 --- a/Tests/TuistGeneratorTests/Linter/TargetScriptLinterTests.swift +++ b/Tests/TuistGeneratorTests/Linter/TargetScriptLinterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupport diff --git a/Tests/TuistGeneratorTests/ProjectMappers/AutogeneratedSchemesProjectMapperTests.swift b/Tests/TuistGeneratorTests/ProjectMappers/AutogeneratedSchemesProjectMapperTests.swift index 4720d60c3be..c909de001b0 100644 --- a/Tests/TuistGeneratorTests/ProjectMappers/AutogeneratedSchemesProjectMapperTests.swift +++ b/Tests/TuistGeneratorTests/ProjectMappers/AutogeneratedSchemesProjectMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph import XcodeGraphTesting diff --git a/Tests/TuistGeneratorTests/ProjectMappers/DeleteDerivedDirectoryProjectMapperTests.swift b/Tests/TuistGeneratorTests/ProjectMappers/DeleteDerivedDirectoryProjectMapperTests.swift index e4846735ba2..853ab6c6d3f 100644 --- a/Tests/TuistGeneratorTests/ProjectMappers/DeleteDerivedDirectoryProjectMapperTests.swift +++ b/Tests/TuistGeneratorTests/ProjectMappers/DeleteDerivedDirectoryProjectMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistGeneratorTests/ProjectMappers/GenerateInfoPlistProjectMapperTests.swift b/Tests/TuistGeneratorTests/ProjectMappers/GenerateInfoPlistProjectMapperTests.swift index 126091a303c..ae19123aeec 100644 --- a/Tests/TuistGeneratorTests/ProjectMappers/GenerateInfoPlistProjectMapperTests.swift +++ b/Tests/TuistGeneratorTests/ProjectMappers/GenerateInfoPlistProjectMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistGeneratorTests/ProjectMappers/IDETemplateMacrosMapperTests.swift b/Tests/TuistGeneratorTests/ProjectMappers/IDETemplateMacrosMapperTests.swift index 95935ef06b6..a1fa6eafb62 100644 --- a/Tests/TuistGeneratorTests/ProjectMappers/IDETemplateMacrosMapperTests.swift +++ b/Tests/TuistGeneratorTests/ProjectMappers/IDETemplateMacrosMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistGenerator import TuistSupportTesting diff --git a/Tests/TuistGeneratorTests/ProjectMappers/ResourcesProjectMapperTests.swift b/Tests/TuistGeneratorTests/ProjectMappers/ResourcesProjectMapperTests.swift index 6adac21cea2..541a877338c 100644 --- a/Tests/TuistGeneratorTests/ProjectMappers/ResourcesProjectMapperTests.swift +++ b/Tests/TuistGeneratorTests/ProjectMappers/ResourcesProjectMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph import XcodeGraphTesting diff --git a/Tests/TuistGeneratorTests/ProjectMappers/SynthesizedResourceInterfaceProjectMapperTests.swift b/Tests/TuistGeneratorTests/ProjectMappers/SynthesizedResourceInterfaceProjectMapperTests.swift index e77af88c688..fe21bb16561 100644 --- a/Tests/TuistGeneratorTests/ProjectMappers/SynthesizedResourceInterfaceProjectMapperTests.swift +++ b/Tests/TuistGeneratorTests/ProjectMappers/SynthesizedResourceInterfaceProjectMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistGeneratorTests/Utils/EmbedScriptGeneratorTests.swift b/Tests/TuistGeneratorTests/Utils/EmbedScriptGeneratorTests.swift index 4a98dc4177b..a5854ba7179 100644 --- a/Tests/TuistGeneratorTests/Utils/EmbedScriptGeneratorTests.swift +++ b/Tests/TuistGeneratorTests/Utils/EmbedScriptGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistGeneratorTests/Utils/Mocks/MockEmbedScriptGenerator.swift b/Tests/TuistGeneratorTests/Utils/Mocks/MockEmbedScriptGenerator.swift index 14787089fdb..7c72ffbdf3d 100644 --- a/Tests/TuistGeneratorTests/Utils/Mocks/MockEmbedScriptGenerator.swift +++ b/Tests/TuistGeneratorTests/Utils/Mocks/MockEmbedScriptGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore @testable import TuistGenerator diff --git a/Tests/TuistGeneratorTests/Utils/Mocks/MockSynthesizedResourceInterfaceGenerator.swift b/Tests/TuistGeneratorTests/Utils/Mocks/MockSynthesizedResourceInterfaceGenerator.swift index ed84b390efa..57938d74fdc 100644 --- a/Tests/TuistGeneratorTests/Utils/Mocks/MockSynthesizedResourceInterfaceGenerator.swift +++ b/Tests/TuistGeneratorTests/Utils/Mocks/MockSynthesizedResourceInterfaceGenerator.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import XcodeGraph @testable import TuistGenerator diff --git a/Tests/TuistKitIntegrationTests/Commands/DumpServiceIntegrationTests.swift b/Tests/TuistKitIntegrationTests/Commands/DumpServiceIntegrationTests.swift index 2ffb2ae2aa5..d0fb950d114 100644 --- a/Tests/TuistKitIntegrationTests/Commands/DumpServiceIntegrationTests.swift +++ b/Tests/TuistKitIntegrationTests/Commands/DumpServiceIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistKitIntegrationTests/Utils/ManifestGraphLoaderIntegrationTests.swift b/Tests/TuistKitIntegrationTests/Utils/ManifestGraphLoaderIntegrationTests.swift index 8c746149fd3..b86ed61bd7f 100644 --- a/Tests/TuistKitIntegrationTests/Utils/ManifestGraphLoaderIntegrationTests.swift +++ b/Tests/TuistKitIntegrationTests/Utils/ManifestGraphLoaderIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import TuistSupport diff --git a/Tests/TuistKitTests/Cloud/CloudAuthServiceTests.swift b/Tests/TuistKitTests/Cloud/CloudAuthServiceTests.swift index f075adb088e..5697e1242b1 100644 --- a/Tests/TuistKitTests/Cloud/CloudAuthServiceTests.swift +++ b/Tests/TuistKitTests/Cloud/CloudAuthServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistLoader diff --git a/Tests/TuistKitTests/Cloud/CloudInitServiceTests.swift b/Tests/TuistKitTests/Cloud/CloudInitServiceTests.swift index 76d950ad748..655872634ab 100644 --- a/Tests/TuistKitTests/Cloud/CloudInitServiceTests.swift +++ b/Tests/TuistKitTests/Cloud/CloudInitServiceTests.swift @@ -1,5 +1,5 @@ import MockableTest -import TSCBasic +import Path import TuistLoader import TuistServer import TuistSupport diff --git a/Tests/TuistKitTests/Cloud/CloudLogoutServiceTests.swift b/Tests/TuistKitTests/Cloud/CloudLogoutServiceTests.swift index e40df94bfa3..69873e06f90 100644 --- a/Tests/TuistKitTests/Cloud/CloudLogoutServiceTests.swift +++ b/Tests/TuistKitTests/Cloud/CloudLogoutServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistLoader diff --git a/Tests/TuistKitTests/Cloud/CloudSessionServiceTests.swift b/Tests/TuistKitTests/Cloud/CloudSessionServiceTests.swift index 0d10dbe47f7..be02c82e377 100644 --- a/Tests/TuistKitTests/Cloud/CloudSessionServiceTests.swift +++ b/Tests/TuistKitTests/Cloud/CloudSessionServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistLoader diff --git a/Tests/TuistKitTests/CommandEnvironmentVariables/CommandEnvironmentVariableTests.swift b/Tests/TuistKitTests/CommandEnvironmentVariables/CommandEnvironmentVariableTests.swift index 01ab412638e..29f6ad16874 100644 --- a/Tests/TuistKitTests/CommandEnvironmentVariables/CommandEnvironmentVariableTests.swift +++ b/Tests/TuistKitTests/CommandEnvironmentVariables/CommandEnvironmentVariableTests.swift @@ -3,7 +3,7 @@ import Difference import Foundation import TSCUtility import XCTest -@testable import TSCBasic +@testable import Path @testable import TuistCore @testable import TuistKit @testable import TuistSupport diff --git a/Tests/TuistKitTests/Dot/MockDotGraphGenerator.swift b/Tests/TuistKitTests/Dot/MockDotGraphGenerator.swift index acd5e927cea..800311c7dde 100644 --- a/Tests/TuistKitTests/Dot/MockDotGraphGenerator.swift +++ b/Tests/TuistKitTests/Dot/MockDotGraphGenerator.swift @@ -1,6 +1,6 @@ import Foundation import GraphViz -import TSCBasic +import Path import TuistGenerator import TuistKit import XcodeGraph diff --git a/Tests/TuistKitTests/Generator/Mocks/MockGenerator.swift b/Tests/TuistKitTests/Generator/Mocks/MockGenerator.swift index aa258f41cba..78626056053 100644 --- a/Tests/TuistKitTests/Generator/Mocks/MockGenerator.swift +++ b/Tests/TuistKitTests/Generator/Mocks/MockGenerator.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistGenerator import XcodeGraph diff --git a/Tests/TuistKitTests/Mappers/Factories/GraphMapperFactoryTests.swift b/Tests/TuistKitTests/Mappers/Factories/GraphMapperFactoryTests.swift index 2e77feca20e..835b2b27e83 100644 --- a/Tests/TuistKitTests/Mappers/Factories/GraphMapperFactoryTests.swift +++ b/Tests/TuistKitTests/Mappers/Factories/GraphMapperFactoryTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistAutomation import TuistCoreTesting import TuistLoader diff --git a/Tests/TuistKitTests/Mappers/Factories/ProjectMapperFactoryTests.swift b/Tests/TuistKitTests/Mappers/Factories/ProjectMapperFactoryTests.swift index db68bcb6518..0079ee98871 100644 --- a/Tests/TuistKitTests/Mappers/Factories/ProjectMapperFactoryTests.swift +++ b/Tests/TuistKitTests/Mappers/Factories/ProjectMapperFactoryTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistAutomation import TuistCoreTesting import TuistLoader diff --git a/Tests/TuistKitTests/Mappers/Factories/WorkspaceMapperFactoryTests.swift b/Tests/TuistKitTests/Mappers/Factories/WorkspaceMapperFactoryTests.swift index 533802013f1..8522e4410a8 100644 --- a/Tests/TuistKitTests/Mappers/Factories/WorkspaceMapperFactoryTests.swift +++ b/Tests/TuistKitTests/Mappers/Factories/WorkspaceMapperFactoryTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility import TuistCoreTesting import TuistLoader diff --git a/Tests/TuistKitTests/Mappers/FocusTargetsGraphMappersTests.swift b/Tests/TuistKitTests/Mappers/FocusTargetsGraphMappersTests.swift index ebb517e6f7d..8b4a917958a 100644 --- a/Tests/TuistKitTests/Mappers/FocusTargetsGraphMappersTests.swift +++ b/Tests/TuistKitTests/Mappers/FocusTargetsGraphMappersTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistSupportTesting diff --git a/Tests/TuistKitTests/Mappers/Graph/TreeShakePrunedTargetsGraphMapperTests.swift b/Tests/TuistKitTests/Mappers/Graph/TreeShakePrunedTargetsGraphMapperTests.swift index 160148e4348..8f666182a5c 100644 --- a/Tests/TuistKitTests/Mappers/Graph/TreeShakePrunedTargetsGraphMapperTests.swift +++ b/Tests/TuistKitTests/Mappers/Graph/TreeShakePrunedTargetsGraphMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XcodeGraph import XCTest @testable import TuistCore diff --git a/Tests/TuistKitTests/Mappers/Graph/UpdateWorkspaceProjectsGraphMapperTests.swift b/Tests/TuistKitTests/Mappers/Graph/UpdateWorkspaceProjectsGraphMapperTests.swift index 881e3855f18..cbcfcdd9cd8 100644 --- a/Tests/TuistKitTests/Mappers/Graph/UpdateWorkspaceProjectsGraphMapperTests.swift +++ b/Tests/TuistKitTests/Mappers/Graph/UpdateWorkspaceProjectsGraphMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCoreTesting import TuistGenerator import TuistSupport diff --git a/Tests/TuistKitTests/Mappers/Workspace/TuistWorkspaceRenderMarkdownReadmeMapperTests.swift b/Tests/TuistKitTests/Mappers/Workspace/TuistWorkspaceRenderMarkdownReadmeMapperTests.swift index 30724c66057..97c9aabd0dd 100644 --- a/Tests/TuistKitTests/Mappers/Workspace/TuistWorkspaceRenderMarkdownReadmeMapperTests.swift +++ b/Tests/TuistKitTests/Mappers/Workspace/TuistWorkspaceRenderMarkdownReadmeMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraph diff --git a/Tests/TuistKitTests/Mocks/MockManifestGraphLoader.swift b/Tests/TuistKitTests/Mocks/MockManifestGraphLoader.swift index adfe5c3b545..b54e575d12c 100644 --- a/Tests/TuistKitTests/Mocks/MockManifestGraphLoader.swift +++ b/Tests/TuistKitTests/Mocks/MockManifestGraphLoader.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XcodeGraph import XcodeGraphTesting diff --git a/Tests/TuistKitTests/ProjectEditor/Mocks/MockProjectEditorMapper.swift b/Tests/TuistKitTests/ProjectEditor/Mocks/MockProjectEditorMapper.swift index d32d48ed4d5..c1be7d1dd18 100644 --- a/Tests/TuistKitTests/ProjectEditor/Mocks/MockProjectEditorMapper.swift +++ b/Tests/TuistKitTests/ProjectEditor/Mocks/MockProjectEditorMapper.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistLoader import XcodeGraph diff --git a/Tests/TuistKitTests/ProjectEditor/ProjectEditorMapperTests.swift b/Tests/TuistKitTests/ProjectEditor/ProjectEditorMapperTests.swift index 0e66cfcc476..8c08d57519f 100644 --- a/Tests/TuistKitTests/ProjectEditor/ProjectEditorMapperTests.swift +++ b/Tests/TuistKitTests/ProjectEditor/ProjectEditorMapperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility import TuistCore import TuistLoader diff --git a/Tests/TuistKitTests/ProjectEditor/ProjectEditorTests.swift b/Tests/TuistKitTests/ProjectEditor/ProjectEditorTests.swift index c6d70c633d2..71052ba16d6 100644 --- a/Tests/TuistKitTests/ProjectEditor/ProjectEditorTests.swift +++ b/Tests/TuistKitTests/ProjectEditor/ProjectEditorTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistCore import TuistLoader import TuistPlugin diff --git a/Tests/TuistKitTests/Services/BuildServiceTests.swift b/Tests/TuistKitTests/Services/BuildServiceTests.swift index 5961280936e..5f51f98f0d0 100644 --- a/Tests/TuistKitTests/Services/BuildServiceTests.swift +++ b/Tests/TuistKitTests/Services/BuildServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TSCUtility import TuistCore import TuistServer diff --git a/Tests/TuistKitTests/Services/CleanServiceTests.swift b/Tests/TuistKitTests/Services/CleanServiceTests.swift index 8b6aa214644..dafd8c570eb 100644 --- a/Tests/TuistKitTests/Services/CleanServiceTests.swift +++ b/Tests/TuistKitTests/Services/CleanServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistCore import TuistCoreTesting import TuistLoader diff --git a/Tests/TuistKitTests/Services/EditServiceTests.swift b/Tests/TuistKitTests/Services/EditServiceTests.swift index 0c5228b7562..8a936451c8e 100644 --- a/Tests/TuistKitTests/Services/EditServiceTests.swift +++ b/Tests/TuistKitTests/Services/EditServiceTests.swift @@ -1,5 +1,5 @@ import MockableTest -import TSCBasic +import Path import TuistCore import TuistLoader import XcodeGraph diff --git a/Tests/TuistKitTests/Services/GenerateServiceTests.swift b/Tests/TuistKitTests/Services/GenerateServiceTests.swift index ca9ba50fd2b..10359f7ff40 100644 --- a/Tests/TuistKitTests/Services/GenerateServiceTests.swift +++ b/Tests/TuistKitTests/Services/GenerateServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistCore import TuistLoader import TuistServer diff --git a/Tests/TuistKitTests/Services/GraphServiceTests.swift b/Tests/TuistKitTests/Services/GraphServiceTests.swift index 0c176925395..874712e22b7 100644 --- a/Tests/TuistKitTests/Services/GraphServiceTests.swift +++ b/Tests/TuistKitTests/Services/GraphServiceTests.swift @@ -1,8 +1,8 @@ import DOT import Foundation import GraphViz +import Path import ProjectAutomation -import TSCBasic import TuistPlugin import TuistSupport import XcodeGraph diff --git a/Tests/TuistKitTests/Services/InitServiceTests.swift b/Tests/TuistKitTests/Services/InitServiceTests.swift index f23929ff550..7a574ee45cb 100644 --- a/Tests/TuistKitTests/Services/InitServiceTests.swift +++ b/Tests/TuistKitTests/Services/InitServiceTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistScaffold import TuistSupport import XcodeGraph diff --git a/Tests/TuistKitTests/Services/InstallServiceTests.swift b/Tests/TuistKitTests/Services/InstallServiceTests.swift index 6778aef498c..7066662d6d5 100644 --- a/Tests/TuistKitTests/Services/InstallServiceTests.swift +++ b/Tests/TuistKitTests/Services/InstallServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TSCUtility import TuistCore import TuistCoreTesting diff --git a/Tests/TuistKitTests/Services/ListServiceTests.swift b/Tests/TuistKitTests/Services/ListServiceTests.swift index b406a87e247..2c41b62deaa 100644 --- a/Tests/TuistKitTests/Services/ListServiceTests.swift +++ b/Tests/TuistKitTests/Services/ListServiceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistPluginTesting import XcodeGraph import XcodeGraphTesting diff --git a/Tests/TuistKitTests/Services/Migration/MigrationCheckEmptyBuildSettingsServiceTests.swift b/Tests/TuistKitTests/Services/Migration/MigrationCheckEmptyBuildSettingsServiceTests.swift index 9d284ceb7ca..f67e253bad0 100644 --- a/Tests/TuistKitTests/Services/Migration/MigrationCheckEmptyBuildSettingsServiceTests.swift +++ b/Tests/TuistKitTests/Services/Migration/MigrationCheckEmptyBuildSettingsServiceTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistKitTests/Services/Plugin/PluginArchiveServiceTests.swift b/Tests/TuistKitTests/Services/Plugin/PluginArchiveServiceTests.swift index 995c01d0758..db773805cda 100644 --- a/Tests/TuistKitTests/Services/Plugin/PluginArchiveServiceTests.swift +++ b/Tests/TuistKitTests/Services/Plugin/PluginArchiveServiceTests.swift @@ -1,5 +1,5 @@ import MockableTest -import TSCBasic +import Path import TuistLoaderTesting import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistKitTests/Services/Plugin/PluginBuildServiceTests.swift b/Tests/TuistKitTests/Services/Plugin/PluginBuildServiceTests.swift index 948ea77b6db..bb95bf4ac3c 100644 --- a/Tests/TuistKitTests/Services/Plugin/PluginBuildServiceTests.swift +++ b/Tests/TuistKitTests/Services/Plugin/PluginBuildServiceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import TuistSupportTesting import XCTest diff --git a/Tests/TuistKitTests/Services/Plugin/PluginRunServiceTests.swift b/Tests/TuistKitTests/Services/Plugin/PluginRunServiceTests.swift index ebc2f8d8896..972ce85125d 100644 --- a/Tests/TuistKitTests/Services/Plugin/PluginRunServiceTests.swift +++ b/Tests/TuistKitTests/Services/Plugin/PluginRunServiceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import TuistSupportTesting import XCTest diff --git a/Tests/TuistKitTests/Services/Plugin/PluginTestServiceTests.swift b/Tests/TuistKitTests/Services/Plugin/PluginTestServiceTests.swift index 02b24785b58..b21ef78768d 100644 --- a/Tests/TuistKitTests/Services/Plugin/PluginTestServiceTests.swift +++ b/Tests/TuistKitTests/Services/Plugin/PluginTestServiceTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistSupport import TuistSupportTesting import XCTest diff --git a/Tests/TuistKitTests/Services/RunServiceTests.swift b/Tests/TuistKitTests/Services/RunServiceTests.swift index e5e9792eeb9..6b0f9a09eab 100644 --- a/Tests/TuistKitTests/Services/RunServiceTests.swift +++ b/Tests/TuistKitTests/Services/RunServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import struct TSCUtility.Version import TuistCore import TuistSupport diff --git a/Tests/TuistKitTests/Services/ScaffoldServiceTests.swift b/Tests/TuistKitTests/Services/ScaffoldServiceTests.swift index 37c76e6a4c7..11724e9b363 100644 --- a/Tests/TuistKitTests/Services/ScaffoldServiceTests.swift +++ b/Tests/TuistKitTests/Services/ScaffoldServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistCore import TuistLoader import TuistScaffold diff --git a/Tests/TuistKitTests/Services/TestServiceTests.swift b/Tests/TuistKitTests/Services/TestServiceTests.swift index a01cda54393..a0402c9f925 100644 --- a/Tests/TuistKitTests/Services/TestServiceTests.swift +++ b/Tests/TuistKitTests/Services/TestServiceTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TuistAutomation import TuistCore import TuistLoader diff --git a/Tests/TuistKitTests/Services/TuistServiceTests.swift b/Tests/TuistKitTests/Services/TuistServiceTests.swift index 42a857c0950..af65f71b686 100644 --- a/Tests/TuistKitTests/Services/TuistServiceTests.swift +++ b/Tests/TuistKitTests/Services/TuistServiceTests.swift @@ -1,5 +1,5 @@ import MockableTest -import TSCBasic +import Path import TuistLoader import TuistPlugin import TuistPluginTesting diff --git a/Tests/TuistLoaderIntegrationTests/Loaders/ManifestLoaderTests.swift b/Tests/TuistLoaderIntegrationTests/Loaders/ManifestLoaderTests.swift index 16dc3dbb477..173610d67e9 100644 --- a/Tests/TuistLoaderIntegrationTests/Loaders/ManifestLoaderTests.swift +++ b/Tests/TuistLoaderIntegrationTests/Loaders/ManifestLoaderTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistLoader diff --git a/Tests/TuistLoaderIntegrationTests/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilderIntegrationTests.swift b/Tests/TuistLoaderIntegrationTests/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilderIntegrationTests.swift index 5f3a5ce7b3e..eaf80198392 100644 --- a/Tests/TuistLoaderIntegrationTests/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilderIntegrationTests.swift +++ b/Tests/TuistLoaderIntegrationTests/ProjectDescriptionHelpers/ProjectDescriptionHelpersBuilderIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Extensions/TuistTestCase+ManifestMappers.swift b/Tests/TuistLoaderTests/Extensions/TuistTestCase+ManifestMappers.swift index 9ac1c4f2839..997e40d1b23 100644 --- a/Tests/TuistLoaderTests/Extensions/TuistTestCase+ManifestMappers.swift +++ b/Tests/TuistLoaderTests/Extensions/TuistTestCase+ManifestMappers.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import TuistSupportTesting diff --git a/Tests/TuistLoaderTests/Loaders/CachedManifestLoaderTests.swift b/Tests/TuistLoaderTests/Loaders/CachedManifestLoaderTests.swift index c754de35c9f..460143f6fc4 100644 --- a/Tests/TuistLoaderTests/Loaders/CachedManifestLoaderTests.swift +++ b/Tests/TuistLoaderTests/Loaders/CachedManifestLoaderTests.swift @@ -1,7 +1,7 @@ import Foundation import MockableTest +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import struct XcodeGraph.Plugins diff --git a/Tests/TuistLoaderTests/Loaders/ConfigLoaderTests.swift b/Tests/TuistLoaderTests/Loaders/ConfigLoaderTests.swift index f772f8703b7..af30ac64399 100644 --- a/Tests/TuistLoaderTests/Loaders/ConfigLoaderTests.swift +++ b/Tests/TuistLoaderTests/Loaders/ConfigLoaderTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistSupport import XcodeGraph import XcodeGraphTesting diff --git a/Tests/TuistLoaderTests/Loaders/ManifestLoaderErrorTests.swift b/Tests/TuistLoaderTests/Loaders/ManifestLoaderErrorTests.swift index 60106ebd408..4d3b84e62d0 100644 --- a/Tests/TuistLoaderTests/Loaders/ManifestLoaderErrorTests.swift +++ b/Tests/TuistLoaderTests/Loaders/ManifestLoaderErrorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/Loaders/ManifestLoaderFactoryTests.swift b/Tests/TuistLoaderTests/Loaders/ManifestLoaderFactoryTests.swift index 08629ed4c86..4365269c831 100644 --- a/Tests/TuistLoaderTests/Loaders/ManifestLoaderFactoryTests.swift +++ b/Tests/TuistLoaderTests/Loaders/ManifestLoaderFactoryTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/Loaders/ManifestModelConverterTests.swift b/Tests/TuistLoaderTests/Loaders/ManifestModelConverterTests.swift index c13fec5b2e7..e997070d9b0 100644 --- a/Tests/TuistLoaderTests/Loaders/ManifestModelConverterTests.swift +++ b/Tests/TuistLoaderTests/Loaders/ManifestModelConverterTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/Loaders/PackageSettingsLoaderTests.swift b/Tests/TuistLoaderTests/Loaders/PackageSettingsLoaderTests.swift index 4bfd2dd7665..c93ecde4561 100644 --- a/Tests/TuistLoaderTests/Loaders/PackageSettingsLoaderTests.swift +++ b/Tests/TuistLoaderTests/Loaders/PackageSettingsLoaderTests.swift @@ -1,6 +1,6 @@ import Foundation import MockableTest -import TSCBasic +import Path import TSCUtility import TuistCore import TuistCoreTesting diff --git a/Tests/TuistLoaderTests/Loaders/RecursiveManifestLoaderTests.swift b/Tests/TuistLoaderTests/Loaders/RecursiveManifestLoaderTests.swift index a77b28facd3..d6484c31a05 100644 --- a/Tests/TuistLoaderTests/Loaders/RecursiveManifestLoaderTests.swift +++ b/Tests/TuistLoaderTests/Loaders/RecursiveManifestLoaderTests.swift @@ -1,7 +1,7 @@ import Foundation import MockableTest +import Path import ProjectDescription -import TSCBasic import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/Loaders/TemplateGitLoaderTests.swift b/Tests/TuistLoaderTests/Loaders/TemplateGitLoaderTests.swift index 8bac9967ac1..3cb4fe7050a 100644 --- a/Tests/TuistLoaderTests/Loaders/TemplateGitLoaderTests.swift +++ b/Tests/TuistLoaderTests/Loaders/TemplateGitLoaderTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Loaders/TemplateLoaderTests.swift b/Tests/TuistLoaderTests/Loaders/TemplateLoaderTests.swift index 527a21b4aea..f59607fc77b 100644 --- a/Tests/TuistLoaderTests/Loaders/TemplateLoaderTests.swift +++ b/Tests/TuistLoaderTests/Loaders/TemplateLoaderTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/CodeCoverageMode+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/CodeCoverageMode+ManifestMapperTests.swift index 3d6f443e74f..a58410ffff9 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/CodeCoverageMode+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/CodeCoverageMode+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/Configuration+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/Configuration+ManifestMapperTests.swift index 2af1d4ae20b..23729073b32 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/Configuration+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/Configuration+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/CopyFileElement+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/CopyFileElement+ManifestMapperTests.swift index de4132d4295..7d87151c4a8 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/CopyFileElement+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/CopyFileElement+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/CopyFilesAction+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/CopyFilesAction+ManifestMapperTests.swift index ffb2be18311..a061ac132d7 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/CopyFilesAction+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/CopyFilesAction+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import XcodeGraph import XCTest diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/CoreDataModel+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/CoreDataModel+ManifestMapperTests.swift index c4891881ba2..76ef8de1da5 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/CoreDataModel+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/CoreDataModel+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph @@ -33,7 +33,7 @@ final class CoreDataModelManifestMapperTests: TuistUnitTestCase { let generatorPaths = GeneratorPaths(manifestDirectory: temporaryPath) try FileManager.default.createDirectory( - at: temporaryPath.appending(component: "model.xcdatamodeld").asURL, + at: URL(fileURLWithPath: temporaryPath.appending(component: "model.xcdatamodeld").pathString), withIntermediateDirectories: false ) try createVersionFile(xcVersion: xcVersionDataString(), temporaryPath: temporaryPath) @@ -63,7 +63,7 @@ final class CoreDataModelManifestMapperTests: TuistUnitTestCase { let generatorPaths = GeneratorPaths(manifestDirectory: temporaryPath) try FileManager.default.createDirectory( - at: temporaryPath.appending(component: "model.xcdatamodeld").asURL, + at: URL(fileURLWithPath: temporaryPath.appending(component: "model.xcdatamodeld").pathString), withIntermediateDirectories: false ) try createVersionFile( @@ -105,7 +105,7 @@ final class CoreDataModelManifestMapperTests: TuistUnitTestCase { let urlToCurrentVersion = temporaryPath.appending(try RelativePath(validating: "model.xcdatamodeld")) .appending(component: ".xccurrentversion") let data = try XCTUnwrap(xcVersion.data(using: .utf8)) - try data.write(to: urlToCurrentVersion.asURL) + try data.write(to: URL(fileURLWithPath: urlToCurrentVersion.pathString)) } private func xcVersionDataString() -> String { diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/FileElement+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/FileElement+ManifestMapperTests.swift index db5fabb255c..5fe7a5ff363 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/FileElement+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/FileElement+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/Headers+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/Headers+ManifestMapperTests.swift index 09d41b26fd8..4af3ad24606 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/Headers+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/Headers+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/Platform+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/Platform+ManifestMapperTests.swift index 4544e0243d6..f2021a2a254 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/Platform+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/Platform+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/Project+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/Project+ManifestMapperTests.swift index e8004783505..73a075ddcf2 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/Project+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/Project+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistLoaderTesting import TuistSupport diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/ResourceFileElementManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/ResourceFileElementManifestMapperTests.swift index f7df045b78f..0f7811a8bb4 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/ResourceFileElementManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/ResourceFileElementManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/ResourceSynthesizer+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/ResourceSynthesizer+ManifestMapperTests.swift index f806f642820..455281a36ec 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/ResourceSynthesizer+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/ResourceSynthesizer+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistLoaderTesting import TuistSupportTesting diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/Scheme+ManifestMapper.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/Scheme+ManifestMapper.swift index a9960f3b8ef..ee61b4f33e7 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/Scheme+ManifestMapper.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/Scheme+ManifestMapper.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/Settings+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/Settings+ManifestMapperTests.swift index 3c9c7b6af59..b4efe1372e7 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/Settings+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/Settings+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/Stencil+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/Stencil+ManifestMapperTests.swift index 59fd3a59ccc..0b050886a53 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/Stencil+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/Stencil+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistLoaderTesting import TuistSupportTesting diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/Target+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/Target+ManifestMapperTests.swift index 8926ef0efd5..1e27923e274 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/Target+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/Target+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/TargetDependency+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/TargetDependency+ManifestMapperTests.swift index eb211856e06..6d50f56f8f0 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/TargetDependency+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/TargetDependency+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models+ManifestMappers/TargetScript+ManifestMapperTests.swift b/Tests/TuistLoaderTests/Models+ManifestMappers/TargetScript+ManifestMapperTests.swift index 680b26cad1e..ce4751ed72a 100644 --- a/Tests/TuistLoaderTests/Models+ManifestMappers/TargetScript+ManifestMapperTests.swift +++ b/Tests/TuistLoaderTests/Models+ManifestMappers/TargetScript+ManifestMapperTests.swift @@ -1,6 +1,6 @@ import Foundation +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XcodeGraph diff --git a/Tests/TuistLoaderTests/Models/GeneratorPathsTests.swift b/Tests/TuistLoaderTests/Models/GeneratorPathsTests.swift index d44fbbe8180..5aa1539bd26 100644 --- a/Tests/TuistLoaderTests/Models/GeneratorPathsTests.swift +++ b/Tests/TuistLoaderTests/Models/GeneratorPathsTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/ProjectDescriptionHelpers/Mocks/MockProjectDescriptionHelpersHasher.swift b/Tests/TuistLoaderTests/ProjectDescriptionHelpers/Mocks/MockProjectDescriptionHelpersHasher.swift index 07e14a8a329..db376f891c2 100644 --- a/Tests/TuistLoaderTests/ProjectDescriptionHelpers/Mocks/MockProjectDescriptionHelpersHasher.swift +++ b/Tests/TuistLoaderTests/ProjectDescriptionHelpers/Mocks/MockProjectDescriptionHelpersHasher.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path @testable import TuistLoader final class MockProjectDescriptionHelpersHasher: ProjectDescriptionHelpersHashing { diff --git a/Tests/TuistLoaderTests/ProjectDescriptionHelpers/ProjectDescriptionHelpersHasherTests.swift b/Tests/TuistLoaderTests/ProjectDescriptionHelpers/ProjectDescriptionHelpersHasherTests.swift index 2f65defa41d..280710139ea 100644 --- a/Tests/TuistLoaderTests/ProjectDescriptionHelpers/ProjectDescriptionHelpersHasherTests.swift +++ b/Tests/TuistLoaderTests/ProjectDescriptionHelpers/ProjectDescriptionHelpersHasherTests.swift @@ -1,5 +1,5 @@ +import Path import ProjectDescription -import TSCBasic import TuistCore import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/SwiftPackageManager/PackageInfoMapperTests.swift b/Tests/TuistLoaderTests/SwiftPackageManager/PackageInfoMapperTests.swift index 25bbc8423c7..f9a48eecf17 100644 --- a/Tests/TuistLoaderTests/SwiftPackageManager/PackageInfoMapperTests.swift +++ b/Tests/TuistLoaderTests/SwiftPackageManager/PackageInfoMapperTests.swift @@ -1,5 +1,5 @@ +import Path import ProjectDescription -import TSCBasic import TSCUtility import TuistCore import TuistSupport diff --git a/Tests/TuistLoaderTests/SwiftPackageManager/SettingsMapperTests.swift b/Tests/TuistLoaderTests/SwiftPackageManager/SettingsMapperTests.swift index 35ec87940a5..0d8565a72ed 100644 --- a/Tests/TuistLoaderTests/SwiftPackageManager/SettingsMapperTests.swift +++ b/Tests/TuistLoaderTests/SwiftPackageManager/SettingsMapperTests.swift @@ -1,5 +1,5 @@ +import Path import ProjectDescription -import TSCBasic import TSCUtility import TuistCore import TuistSupport diff --git a/Tests/TuistLoaderTests/SwiftPackageManager/SwiftPackageManagerModuleMapGeneratorTests.swift b/Tests/TuistLoaderTests/SwiftPackageManager/SwiftPackageManagerModuleMapGeneratorTests.swift index b1745edde5d..b37c161cdef 100644 --- a/Tests/TuistLoaderTests/SwiftPackageManager/SwiftPackageManagerModuleMapGeneratorTests.swift +++ b/Tests/TuistLoaderTests/SwiftPackageManager/SwiftPackageManagerModuleMapGeneratorTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TuistCoreTesting import TuistSupportTesting import XCTest diff --git a/Tests/TuistLoaderTests/Utils/ManifestFilesLocatorTests.swift b/Tests/TuistLoaderTests/Utils/ManifestFilesLocatorTests.swift index 68ea7e96f4c..f2845019fc3 100644 --- a/Tests/TuistLoaderTests/Utils/ManifestFilesLocatorTests.swift +++ b/Tests/TuistLoaderTests/Utils/ManifestFilesLocatorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/Utils/PluginsHelperTests.swift b/Tests/TuistLoaderTests/Utils/PluginsHelperTests.swift index bd6b37c8813..2e9c2a45194 100644 --- a/Tests/TuistLoaderTests/Utils/PluginsHelperTests.swift +++ b/Tests/TuistLoaderTests/Utils/PluginsHelperTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistLoaderTests/Utils/ProjectDescriptionSearchPathsTests.swift b/Tests/TuistLoaderTests/Utils/ProjectDescriptionSearchPathsTests.swift index 784c2aa1e2f..e8b4d4da3f0 100644 --- a/Tests/TuistLoaderTests/Utils/ProjectDescriptionSearchPathsTests.swift +++ b/Tests/TuistLoaderTests/Utils/ProjectDescriptionSearchPathsTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistLoader diff --git a/Tests/TuistMigrationIntegrationTests/Utilities/EmptyBuildSettingsCheckerIntegrationTests.swift b/Tests/TuistMigrationIntegrationTests/Utilities/EmptyBuildSettingsCheckerIntegrationTests.swift index 3eba19f4418..5132d75a389 100644 --- a/Tests/TuistMigrationIntegrationTests/Utilities/EmptyBuildSettingsCheckerIntegrationTests.swift +++ b/Tests/TuistMigrationIntegrationTests/Utilities/EmptyBuildSettingsCheckerIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistMigrationIntegrationTests/Utilities/SettingsToXCConfigExtractorIntegrationTests.swift b/Tests/TuistMigrationIntegrationTests/Utilities/SettingsToXCConfigExtractorIntegrationTests.swift index c2a771b1fb9..9611bbe789c 100644 --- a/Tests/TuistMigrationIntegrationTests/Utilities/SettingsToXCConfigExtractorIntegrationTests.swift +++ b/Tests/TuistMigrationIntegrationTests/Utilities/SettingsToXCConfigExtractorIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistMigrationIntegrationTests/Utilities/TargetsExtractorIntegrationTests.swift b/Tests/TuistMigrationIntegrationTests/Utilities/TargetsExtractorIntegrationTests.swift index 6cd9142b0cd..5a699d55109 100644 --- a/Tests/TuistMigrationIntegrationTests/Utilities/TargetsExtractorIntegrationTests.swift +++ b/Tests/TuistMigrationIntegrationTests/Utilities/TargetsExtractorIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistMigrationTests/Utilities/EmptyBuildSettingsCheckerTests.swift b/Tests/TuistMigrationTests/Utilities/EmptyBuildSettingsCheckerTests.swift index 7565e1c5470..540241263e0 100644 --- a/Tests/TuistMigrationTests/Utilities/EmptyBuildSettingsCheckerTests.swift +++ b/Tests/TuistMigrationTests/Utilities/EmptyBuildSettingsCheckerTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistMigration @testable import TuistSupportTesting diff --git a/Tests/TuistPluginTests/PluginServiceTests.swift b/Tests/TuistPluginTests/PluginServiceTests.swift index 43848bc4701..49b10f4d1db 100644 --- a/Tests/TuistPluginTests/PluginServiceTests.swift +++ b/Tests/TuistPluginTests/PluginServiceTests.swift @@ -1,5 +1,7 @@ import MockableTest -import ProjectDescription +import Path +import struct ProjectDescription.Plugin +import struct ProjectDescription.PluginLocation import TSCBasic import TuistCore import TuistCoreTesting @@ -134,13 +136,13 @@ final class PluginServiceTests: TuistUnitTestCase { ] ) var invokedCloneURL: String? - var invokedClonePath: AbsolutePath? + var invokedClonePath: Path.AbsolutePath? gitHandler.cloneToStub = { url, path in invokedCloneURL = url invokedClonePath = path } var invokedCheckoutID: String? - var invokedCheckoutPath: AbsolutePath? + var invokedCheckoutPath: Path.AbsolutePath? gitHandler.checkoutStub = { id, path in invokedCheckoutID = id invokedCheckoutPath = path @@ -178,13 +180,13 @@ final class PluginServiceTests: TuistUnitTestCase { ] ) var invokedCloneURL: String? - var invokedClonePath: AbsolutePath? + var invokedClonePath: Path.AbsolutePath? gitHandler.cloneToStub = { url, path in invokedCloneURL = url invokedClonePath = path } var invokedCheckoutID: String? - var invokedCheckoutPath: AbsolutePath? + var invokedCheckoutPath: Path.AbsolutePath? gitHandler.checkoutStub = { id, path in invokedCheckoutID = id invokedCheckoutPath = path @@ -321,7 +323,7 @@ final class PluginServiceTests: TuistUnitTestCase { let pluginName = "TestPlugin" let resourceTemplatesPath = pluginPath.appending(components: "ResourceSynthesizers") - try makeDirectories(resourceTemplatesPath) + try makeDirectories(.init(validating: resourceTemplatesPath.pathString)) manifestLoader.loadConfigStub = { _ in .test(plugins: [.local(path: .relativeToRoot(pluginPath.pathString))]) @@ -356,7 +358,7 @@ final class PluginServiceTests: TuistUnitTestCase { let pluginName = "TestPlugin" let resourceTemplatesPath = cachedPluginPath.appending(components: "ResourceSynthesizers") - try makeDirectories(resourceTemplatesPath) + try makeDirectories(.init(validating: resourceTemplatesPath.pathString)) manifestLoader.loadConfigStub = { _ in .test(plugins: [ProjectDescription.PluginLocation.git(url: pluginGitUrl, tag: pluginGitReference)]) @@ -397,7 +399,7 @@ final class PluginServiceTests: TuistUnitTestCase { ] } - try makeDirectories(templatePath) + try makeDirectories(.init(validating: templatePath.pathString)) // When manifestLoader.loadConfigStub = { _ in @@ -434,7 +436,7 @@ final class PluginServiceTests: TuistUnitTestCase { ] } - try makeDirectories(templatePath) + try makeDirectories(.init(validating: templatePath.pathString)) // When manifestLoader.loadConfigStub = { _ in diff --git a/Tests/TuistScaffoldIntegrationTests/Utils/TemplatesDirectoryLocatorIntegrationTests.swift b/Tests/TuistScaffoldIntegrationTests/Utils/TemplatesDirectoryLocatorIntegrationTests.swift index 4b34a6e04e7..ec64cd51595 100644 --- a/Tests/TuistScaffoldIntegrationTests/Utils/TemplatesDirectoryLocatorIntegrationTests.swift +++ b/Tests/TuistScaffoldIntegrationTests/Utils/TemplatesDirectoryLocatorIntegrationTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistScaffoldTests/TemplateGeneratorTests.swift b/Tests/TuistScaffoldTests/TemplateGeneratorTests.swift index 392e423ac0e..892d84109e0 100644 --- a/Tests/TuistScaffoldTests/TemplateGeneratorTests.swift +++ b/Tests/TuistScaffoldTests/TemplateGeneratorTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph import XCTest diff --git a/Tests/TuistServerTests/Session/CloudSessionControllerTests.swift b/Tests/TuistServerTests/Session/CloudSessionControllerTests.swift index 3f8bc7a408e..50521b884cd 100644 --- a/Tests/TuistServerTests/Session/CloudSessionControllerTests.swift +++ b/Tests/TuistServerTests/Session/CloudSessionControllerTests.swift @@ -1,7 +1,7 @@ import Foundation import Mockable import MockableTest -import TSCBasic +import Path import TuistSupport import XCTest diff --git a/Tests/TuistSupportIntegrationTests/System/SystemIntegrationTests.swift b/Tests/TuistSupportIntegrationTests/System/SystemIntegrationTests.swift deleted file mode 100644 index ebbca4ae5e9..00000000000 --- a/Tests/TuistSupportIntegrationTests/System/SystemIntegrationTests.swift +++ /dev/null @@ -1,59 +0,0 @@ -import TSCBasic -import XCTest -@testable import TuistSupport -@testable import TuistSupportTesting - -final class SystemIntegrationTests: TuistTestCase { - var subject: System! - - override func setUp() { - super.setUp() - subject = System() - } - - override func tearDown() { - subject = nil - super.tearDown() - } - - func test_run_valid_command() { - XCTAssertNoThrow(try subject.run(["ls"])) - } - - func test_run_invalid_command() { - XCTAssertThrowsError(try subject.run(["abcdef", "ghi"])) - } - - func test_run_valid_command_that_returns_nonzero_exit() { - XCTAssertThrowsError(try subject.run(["ls", "abcdefghi"])) - } - - func test_run_output_is_redirected() throws { - var output = "" - try subject.run( - ["echo", "hola"], - verbose: false, - environment: System.shared.env, - redirection: .stream(stdout: { bytes in - output = String(decoding: bytes, as: Unicode.UTF8.self) - }, stderr: { _ in }) - ) - - XCTAssertEqual(output.spm_chomp(), "hola") - } - - func test_run_errors() throws { - do { - try subject.runAndPrint(["/usr/bin/xcrun", "invalid"], verbose: false, environment: System.shared.env) - XCTFail("expected command to fail but it did not") - } catch { - XCTAssertTrue(error is TuistSupport.SystemError) - } - } - - func sandbox(_ name: String, value: String, do block: () throws -> Void) rethrows { - try? ProcessEnv.setVar(name, value: value) - _ = try? block() - try? ProcessEnv.unsetVar(name) - } -} diff --git a/Tests/TuistSupportTests/Extensions/AbsolutePath+ExtrasTests.swift b/Tests/TuistSupportTests/Extensions/AbsolutePath+ExtrasTests.swift index 9f091634d83..0c599836557 100644 --- a/Tests/TuistSupportTests/Extensions/AbsolutePath+ExtrasTests.swift +++ b/Tests/TuistSupportTests/Extensions/AbsolutePath+ExtrasTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistSupport diff --git a/Tests/TuistSupportTests/Extensions/FileManager+ExtrasTests.swift b/Tests/TuistSupportTests/Extensions/FileManager+ExtrasTests.swift index 463ce42cf4c..dfba2a5961e 100644 --- a/Tests/TuistSupportTests/Extensions/FileManager+ExtrasTests.swift +++ b/Tests/TuistSupportTests/Extensions/FileManager+ExtrasTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistSupport diff --git a/Tests/TuistSupportTests/Extensions/String+ExtrasTests.swift b/Tests/TuistSupportTests/Extensions/String+ExtrasTests.swift index a5fe6b63e2c..ad502d71a5b 100644 --- a/Tests/TuistSupportTests/Extensions/String+ExtrasTests.swift +++ b/Tests/TuistSupportTests/Extensions/String+ExtrasTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TSCUtility import XCTest diff --git a/Tests/TuistSupportTests/Models/InvalidGlobTests.swift b/Tests/TuistSupportTests/Models/InvalidGlobTests.swift index 16e0d2643a6..1a8739f91db 100644 --- a/Tests/TuistSupportTests/Models/InvalidGlobTests.swift +++ b/Tests/TuistSupportTests/Models/InvalidGlobTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistSupport @testable import TuistSupportTesting diff --git a/Tests/TuistSupportTests/SwiftPackageManager/SwiftPackageManagerControllerTests.swift b/Tests/TuistSupportTests/SwiftPackageManager/SwiftPackageManagerControllerTests.swift index 28a61df27ee..fff6b660977 100644 --- a/Tests/TuistSupportTests/SwiftPackageManager/SwiftPackageManagerControllerTests.swift +++ b/Tests/TuistSupportTests/SwiftPackageManager/SwiftPackageManagerControllerTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import TSCUtility import TuistCore import TuistSupport diff --git a/Tests/TuistSupportTests/System/SystemTests.swift b/Tests/TuistSupportTests/System/SystemTests.swift index 9484276282e..f184a3b176c 100644 --- a/Tests/TuistSupportTests/System/SystemTests.swift +++ b/Tests/TuistSupportTests/System/SystemTests.swift @@ -1,4 +1,5 @@ import Foundation +import Path import TSCBasic import XCTest @testable import TuistSupport diff --git a/Tests/TuistSupportTests/Utils/FileHandlerTests.swift b/Tests/TuistSupportTests/Utils/FileHandlerTests.swift index 81c0b43ea9c..117186e6b3f 100644 --- a/Tests/TuistSupportTests/Utils/FileHandlerTests.swift +++ b/Tests/TuistSupportTests/Utils/FileHandlerTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistSupport @testable import TuistSupportTesting @@ -43,13 +43,13 @@ final class FileHandlerTests: TuistUnitTestCase { let temporaryPath = try temporaryPath() let tempFile = temporaryPath.appending(component: "Temporary") let destFile = temporaryPath.appending(component: "Destination") - try "content".write(to: tempFile.asURL, atomically: true, encoding: .utf8) + try "content".write(to: URL(fileURLWithPath: tempFile.pathString), atomically: true, encoding: .utf8) // When try subject.replace(destFile, with: tempFile) // Then - let content = try String(contentsOf: destFile.asURL) + let content = try String(contentsOf: URL(fileURLWithPath: destFile.pathString)) XCTAssertEqual(content, "content") } @@ -135,7 +135,7 @@ final class FileHandlerTests: TuistUnitTestCase { create: true ).path) let rootTempPath = tempPath.parentDirectory - try fileManager.removeItem(at: tempPath.asURL) + try fileManager.removeItem(at: URL(fileURLWithPath: tempPath.pathString)) let content = try fileManager.contentsOfDirectory(atPath: rootTempPath.pathString) return content.count } diff --git a/Tests/TuistSupportTests/Utils/OpenerTests.swift b/Tests/TuistSupportTests/Utils/OpenerTests.swift index fe6d2eea216..7c2ed604fb2 100644 --- a/Tests/TuistSupportTests/Utils/OpenerTests.swift +++ b/Tests/TuistSupportTests/Utils/OpenerTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistSupport diff --git a/Tests/TuistSupportTests/Utils/TextTableTests.swift b/Tests/TuistSupportTests/Utils/TextTableTests.swift index df3beff7571..950b582b328 100644 --- a/Tests/TuistSupportTests/Utils/TextTableTests.swift +++ b/Tests/TuistSupportTests/Utils/TextTableTests.swift @@ -1,4 +1,4 @@ -import TSCBasic +import Path import XCTest @testable import TuistSupport diff --git a/Tests/XcodeGraphTests/Models/BinaryArchitectureTests.swift b/Tests/XcodeGraphTests/Models/BinaryArchitectureTests.swift index e6445069ae7..bc362aefbc2 100644 --- a/Tests/XcodeGraphTests/Models/BinaryArchitectureTests.swift +++ b/Tests/XcodeGraphTests/Models/BinaryArchitectureTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupport import XcodeGraph import XCTest diff --git a/Tests/XcodeGraphTests/Models/InfoPlistTests.swift b/Tests/XcodeGraphTests/Models/InfoPlistTests.swift index 808fea62267..d5415e3109f 100644 --- a/Tests/XcodeGraphTests/Models/InfoPlistTests.swift +++ b/Tests/XcodeGraphTests/Models/InfoPlistTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import TuistSupportTesting diff --git a/Tests/XcodeGraphTests/Models/LintingIssueTests.swift b/Tests/XcodeGraphTests/Models/LintingIssueTests.swift index d934b5a63c9..3fb9c45219f 100644 --- a/Tests/XcodeGraphTests/Models/LintingIssueTests.swift +++ b/Tests/XcodeGraphTests/Models/LintingIssueTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import XCTest @testable import TuistSupportTesting diff --git a/Tests/XcodeGraphTests/Models/ProjectTests.swift b/Tests/XcodeGraphTests/Models/ProjectTests.swift index ceb574895fa..e14f58ba617 100644 --- a/Tests/XcodeGraphTests/Models/ProjectTests.swift +++ b/Tests/XcodeGraphTests/Models/ProjectTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistCoreTesting import XcodeGraphTesting diff --git a/Tests/XcodeGraphTests/Models/SettingsTests.swift b/Tests/XcodeGraphTests/Models/SettingsTests.swift index 1d27363d116..d78f7f74d97 100644 --- a/Tests/XcodeGraphTests/Models/SettingsTests.swift +++ b/Tests/XcodeGraphTests/Models/SettingsTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistSupportTesting import XCTest @testable import XcodeGraph diff --git a/Tests/XcodeGraphTests/Models/TargetScriptTests.swift b/Tests/XcodeGraphTests/Models/TargetScriptTests.swift index fb5359e2fee..c613bb01ebd 100644 --- a/Tests/XcodeGraphTests/Models/TargetScriptTests.swift +++ b/Tests/XcodeGraphTests/Models/TargetScriptTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import XCTest @testable import XcodeGraph diff --git a/Tests/XcodeGraphTests/Models/TargetTests.swift b/Tests/XcodeGraphTests/Models/TargetTests.swift index 4fdc3f57c43..d9ada08cfbc 100644 --- a/Tests/XcodeGraphTests/Models/TargetTests.swift +++ b/Tests/XcodeGraphTests/Models/TargetTests.swift @@ -1,5 +1,5 @@ import Foundation -import TSCBasic +import Path import TuistCore import TuistSupport import XCTest diff --git a/Tuist/ProjectDescriptionHelpers/Module.swift b/Tuist/ProjectDescriptionHelpers/Module.swift index 6eb5885e5a2..4056a0ed2d2 100644 --- a/Tuist/ProjectDescriptionHelpers/Module.swift +++ b/Tuist/ProjectDescriptionHelpers/Module.swift @@ -111,7 +111,7 @@ public enum Module: String, CaseIterable { fileprivate var sharedDependencies: [TargetDependency] { return [ - .external(name: "SwiftToolsSupport"), + .external(name: "Path"), .external(name: "SystemPackage"), ] } @@ -212,13 +212,16 @@ public enum Module: String, CaseIterable { .target(name: Module.automation.targetName), .external(name: "GraphViz"), .external(name: "ArgumentParser"), + .external(name: "SwiftToolsSupport"), ] case .tuistBenchmark: [ + .external(name: "SwiftToolsSupport"), .external(name: "ArgumentParser"), ] case .tuistFixtureGenerator: [ + .external(name: "SwiftToolsSupport"), .external(name: "ArgumentParser"), ] case .projectAutomation, .projectDescription: @@ -226,6 +229,7 @@ public enum Module: String, CaseIterable { case .support: [ .target(name: Module.projectDescription.targetName), + .external(name: "SwiftToolsSupport"), .external(name: "AnyCodable"), .external(name: "XcodeProj"), .external(name: "KeychainAccess"), @@ -249,6 +253,7 @@ public enum Module: String, CaseIterable { .target(name: Module.analytics.targetName), .target(name: Module.plugin.targetName), .target(name: Module.xcodeProjectGenerator.targetName), + .external(name: "SwiftToolsSupport"), .external(name: "ArgumentParser"), .external(name: "GraphViz"), .external(name: "AnyCodable"), @@ -264,6 +269,7 @@ public enum Module: String, CaseIterable { .target(name: Module.support.targetName), .target(name: Module.xcodeProjectGenerator.targetName), .external(name: "XcodeProj"), + .external(name: "SwiftToolsSupport"), ] case .generator: [ @@ -275,6 +281,7 @@ public enum Module: String, CaseIterable { .external(name: "StencilSwiftKit"), .external(name: "XcodeProj"), .external(name: "GraphViz"), + .external(name: "SwiftToolsSupport"), ] case .scaffold: [ @@ -291,6 +298,7 @@ public enum Module: String, CaseIterable { .target(name: Module.support.targetName), .target(name: Module.projectDescription.targetName), .external(name: "XcodeProj"), + .external(name: "SwiftToolsSupport"), ] case .asyncQueue: [ @@ -307,6 +315,7 @@ public enum Module: String, CaseIterable { .target(name: Module.loader.targetName), .target(name: Module.support.targetName), .target(name: Module.scaffold.targetName), + .external(name: "SwiftToolsSupport"), ] case .analytics: [ @@ -324,6 +333,7 @@ public enum Module: String, CaseIterable { .target(name: Module.support.targetName), .external(name: "PathKit"), .external(name: "XcodeProj"), + .external(name: "SwiftToolsSupport"), ] case .dependencies: [ @@ -571,7 +581,6 @@ public enum Module: String, CaseIterable { .target(name: Module.core.testingTargetName!), .target(name: Module.xcodeProjectGenerator.testingTargetName!), .target(name: Module.loader.testingTargetName!), - .external(name: "SwiftToolsSupport"), .external(name: "XcodeProj"), ] case .kit: