From 49e4df0e899890aca9f519b4474e37fcd6a34c77 Mon Sep 17 00:00:00 2001
From: Jakub Panek <me@panekj.dev>
Date: Thu, 22 Feb 2024 21:14:51 +0100
Subject: [PATCH] fix: move globset to workspace deps (#3000)

---
 Cargo.toml             | 1 +
 lapce-app/Cargo.toml   | 6 ++----
 lapce-proxy/Cargo.toml | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0e6058fb..5377bd81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,7 @@ clap = { version = "3.2.25", features = ["derive"] }
 crossbeam-channel = "0.5.11"
 directories = "4.0.1"
 flate2 = "1.0"
+globset = "0.4.13"
 hashbrown = { version = "0.14.0", features = ["serde"] }
 im = { version = "15.0.0", features = ["serde"] }
 include_dir = "0.6.2"
diff --git a/lapce-app/Cargo.toml b/lapce-app/Cargo.toml
index c454c090..ff869ef7 100644
--- a/lapce-app/Cargo.toml
+++ b/lapce-app/Cargo.toml
@@ -13,6 +13,7 @@ clap.workspace = true
 crossbeam-channel.workspace = true
 directories.workspace = true
 flate2.workspace = true
+globset.workspace = true
 im.workspace = true
 include_dir.workspace = true
 indexmap.workspace = true
@@ -52,16 +53,13 @@ sled = "0.34.7"
 bytemuck = "1.14.0"
 tokio = { version = "1.36", features = ["full"] }
 futures = "0.3.26"
-floem = { git = "https://github.com/lapce/floem", rev = "341afd255f98ca431e4f615864daa4dbcc057501", features = [
-    "serde",
-] }
+floem = { git = "https://github.com/lapce/floem", rev = "341afd255f98ca431e4f615864daa4dbcc057501", features = ["serde"] }
 # floem = { path = "../../workspaces/floem", features = ["serde"] }
 config = { version = "0.13.2", default-features = false, features = ["toml"] }
 structdesc = { git = "https://github.com/lapce/structdesc" }
 base64 = "0.21.7"
 sha2 = "0.10.6"
 zip = { version = "0.6.6", default-features = false, features = ["deflate"] }
-globset = "0.4.13"
 
 [target.'cfg(target_os="macos")'.dependencies]
 fs_extra = "1.2.0"
diff --git a/lapce-proxy/Cargo.toml b/lapce-proxy/Cargo.toml
index a44db5d8..bb20f42a 100644
--- a/lapce-proxy/Cargo.toml
+++ b/lapce-proxy/Cargo.toml
@@ -11,6 +11,7 @@ clap.workspace = true
 crossbeam-channel.workspace = true
 directories.workspace = true
 flate2.workspace = true
+globset.workspace = true
 indexmap.workspace = true
 interprocess.workspace = true
 notify.workspace = true
@@ -26,6 +27,7 @@ tar.workspace = true
 toml.workspace = true
 toml_edit.workspace = true
 tracing.workspace = true
+url.workspace = true
 
 lsp-types.workspace = true
 psp-types.workspace = true
@@ -39,11 +41,9 @@ floem-editor-core.workspace = true
 
 # proxy specific dependencies
 
-url = "2.5.0"
 zstd = "0.11.2"         # follow same version wasmtime-cache in lockfile
 dyn-clone = "1.0.16"
 walkdir = "2.3.2"
-globset = "0.4.13"
 locale_config = "0.3.0"
 jsonrpc-lite = "0.6.0"
 polling = "3.0.0"