Skip to content

Revert "Copy helpers internally" again #8494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 14, 2025
Merged

Revert "Copy helpers internally" again #8494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eefa588
Revert "Copy helpers internally" again
pmattos Apr 12, 2025
0a69439
Fix CI build error in RegistryClientTests.swift
pmattos Apr 12, 2025
9d19649
Fix CI build error in IntegrationTests/BasicTests.swift
pmattos Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IntegrationTests/Tests/IntegrationTests/BasicTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ private struct BasicTests {
}

@Test(
.skipHostOS(.windows, "'try!' expression unexpectedly raised an error: TSCBasic.Process.Error.missingExecutableProgram(program: \"which\")"),
.skipHostOS(.windows, "'try!' expression unexpectedly raised an error: TSCBasic.Process.Error.missingExecutableProgram(program: \"which\")")
)
func testSwiftCompiler() throws {
try withTemporaryDirectory { tempDir in
Expand Down
6 changes: 2 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ let package = Package(

// MARK: Additional Test Dependencies

.testTarget(
.target(
/** SwiftPM internal build test suite support library */
name: "_InternalBuildTestSupport",
dependencies: [
Expand All @@ -734,13 +734,12 @@ let package = Package(
"SwiftBuildSupport",
"_InternalTestSupport"
],
path: "Sources/_InternalBuildTestSupport",
swiftSettings: [
.unsafeFlags(["-static"]),
]
),

.testTarget(
.target(
/** SwiftPM internal test suite support library */
name: "_InternalTestSupport",
dependencies: [
Expand All @@ -755,7 +754,6 @@ let package = Package(
.product(name: "OrderedCollections", package: "swift-collections"),
"Workspace",
],
path: "./Sources/_InternalTestSupport",
swiftSettings: [
.unsafeFlags(["-static"]),
]
Expand Down
43 changes: 0 additions & 43 deletions Sources/_InternalTestSupport/Process.swift
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions Sources/_InternalTestSupport/SkippedTestSupport.swift
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Tests/PackageRegistryTests/RegistryClientTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ final class RegistryClientTests: XCTestCase {
let availableManifests = try await registryClient.getAvailableManifests(
package: identity,
version: version,
observabilityScope: ObservabilitySystem.NOOP,
observabilityScope: ObservabilitySystem.NOOP
)

XCTAssertEqual(availableManifests["Package.swift"]?.toolsVersion, .v5_5)
Expand Down Expand Up @@ -3987,7 +3987,7 @@ extension RegistryClient {
package: package.underlying,
version: version,
fileSystem: InMemoryFileSystem(),
observabilityScope: ObservabilitySystem.NOOP,
observabilityScope: ObservabilitySystem.NOOP
)
}

Expand Down