Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ jobs:
shared-key: release-macos-arm64

- name: Build release
# Keep in step with LSMinimumSystemVersion in packaging/macos/Info.plist.
env:
MACOSX_DEPLOYMENT_TARGET: "14.0"
run: cargo build --locked --release

- name: Package app (.dmg, unsigned)
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "local-dev-proxy"
version = "0.0.19"
version = "0.0.20"
edition = "2024"
description = "Local development process orchestration with a built-in reverse proxy"
authors = ["Andrew Chen <hello@andrewtheguy.com>"]
Expand Down Expand Up @@ -36,8 +36,8 @@ windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_System_

[target.'cfg(target_os = "macos")'.dependencies]
objc2 = "0.6.4"
objc2-app-kit = { version = "0.3.2", default-features = false, features = ["std", "NSApplication", "NSResponder"] }
objc2-foundation = { version = "0.3.2", default-features = false, features = ["std", "block2", "NSNotification", "NSOperation", "NSString"] }
objc2-app-kit = { version = "0.3.2", default-features = false, features = ["std", "NSApplication", "NSResponder", "NSWindow"] }
objc2-foundation = { version = "0.3.2", default-features = false, features = ["std", "block2", "NSArray", "NSNotification", "NSOperation", "NSString"] }
block2 = "0.6.2"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion packaging/macos/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
<key>NSHighResolutionCapable</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>11.0</string>
<string>14.0</string>
</dict>
</plist>
11 changes: 8 additions & 3 deletions src/desktop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -766,9 +766,14 @@ mod dock {
NSApplicationActivationPolicy::Accessory
});
if visible {
// `activate` needs macOS 14; this covers older releases too.
#[allow(deprecated)]
app.activateIgnoringOtherApps(true);
// `activate` only requests activation, which macOS refuses while
// another app is in use; raise the window so it is seen regardless.
app.activate();
for window in app.windows().iter() {
if window.canBecomeMainWindow() {
window.orderFrontRegardless();
}
}
}
}

Expand Down
Loading