more

Author: tomerd

Package.swift

@@ -740,7 +740,8 @@ if ProcessInfo.processInfo.environment["SWIFTPM_LLBUILD_FWK"] == nil {
 
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
     package.dependencies += [
-        .package(url: "https://github.com/apple/swift-tools-support-core.git", branch: relatedDependenciesBranch),
+        //.package(url: "https://github.com/apple/swift-tools-support-core.git", branch: relatedDependenciesBranch),
+        .package(path: "../swift-tools-support-core"),
         // The 'swift-argument-parser' version declared here must match that
         // used by 'swift-driver' and 'sourcekit-lsp'. Please coordinate
         // dependency version changes here with those projects.

Tests/CommandsTests/PackageToolTests.swift

@@ -546,11 +546,11 @@ final class PackageToolTests: CommandsTestCase {
 
         let manifestA = Manifest.createRootManifest(
             displayName: "PackageA",
-            path: .init(path: "/PackageA"),
+            path: "/PackageA",
             toolsVersion: .v5_3,
             dependencies: [
-                .fileSystem(path: .init(path: "/PackageB")),
-                .fileSystem(path: .init(path: "/PackageC")),
+                .fileSystem(path: "/PackageB"),
+                .fileSystem(path: "/PackageC"),
             ],
             products: [
                 try .init(name: "exe", type: .executable, targets: ["TargetA"])
@@ -562,11 +562,11 @@ final class PackageToolTests: CommandsTestCase {
 
         let manifestB = Manifest.createFileSystemManifest(
             displayName: "PackageB",
-            path: .init(path: "/PackageB"),
+            path: "/PackageB",
             toolsVersion: .v5_3,
             dependencies: [
-                .fileSystem(path: .init(path: "/PackageC")),
-                .fileSystem(path: .init(path: "/PackageD")),
+                .fileSystem(path: "/PackageC"),
+                .fileSystem(path: "/PackageD"),
             ],
             products: [
                 try .init(name: "PackageB", type: .library(.dynamic), targets: ["TargetB"])
@@ -578,10 +578,10 @@ final class PackageToolTests: CommandsTestCase {
 
         let manifestC = Manifest.createFileSystemManifest(
             displayName: "PackageC",
-            path: .init(path: "/PackageC"),
+            path: "/PackageC",
             toolsVersion: .v5_3,
             dependencies: [
-                .fileSystem(path: .init(path: "/PackageD")),
+                .fileSystem(path: "/PackageD"),
             ],
             products: [
                 try .init(name: "PackageC", type: .library(.dynamic), targets: ["TargetC"])
@@ -593,7 +593,7 @@ final class PackageToolTests: CommandsTestCase {
 
         let manifestD = Manifest.createFileSystemManifest(
             displayName: "PackageD",
-            path: .init(path: "/PackageD"),
+            path: "/PackageD",
             toolsVersion: .v5_3,
             products: [
                 try .init(name: "PackageD", type: .library(.dynamic), targets: ["TargetD"])

Tests/PackageGraphPerformanceTests/PackageGraphPerfTests.swift

@@ -112,7 +112,7 @@ class PackageGraphPerfTests: XCTestCasePerf {
 
         let root = Manifest.createRootManifest(
             displayName: "PackageA",
-            path: .init(path: "/PackageA"),
+            path: "/PackageA",
             toolsVersion: .v5_7,
             dependencies: try packageNumberSequence.map({ .fileSystem(path: try .init(validating: "/Package\($0)")) }),
             targets: [try .init(name: "TargetA", dependencies: ["Target1"]) ]

Tests/PackageLoadingPerformanceTests/ManifestLoadingTests.swift

@@ -42,7 +42,7 @@ class ManifestLoadingPerfTests: XCTestCasePerf {
                 for _ in 0..<N {
                     let manifest = try! self.manifestLoader.load(
                         manifestPath: path,
-                        packageKind: .root(.init(path: "/Trivial")),
+                        packageKind: .root("/Trivial"),
                         toolsVersion: .v4_2,
                         fileSystem: localFileSystem,
                         observabilityScope: ObservabilitySystem.NOOP
@@ -77,7 +77,7 @@ class ManifestLoadingPerfTests: XCTestCasePerf {
                 for _ in 0..<N {
                     let manifest = try! self.manifestLoader.load(
                         manifestPath: path,
-                        packageKind: .root(.init(path: "/Trivial")),
+                        packageKind: .root("/Trivial"),
                         toolsVersion: .v4_2,
                         fileSystem: localFileSystem,
                         observabilityScope: ObservabilitySystem.NOOP