Skip to content

Prepare QS to include Swift #3023

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
pjrobertson merged 15 commits into from
Feb 14, 2025
Merged

Prepare QS to include Swift #3023

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b21fd01
macos-12 runner is deprecated
n8henrie Jan 9, 2025
a0acd72
Remove complex macros, which break compilation with Swift
n8henrie Nov 18, 2024
43f91d8
Remove complex macros, which are incompatible with Swift
n8henrie Dec 11, 2024
1ea9d3d
Add missing imports
n8henrie Dec 11, 2024
c124ce7
Add blank swift file
n8henrie Dec 11, 2024
428afb1
Use Swift 6.0
n8henrie Dec 15, 2024
d2a89d0
Fix minimum version message and https URL
n8henrie Dec 15, 2024
4c02f2c
Remove outdated version target
n8henrie Dec 15, 2024
142dcb4
Add bare minimum to run swift from objc
n8henrie Jan 9, 2025
bf32556
Swift 6.0 not avail in GHA runners at this point (xcode 15), stick to…
n8henrie Jan 9, 2025
362a32f
Remove dummy Swift code
n8henrie Jan 26, 2025
502f0cd
Pin to swift 5.0 as swift 6.0 not supported in GitHub Actions runners…
n8henrie Jan 29, 2025
12553c1
Explanatory comment
n8henrie Feb 9, 2025
b3c384f
Fix old macos version alert
n8henrie Feb 12, 2025
3b01a6a
Rewrite macro blocks with enumerateKeysAndObjectsUsingBlock where pos…
n8henrie Feb 13, 2025
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
10 changes: 5 additions & 5 deletions Quicksilver/Code-App/QSController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ + (void)initialize {
if (![NSApplication isMavericks]) {
NSBundle *appBundle = [NSBundle mainBundle];

NSString *minimumVersionString = @"macOS 10.14+";
NSString *oldVersionsString = @"10.14";
NSDictionary *infoDict = [appBundle infoDictionary];
NSString *minVer = infoDict[@"LSMinimumSystemVersion"];
NSString *minimumVersionString = [NSString stringWithFormat:@"macOS %@+", minVer];

NSAlert *alert = [[NSAlert alloc] init];
alert.messageText = [NSString stringWithFormat:
Expand All @@ -60,9 +61,8 @@ + (void)initialize {
minimumVersionString
];
alert.informativeText = [NSString stringWithFormat:
NSLocalizedString(@"Recent versions of Quicksilver require %@. Older %@ compatible versions are available from the https://qsapp.com/download.php", @"macOS version required alert message"),
minimumVersionString,
oldVersionsString];
NSLocalizedString(@"Recent versions of Quicksilver require %@. Older Quicksilver versions are available from https://qsapp.com/download.php", @"macOS version required alert message"),
minimumVersionString];
[alert addButtonWithTitle:NSLocalizedString(@"OK", nil)];

[alert runModal];
Expand Down