From 186fbd7a73b1382a7a4323e9ab722f2f36c710e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 27 Aug 2024 20:44:07 +0300 Subject: [PATCH] examples: Update to cocoa 0.26 Part-of: --- Cargo.lock | 66 +++++++++++++++++++++++++++++++++----------- examples/Cargo.toml | 2 +- tutorials/Cargo.toml | 2 +- 3 files changed, 52 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 32a35b4bf..f8c4a1b5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -263,15 +263,15 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "block", "cocoa-foundation", - "core-foundation", - "core-graphics", + "core-foundation 0.10.0", + "core-graphics 0.24.0", "foreign-types", "libc", "objc", @@ -279,14 +279,14 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "block", - "core-foundation", - "core-graphics-types", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "libc", "objc", ] @@ -332,6 +332,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" @@ -345,8 +355,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", + "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", "libc", ] @@ -358,7 +381,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", ] @@ -770,7 +804,7 @@ dependencies = [ "bitflags 2.6.0", "cfg_aliases", "cgl", - "core-foundation", + "core-foundation 0.9.4", "dispatch", "glutin_egl_sys", "glutin_glx_sys", @@ -2948,8 +2982,8 @@ dependencies = [ "bytemuck", "calloop", "cfg_aliases", - "core-foundation", - "core-graphics", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "cursor-icon", "icrate", "js-sys", diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 0addf79f2..4a866f5f8 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -53,7 +53,7 @@ windows = { version = "0.58", features=["Win32_Graphics_Direct3D11", "Win32_Graphics_Imaging", "Win32_System_Com", "Foundation_Numerics"], optional = true } [target.'cfg(target_os = "macos")'.dependencies] -cocoa = "0.25" +cocoa = "0.26" objc = "0.2.7" [target.'cfg(target_os = "macos")'.build-dependencies] diff --git a/tutorials/Cargo.toml b/tutorials/Cargo.toml index c783e4ea5..f09c01995 100644 --- a/tutorials/Cargo.toml +++ b/tutorials/Cargo.toml @@ -20,7 +20,7 @@ async-channel = "2.0.0" futures = "0.3" [target.'cfg(target_os = "macos")'.dependencies] -cocoa = "0.25" +cocoa = "0.26" objc = "0.2.7" [target.'cfg(target_os = "macos")'.build-dependencies]