diff --git a/Cargo.lock b/Cargo.lock index 04f61fa501..36f54fc9bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1648,7 +1648,7 @@ dependencies = [ "block", "bytemuck", "codespan-reporting", - "core-graphics-types", + "core-graphics-types 0.1.3", "glow", "gpu-alloc", "gpu-alloc-ash", @@ -2287,7 +2287,7 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "core-foundation", + "core-foundation 0.9.4", "core-services", "exec", "fork", @@ -2349,7 +2349,7 @@ dependencies = [ "async-tungstenite", "chrono", "clock", - "cocoa", + "cocoa 0.26.0", "collections", "feature_flags", "fs", @@ -2408,9 +2408,25 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", + "core-graphics 0.24.0", "foreign-types 0.5.0", "libc", "objc", @@ -2424,8 +2440,22 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "libc", "objc", ] @@ -2786,6 +2816,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -2799,8 +2839,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "foreign-types 0.5.0", "libc", ] @@ -2812,7 +2865,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "libc", ] @@ -2822,7 +2886,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92567e81db522550ebaf742c5d875624ec7820c2c7ee5f8c60e4ce7c2ae3c0fd" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", ] [[package]] @@ -2831,8 +2895,8 @@ version = "20.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" dependencies = [ - "core-foundation", - "core-graphics", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "foreign-types 0.5.0", "libc", ] @@ -4252,8 +4316,8 @@ source = "git+https://github.com/zed-industries/font-kit?rev=40391b7#40391b7c004 dependencies = [ "bitflags 2.6.0", "byteorder", - "core-foundation", - "core-graphics", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "core-text", "dirs 5.0.1", "dwrote", @@ -4380,7 +4444,7 @@ dependencies = [ "ashpd", "async-tar", "async-trait", - "cocoa", + "cocoa 0.26.0", "collections", "fsevent", "futures 0.3.30", @@ -4419,7 +4483,7 @@ name = "fsevent" version = "0.1.0" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "fsevent-sys 3.1.0", "parking_lot", "tempfile", @@ -4889,11 +4953,11 @@ dependencies = [ "calloop", "calloop-wayland-source", "cbindgen", - "cocoa", + "cocoa 0.26.0", "collections", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", - "core-graphics", + "core-graphics 0.23.2", "core-text", "cosmic-text", "ctor", @@ -6422,7 +6486,7 @@ dependencies = [ "async-broadcast", "async-trait", "collections", - "core-foundation", + "core-foundation 0.9.4", "futures 0.3.30", "gpui", "live_kit_server", @@ -6720,7 +6784,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bindgen 0.65.1", - "core-foundation", + "core-foundation 0.9.4", "foreign-types 0.5.0", "metal", "objc", @@ -6775,7 +6839,7 @@ checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", - "core-graphics-types", + "core-graphics-types 0.1.3", "foreign-types 0.5.0", "log", "objc", @@ -8749,8 +8813,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e8caa82e31bb98fee12fa8f051c94a6aa36b07cddb03f0d4fc558988360ff1" dependencies = [ - "cocoa", - "core-graphics", + "cocoa 0.25.0", + "core-graphics 0.23.2", "objc", "raw-window-handle", ] @@ -9729,7 +9793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", @@ -10981,7 +11045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -11411,7 +11475,7 @@ dependencies = [ name = "time_format" version = "0.1.0" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "sys-locale", "time", diff --git a/Cargo.toml b/Cargo.toml index 86db0d00b9..5376acc79c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -330,7 +330,7 @@ cargo_toml = "0.20" chrono = { version = "0.4", features = ["serde"] } clap = { version = "4.4", features = ["derive"] } clickhouse = "0.12.0" -cocoa = "0.25" +cocoa = "0.26" core-foundation = "0.9.3" core-foundation-sys = "0.8.6" ctor = "0.2.6" diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml index 772352df1b..ade2ec0f53 100644 --- a/crates/fs/Cargo.toml +++ b/crates/fs/Cargo.toml @@ -35,7 +35,7 @@ util.workspace = true [target.'cfg(target_os = "macos")'.dependencies] fsevent.workspace = true objc = "0.2" -cocoa = "0.25" +cocoa = "0.26" [target.'cfg(not(target_os = "macos"))'.dependencies] notify = "6.1.1" diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs index aba1e8edf9..5ed12f8671 100644 --- a/crates/gpui/src/platform/mac/text_system.rs +++ b/crates/gpui/src/platform/mac/text_system.rs @@ -4,7 +4,7 @@ use crate::{ RenderGlyphParams, Result, ShapedGlyph, ShapedRun, SharedString, Size, SUBPIXEL_VARIANTS, }; use anyhow::anyhow; -use cocoa::appkit::{CGFloat, CGPoint}; +use cocoa::appkit::CGFloat; use collections::HashMap; use core_foundation::{ attributed_string::CFMutableAttributedString, @@ -16,6 +16,7 @@ use core_graphics::{ base::{kCGImageAlphaPremultipliedLast, CGGlyph}, color_space::CGColorSpace, context::CGContext, + display::CGPoint, }; use core_text::{ font::CTFont, diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs index 1c4cdb4d1a..c05c6f3299 100644 --- a/crates/gpui/src/platform/mac/window.rs +++ b/crates/gpui/src/platform/mac/window.rs @@ -9,7 +9,7 @@ use crate::{ use block::ConcreteBlock; use cocoa::{ appkit::{ - CGPoint, NSApplication, NSBackingStoreBuffered, NSColor, NSEvent, NSEventModifierFlags, + NSApplication, NSBackingStoreBuffered, NSColor, NSEvent, NSEventModifierFlags, NSFilenamesPboardType, NSPasteboard, NSScreen, NSView, NSViewHeightSizable, NSViewWidthSizable, NSWindow, NSWindowButton, NSWindowCollectionBehavior, NSWindowOcclusionState, NSWindowStyleMask, NSWindowTitleVisibility, @@ -20,7 +20,7 @@ use cocoa::{ NSSize, NSString, NSUInteger, }, }; -use core_graphics::display::{CGDirectDisplayID, CGRect}; +use core_graphics::display::{CGDirectDisplayID, CGPoint, CGRect}; use ctor::ctor; use futures::channel::oneshot; use objc::{ @@ -54,7 +54,7 @@ static mut VIEW_CLASS: *const Class = ptr::null(); #[allow(non_upper_case_globals)] const NSWindowStyleMaskNonactivatingPanel: NSWindowStyleMask = - unsafe { NSWindowStyleMask::from_bits_unchecked(1 << 7) }; + NSWindowStyleMask::from_bits_retain(1 << 7); #[allow(non_upper_case_globals)] const NSNormalWindowLevel: NSInteger = 0; #[allow(non_upper_case_globals)]