Skip to content

Use: Detect Package.swift as a project marker #536

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

Open
vvaditya23 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use: Detect Package.swift as a project marker #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfbfb55
Use: Detect `Package.swift` as a project marker (issue #430)
vvaditya23 May 12, 2026
fd1efc8
Add test to ensure `.swift-version` file is created
vvaditya23 May 12, 2026
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
9 changes: 5 additions & 4 deletions Sources/Swiftly/Use.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,18 @@ struct Use: SwiftlyCommand {
}

static func findNewVersionFile(_ ctx: SwiftlyCoreContext) async throws -> FilePath? {
let projectMarkers = [".git", "Package.swift"]
var cwd = ctx.currentDirectory

while !cwd.isEmpty && !cwd.removingRoot().isEmpty {
guard try await fs.exists(atPath: cwd) else {
break
}

let gitDir = cwd / ".git"

if try await fs.exists(atPath: gitDir) {
return cwd / ".swift-version"
for marker in projectMarkers {
if try await fs.exists(atPath: cwd / marker) {
return cwd / ".swift-version"
}
}

cwd = cwd.removingLastComponent()
Expand Down
14 changes: 14 additions & 0 deletions Tests/SwiftlyTests/UseTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,20 @@ import Testing
// THEN: the use command reports this toolchain to be in use
#expect(output.contains(where: { $0.contains(ToolchainVersion.newMainSnapshot.name) }))

// GIVEN: a directory with no swift version file but containing a Package.swift
try await fs.remove(atPath: versionFile)
let packageFile = SwiftlyTests.ctx.currentDirectory / "Package.swift"
try "// swift-tools-version:6.3".write(to: packageFile, atomically: true)
// WHEN: using a toolchain version
try await SwiftlyTests.runCommand(
Use.self, ["use", ToolchainVersion.newReleaseSnapshot.name]
)
// THEN: a swift version file is created
#expect(try await fs.exists(atPath: versionFile))
// THEN: the version file contains the specified version
versionFileContents = try String(contentsOf: versionFile)
#expect(ToolchainVersion.newReleaseSnapshot.name == versionFileContents)

// GIVEN: a directory with no swift version file at the top of a git repository
try await fs.remove(atPath: versionFile)
let gitDir = SwiftlyTests.ctx.currentDirectory / ".git"
Expand Down