Migrate to tuist/path (tuist#6378)

* Use tuist/path for paths * Some fixes * Force CI run * Fix linting issues --------- Co-authored-by: Daniele Formichelli <[email protected]>
hiltonc · Jun 10, 2024 · 042a8ac · 042a8ac
1 parent 024983a
commit 042a8ac
Show file tree

Hide file tree

Showing 606 changed files with 858 additions and 858 deletions.
diff --git 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
@@ -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,20 +13,22 @@ var targets: [Target] = [
         name: "tuistbenchmark",
         dependencies: [
             argumentParserDependency,
+            pathDependency,
             swiftToolsSupportDependency,
         ]
     ),
     .executableTarget(
         name: "tuistfixturegenerator",
         dependencies: [
             argumentParserDependency,
+            pathDependency,
             swiftToolsSupportDependency,
         ]
     ),
     .target(
         name: "XcodeGraph",
         dependencies: [
-            swiftToolsSupportDependency,
+            pathDependency,
             "AnyCodable",
             "TuistSupport",
             "Mockable",
@@ -39,15 +42,15 @@ var targets: [Target] = [
         dependencies: [
             "XcodeGraph",
             "TuistSupportTesting",
-            swiftToolsSupportDependency,
+            pathDependency,
             "AnyCodable",
         ],
         linkerSettings: [.linkedFramework("XCTest")]
     ),
     .target(
         name: "TuistCore",
         dependencies: [
-            swiftToolsSupportDependency,
+            pathDependency,
             "ProjectDescription",
             "TuistSupport",
             "XcodeGraph",
@@ -64,15 +67,15 @@ var targets: [Target] = [
             "TuistCore",
             "TuistSupportTesting",
             "XcodeGraphTesting",
-            swiftToolsSupportDependency,
+            pathDependency,
         ],
         linkerSettings: [.linkedFramework("XCTest")]
     ),
     .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,15 +146,15 @@ var targets: [Target] = [
             "TuistSupport",
             "TuistSupportTesting",
             "XcodeProj",
-            swiftToolsSupportDependency,
+            pathDependency,
         ],
         linkerSettings: [.linkedFramework("XCTest")]
     ),
     .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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 import Foundation
-import TSCBasic
+import Path
 
 public protocol FileContentHashing {
     func hash(path: AbsolutePath) throws -> String