Repository navigation
Move to Xcode 26.2 / Swift 6.2 and com.istorry bundle IDs - #1
Merged
Merged
Conversation
- Bundle IDs: com.istorry.Whisky, com.istorry.WhiskyCmd, com.istorry.Whisky.WhiskyThumbnail (incl. WhiskyKit fallback) - Drop upstream development team ID - Mark project and schemes as upgraded for Xcode 26.2; enable project-wide user script sandboxing and string catalog symbols, keeping sandboxing off for the Whisky target's SwiftLint phase - WhiskyKit: swift-tools-version 6.2, swiftLanguageModes, https dependency URL - SwiftLint: exclude nested .build directories
Replaces the Ubuntu SwiftLint workflow, which used a years-old SwiftLint image and did not build the app, with a macos-26 job that lints with a checksum-verified SwiftLint 0.65.1 and builds Whisky and WhiskyCmd against the committed Package.resolved. Points the README badge at the fork.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Groundwork for maintaining the fork.
Changes
com.istorry.Whisky,com.istorry.WhiskyCmd,com.istorry.Whisky.WhiskyThumbnail, including theBundle.whiskyBundleIdentifierfallback that WhiskyCmd relies on to find bottles.LastUpgradeCheck = 2620). Enabled project-wideENABLE_USER_SCRIPT_SANDBOXINGandSTRING_CATALOG_GENERATE_SYMBOLS. Sandboxing stays off for theWhiskytarget, since its SwiftLint phase reads the whole repo.swift-tools-version: 6.2,swiftLanguageModes: [.v6], SemanticVersion over https instead of SSH..builddirectories. Before this, aswift buildinside WhiskyKit broke the app build.Verification
xcodebuildDebug + Release (Whisky) and Release (WhiskyCmd) build with no errors and no project warnings (Xcode 26.3, Swift 6.2.4, signing disabled)swiftlint --strictpassesNot covered: launching the app or running Wine. There is no test suite.
Known follow-ups
~/Library/Containers/<bundle-id>) and Wine (~/Library/Application Support/<bundle-id>) are keyed by bundle ID. Users coming from upstream need a one-time migration fromcom.isaacmarovitz.Whiskybefore the first release.2.xbranch and should be pinned.