Merge branch 'main' into feat/reactions

Author: Bloeckchengrafik

Cargo.lock

@@ -3,4 +3,10 @@ resolver = "2"
 members = ["src/ui", "src/cache", "src/chat", "src/discord"]
 
 [workspace.dependencies]
-chrono = "0.4.38"
+chrono = "0.4.38"
+gpui = { git = "https://github.com/scopeclient/zed.git", branch = "feature/export-platform-window", default-features = false, features = [
+  "http_client",
+  "font-kit",
+] }
+components = { package = "ui", git = "https://github.com/scopeclient/components", version = "0.1.0" }
+reqwest_client = { git = "https://github.com/scopeclient/zed.git", branch = "feature/export-platform-window", version = "0.1.0" }

Cargo.toml

@@ -4,10 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-gpui = { git = "https://github.com/huacnlee/zed.git", branch = "export-platform-window", default-features = false, features = [
-  "http_client",
-  "font-kit",
-] }
+gpui.workspace = true
 rand = "0.8.5"
 scope-chat = { version = "0.1.0", path = "../chat" }
 tokio = "1.41.1"

src/cache/Cargo.toml

@@ -4,9 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-gpui = { git = "https://github.com/huacnlee/zed.git", branch = "export-platform-window", default-features = false, features = [
-  "http_client",
-  "font-kit",
-] }
 tokio = "1.41.1"
 chrono.workspace = true
+gpui.workspace = true

src/chat/Cargo.toml

@@ -4,10 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-gpui = { git = "https://github.com/huacnlee/zed.git", branch = "export-platform-window", default-features = false, features = [
-  "http_client",
-  "font-kit",
-] }
+gpui.workspace = true
 scope-chat = { version = "0.1.0", path = "../chat" }
 serenity = { git = "https://github.com/scopeclient/serenity", version = "0.12" }
 tokio = "1.41.1"

src/discord/Cargo.toml

@@ -13,19 +13,16 @@ repository = "https://github.com/scopeclient/scope"
 keywords = ["discord", "scope", "reticle"]
 
 [dependencies]
-gpui = { git = "https://github.com/huacnlee/zed.git", branch = "export-platform-window", version = "0.1.0", default-features = false, features = [
-  "http_client",
-  "font-kit",
-] }
-reqwest_client = { git = "https://github.com/huacnlee/zed.git", branch = "export-platform-window", version = "0.1.0" }
+gpui.workspace = true
+reqwest_client.workspace = true
 scope-chat = { version = "0.1.0", path = "../chat" }
 scope-util = { version = "0.1.0", path = "../util" }
 scope-backend-discord = { version = "0.1.0", path = "../discord" }
 scope-backend-cache = { version = "0.1.0", path = "../cache" }
 dotenv = "0.15.0"
 env_logger = "0.11.5"
 tokio = { version = "1.41.1", features = ["full"] }
-components = { package = "ui", git = "https://github.com/longbridgeapp/gpui-component", version = "0.1.0" }
+components.workspace = true
 log = "0.4.22"
 random-string = "1.1.0"
 rust-embed = "8.5.0"