From 7721b55808d6fa8f9b1c74ec4820661a30e4aebc Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Mon, 5 Feb 2024 21:49:00 -0800
Subject: [PATCH] Refactor cli and gpui dependnecies based on PR review
 feedback

---
 Cargo.lock             | 41 +++++++++++++++++++++++++++++++++++++++++
 crates/cli/Cargo.toml  |  6 +++---
 crates/gpui/Cargo.toml |  7 ++++---
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 37f3b09130..5b1b221dda 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1421,8 +1421,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap 3.2.25",
+ "core-foundation",
+ "core-services",
  "dirs 3.0.2",
  "ipc-channel",
+ "plist",
  "serde",
  "serde_derive",
  "util",
@@ -1873,6 +1876,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-services"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92567e81db522550ebaf742c5d875624ec7820c2c7ee5f8c60e4ce7c2ae3c0fd"
+dependencies = [
+ "core-foundation",
+]
+
 [[package]]
 name = "core-text"
 version = "19.2.0"
@@ -4289,6 +4301,15 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "line-wrap"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
+dependencies = [
+ "safemem",
+]
+
 [[package]]
 name = "linkme"
 version = "0.3.17"
@@ -5776,6 +5797,20 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
+[[package]]
+name = "plist"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa"
+dependencies = [
+ "base64 0.21.4",
+ "indexmap 1.9.3",
+ "line-wrap",
+ "quick-xml",
+ "serde",
+ "time",
+]
+
 [[package]]
 name = "plugin"
 version = "0.1.0"
@@ -7010,6 +7045,12 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "safemem"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+
 [[package]]
 name = "salsa20"
 version = "0.8.1"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index aa5ff1dcc3..d790644e99 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -23,6 +23,6 @@ serde_derive.workspace = true
 util = { path = "../util" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-#core-foundation = "0.9"
-#core-services = "0.2"
-#plist = "1.3"
+core-foundation = "0.9"
+core-services = "0.2"
+plist = "1.3"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index cc14ee4dfe..2ba8a1f6f0 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -26,9 +26,6 @@ anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
 bitflags = "2.4.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
-bytemuck = "1"
 collections = { path = "../collections" }
 ctor.workspace = true
 derive_more.workspace = true
@@ -101,3 +98,7 @@ objc = "0.2"
 flume = "0.11"
 xcb = { version = "1.3", features = ["as-raw-xcb-connection"] }
 as-raw-xcb-connection = "1"
+#TODO: use these on all platforms
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
+bytemuck = "1"