Update dependencies

Signed-off-by: Visual Ehrmanntraut <[email protected]>
ChefKissInc · Apr 19, 2024 · 276f85b · 276f85b
1 parent 075eb45
commit 276f85b
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 46 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,35 +21,29 @@ lto = "thin"
 
 [dependencies]
 winit = { version = "0.29.15", default-features = true }
-eframe = { version = "0.26.2", default-features = false, features = [
+eframe = { version = "0.27.2", default-features = false, features = [
     "accesskit",
     "persistence",
     "wgpu",
     "wayland",
     "x11",
 ] }
-egui = { version = "0.26.2", default-features = false, features = [
+egui = { version = "0.27.2", default-features = false, features = [
     "persistence",
 ] }
-egui_extras = "0.26.2"
+egui_extras = "0.27.2"
 hex = "0.4.3"
-plist = "1.6.0"
+plist = "1.6.1"
 rfd = "0.14.1"
-serde = { version = "1.0.197", features = ["derive"] }
-egui-modal = "0.3.5"
+serde = { version = "1.0.198", features = ["derive"] }
+egui-modal = "0.3.6"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-icrate = { version = "0.1.0", features = [
-    "Foundation",
-    "Foundation_NSString",
-    "Foundation_NSThread",
-    "AppKit",
-    "AppKit_NSApplication",
-    "AppKit_NSMenu",
-    "AppKit_NSMenuItem",
+icrate = { version = "0.1.2", features = ["objective-c"] }
+objc2-app-kit = { version = "0.2.0", features = [
+    "NSResponder",
+    "NSApplication",
+    "NSMenu",
+    "NSMenuItem",
 ] }
-
-[patch.crates-io]
-eframe = { git = "https://github.com/emilk/egui" }
-egui = { git = "https://github.com/emilk/egui" }
-egui_extras = { git = "https://github.com/emilk/egui" }
+objc2-foundation = { version = "0.2.0", features = ["NSString", "NSThread"] }
diff --git a/build.rs b/build.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 fn main() {
     println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.13");

diff --git a/src/app.rs b/src/app.rs
@@ -1,17 +1,16 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 use egui::{Align, Layout, ViewportCommand};
 use egui_extras::{Column, TableBuilder};
 #[cfg(target_os = "macos")]
-use icrate::{
-    objc2::{
-        declare_class, msg_send_id, mutability::MainThreadOnly, rc::Id, sel, ClassType,
-        DeclaredClass,
-    },
-    AppKit::{NSApplication, NSMenu, NSMenuItem},
-    Foundation::{ns_string, MainThreadMarker, NSObject, NSObjectProtocol},
+use icrate::objc2::{
+    declare_class, msg_send_id, mutability::MainThreadOnly, rc::Id, sel, ClassType, DeclaredClass,
 };
+#[cfg(target_os = "macos")]
+use objc2_app_kit::{NSApplication, NSMenu, NSMenuItem};
+#[cfg(target_os = "macos")]
+use objc2_foundation::{ns_string, MainThreadMarker, NSObject, NSObjectProtocol};
 use plist::{Dictionary, Value};
 use serde::{Deserialize, Serialize};
 #[cfg(target_os = "macos")]

diff --git a/src/main.rs b/src/main.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 #![deny(warnings, clippy::cargo, clippy::nursery, unused_extern_crates)]

diff --git a/src/style.rs b/src/style.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 use egui::{FontData, FontDefinitions, FontFamily};
 

diff --git a/src/utils.rs b/src/utils.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 use plist::Value;
 

diff --git a/src/widgets/click_text_edit.rs b/src/widgets/click_text_edit.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 use egui::{
     Color32, Context, CursorIcon, Id, Key, Response, RichText, TextEdit, TextStyle, Ui, Widget,

diff --git a/src/widgets/entry.rs b/src/widgets/entry.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 use std::{
     sync::{Arc, Mutex},

diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 pub mod click_text_edit;
 pub mod entry;

diff --git a/src/widgets/toggle.rs b/src/widgets/toggle.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 use egui::Widget;
 

diff --git a/src/widgets/value.rs b/src/widgets/value.rs
@@ -1,5 +1,5 @@
-//!  Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
-//!  See LICENSE for details.
+//! Copyright © 2022-2024 ChefKiss Inc. Licensed under the Thou Shalt Not Profit License version 1.5.
+//! See LICENSE for details.
 
 use std::sync::{Arc, Mutex};