Skip to content

Commit 49e69c7

Browse files
authored
Revert "Copy helpers internally" again (#8494)
### Motivation: Pull request #8476 was breaking SwiftPM builds in Xcode (i.e., the _package resolution_ step): <img src="https://github.com/user-attachments/assets/2424e52c-1198-45c2-aa82-68c73ef5e9d6" width=600/> ### Modifications: This reverts commit 1d48e0a.
1 parent 3d063d0 commit 49e69c7

File tree

5 files changed

+5
-120
lines changed

5 files changed

+5
-120
lines changed

IntegrationTests/Tests/IntegrationTests/BasicTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private struct BasicTests {
9494
}
9595

9696
@Test(
97-
.skipHostOS(.windows, "'try!' expression unexpectedly raised an error: TSCBasic.Process.Error.missingExecutableProgram(program: \"which\")"),
97+
.skipHostOS(.windows, "'try!' expression unexpectedly raised an error: TSCBasic.Process.Error.missingExecutableProgram(program: \"which\")")
9898
)
9999
func testSwiftCompiler() throws {
100100
try withTemporaryDirectory { tempDir in

Package.swift

+2-4
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ let package = Package(
725725

726726
// MARK: Additional Test Dependencies
727727

728-
.testTarget(
728+
.target(
729729
/** SwiftPM internal build test suite support library */
730730
name: "_InternalBuildTestSupport",
731731
dependencies: [
@@ -734,13 +734,12 @@ let package = Package(
734734
"SwiftBuildSupport",
735735
"_InternalTestSupport"
736736
],
737-
path: "Sources/_InternalBuildTestSupport",
738737
swiftSettings: [
739738
.unsafeFlags(["-static"]),
740739
]
741740
),
742741

743-
.testTarget(
742+
.target(
744743
/** SwiftPM internal test suite support library */
745744
name: "_InternalTestSupport",
746745
dependencies: [
@@ -755,7 +754,6 @@ let package = Package(
755754
.product(name: "OrderedCollections", package: "swift-collections"),
756755
"Workspace",
757756
],
758-
path: "./Sources/_InternalTestSupport",
759757
swiftSettings: [
760758
.unsafeFlags(["-static"]),
761759
]

Sources/_InternalTestSupport/Process.swift

-43
This file was deleted.

Sources/_InternalTestSupport/SkippedTestSupport.swift

-70
This file was deleted.

Tests/PackageRegistryTests/RegistryClientTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ final class RegistryClientTests: XCTestCase {
803803
let availableManifests = try await registryClient.getAvailableManifests(
804804
package: identity,
805805
version: version,
806-
observabilityScope: ObservabilitySystem.NOOP,
806+
observabilityScope: ObservabilitySystem.NOOP
807807
)
808808

809809
XCTAssertEqual(availableManifests["Package.swift"]?.toolsVersion, .v5_5)
@@ -3987,7 +3987,7 @@ extension RegistryClient {
39873987
package: package.underlying,
39883988
version: version,
39893989
fileSystem: InMemoryFileSystem(),
3990-
observabilityScope: ObservabilitySystem.NOOP,
3990+
observabilityScope: ObservabilitySystem.NOOP
39913991
)
39923992
}
39933993

0 commit comments

Comments
 (0)