Skip to content

Simplify version formatting #2

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
brettinternet merged 1 commit into from
Sep 21, 2026
Merged

Simplify version formatting #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions HyperWindow/Functions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ func isTrusted(prompt: Bool) -> Bool {
}


func formattedVersion(shortVersion: String, bundleVersion: String, short: Bool = false) -> String {
short ? shortVersion : "\(shortVersion) (\(bundleVersion))"
}

func appVersion(short: Bool = false) -> String {
let shortVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "-"
if short {
return shortVersion
} else {
let bundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "-"
return "\(shortVersion) (\(bundleVersion))"
}
let bundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "-"
return formattedVersion(shortVersion: shortVersion, bundleVersion: bundleVersion, short: short)
}

func settingsVersion(infoDictionary: [String: Any] = Bundle.main.infoDictionary ?? [:]) -> String {
Expand Down
5 changes: 5 additions & 0 deletions HyperWindowTests/PreferencesControllerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ final class PreferencesControllerTests: XCTestCase {
XCTAssertTrue(controls.allSatisfy { contentView.convert($0.bounds, from: $0).maxX <= contentView.bounds.maxX })
}

func testFormattedVersionFormatsShortAndFullVersions() {
XCTAssertEqual(formattedVersion(shortVersion: "1.2.3", bundleVersion: "42", short: true), "1.2.3")
XCTAssertEqual(formattedVersion(shortVersion: "1.2.3", bundleVersion: "42"), "1.2.3 (42)")
}

func testSettingsVersionIncludesCommitForUntaggedBuild() {
let version = settingsVersion(infoDictionary: [
"CFBundleShortVersionString": "1.2.3",
Expand Down