Skip to content

Bump swift-argument-parser to 1.4.0 #7450

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 7 commits into from
Jul 9, 2024
Merged

Bump swift-argument-parser to 1.4.0 #7450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e979ee1
Bump `swift-argument-parser` to 1.3.1
MaxDesiatov Apr 10, 2024
5249d7a
Bump `swift-argument-parser` to 1.4.0
MaxDesiatov May 29, 2024
cfde776
Merge branch 'main' of github.com:apple/swift-package-manager into ma…
MaxDesiatov Jun 28, 2024
bacb85a
Work around `swift-bootstrap` inability to handle plugins
MaxDesiatov Jun 28, 2024
63af028
Merge branch 'main' of github.com:swiftlang/swift-package-manager int…
MaxDesiatov Jul 4, 2024
59fb579
XFAIL `testUsage` due to ArgumentParser 1.4.0 regression
MaxDesiatov Jul 4, 2024
c43d188
Update PackageCommandTests.swift
MaxDesiatov Jul 4, 2024
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 Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
// 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.
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.2")),
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.4.0")),
.package(url: "https://github.com/apple/swift-driver.git", branch: relatedDependenciesBranch),
.package(url: "https://github.com/apple/swift-crypto.git", .upToNextMinor(from: "3.0.0")),
.package(url: "https://github.com/swiftlang/swift-syntax.git", branch: relatedDependenciesBranch),
Expand Down
5 changes: 3 additions & 2 deletions Tests/CommandsTests/PackageCommandTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ final class PackageCommandTests: CommandsTestCase {
}

func testUsage() async throws {
throw XCTSkip("rdar://131126477")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? The reason for skipping is opaque to non apple contributors without a comment

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a regression in ArgumentParser 1.4.0 that won't allow this test to pass.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure but what's the failure, because if it's noted in source and linked to a GitHub issue then others can contribute more easily.

do {
_ = try await execute(["-help"])
_ = try await execute(["-halp"])
XCTFail("expecting `execute` to fail")
} catch SwiftPMError.executionFailure(_, _, let stderr) {
XCTAssertMatch(stderr, .contains("Usage: swift package"))
Expand Down Expand Up @@ -102,7 +103,7 @@ final class PackageCommandTests: CommandsTestCase {
}
}

func testUnknownSubommand() async throws {
func testUnknownSubcommand() async throws {
try await fixture(name: "Miscellaneous/ExeTest") { fixturePath in
await XCTAssertThrowsCommandExecutionError(try await execute(["foo"], packagePath: fixturePath)) { error in
XCTAssertMatch(error.stderr, .contains("Unknown subcommand or plugin name ‘foo’"))
Expand Down