Fix app resource bundle crash#1
Merged
Merged
Conversation
mbelinky
force-pushed
the
codex/fix-app-resource-bundle-crash
branch
from
6f0b33d to
dc69f32
Compare
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
2 participants
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.
Summary
Fixes a macOS settings-window crash when CrawlBar's SwiftPM resource bundle is missing from the packaged app.
The crash report showed
Bundle.moduleasserting fromCrawlBarIconFactory.bundledIcon(for:)while rendering branded icons in Settings. This replaces the directBundle.moduleaccess with an optional bundle lookup that falls back to drawn icons, and makesScripts/package_app.shfail if the expected resource bundle is not packaged.Verification
swift buildswift run crawlbar-selftestScripts/package_app.shtest -f dist/CrawlBar.app/CrawlBar_CrawlBar.bundle/google.png && test -f dist/CrawlBar.app/CrawlBar_CrawlBar.bundle/granola.png && test -f dist/CrawlBar.app/CrawlBar_CrawlBar.bundle/x.pngdist/CrawlBar.app/Contents/Helpers/crawlbar apps --jsondist/CrawlBar.app/Contents/Helpers/crawlbar metadata --jsondist/CrawlBar.app/Contents/Helpers/crawlbar config validategit diff --check