History

zed: Unify dependencies (#61381)

# Objective Unify dependencies inside of the root `Cargo.toml` to prevent versions from going out of sync and creating copies of dependencies. ## Testing - All tests pass, nothing touches the `Cargo.lock` ## Review Review is easiest by going through commit by commit. Release Notes: - N/A or Added/Fixed/Improved ...

tidely committed 3 months ago

Commit 2e2fb0a1 parent 3ad80867 files · +31 −23Browse files

Unified · Split

7 files
  1. Cargo.toml +8 −0
  2. crates/gpui/Cargo.toml +9 −9
  3. crates/gpui_linux/Cargo.toml +2 −2
  4. crates/gpui_macos/Cargo.toml +8 −8
  5. crates/gpui_wgpu/Cargo.toml +2 −2
  6. crates/gpui_windows/Cargo.toml +1 −1
  7. crates/media/Cargo.toml +1 −1
Cargo.toml+8−0
@@ -555,12 +555,14 @@ aws-smithy-types = { version = "1.3.4", features = ["http-body-1-x"] } · 554 unmodified lines
555backtrace = "0.3"555backtrace = "0.3"
556base64 = "0.22"556base64 = "0.22"
557bitflags = "2.6.0"557bitflags = "2.6.0"
558block = "0.1"
558block2 = "0.6"559block2 = "0.6"
559brotli = "8.0.2"560brotli = "8.0.2"
560bytes = "1.0"561bytes = "1.0"
561cargo_metadata = "0.19"562cargo_metadata = "0.19"
562cargo_toml = "0.21"563cargo_toml = "0.21"
563brush-parser = "0.3"564brush-parser = "0.3"
565cbindgen = { version = "0.28.0", default-features = false }
564cfg-if = "1.0.3"566cfg-if = "1.0.3"
565chardetng = "0.1"567chardetng = "0.1"
566chrono = { version = "0.4", features = ["serde"] }568chrono = { version = "0.4", features = ["serde"] }
@@ -575,6 +577,8 @@ const_format = "0.2" · 8 unmodified lines
575convert_case = "0.11.0"577convert_case = "0.11.0"
576core-foundation = "0.10"578core-foundation = "0.10"
577core-foundation-sys = "0.8.6"579core-foundation-sys = "0.8.6"
580core-graphics = "0.24"
581core-text = "21"
578core-video = { version = "0.5.2", features = ["metal"] }582core-video = { version = "0.5.2", features = ["metal"] }
579cpal = "0.17"583cpal = "0.17"
580crash-handler = "0.7"584crash-handler = "0.7"
@@ -601,10 +605,12 @@ ec4rs = { version = "1.2", features = ["allow-empty-values"] } · 20 unmodified lines
601emojis = "0.6.1"605emojis = "0.6.1"
602env_logger = "0.11"606env_logger = "0.11"
603encoding_rs = "0.8"607encoding_rs = "0.8"
608etagere = "0.2"
604exec = "0.3.1"609exec = "0.3.1"
605fancy-regex = "0.18.0"610fancy-regex = "0.18.0"
606fork = "0.4.0"611fork = "0.4.0"
607flume = "0.12"612flume = "0.12"
613foreign-types = "0.5"
608futures = "0.3.32"614futures = "0.3.32"
609futures-concurrency = "7.7.1"615futures-concurrency = "7.7.1"
610futures-lite = "1.13"616futures-lite = "1.13"
@@ -717,6 +723,7 @@ palette = { version = "0.7.5", default-features = false, features = ["std"] } · 106 unmodified lines
717parking_lot = "0.12.1"723parking_lot = "0.12.1"
718partial-json-fixer = "0.5.3"724partial-json-fixer = "0.5.3"
719parse_int = "0.9"725parse_int = "0.9"
726pathfinder_geometry = "0.5"
720pciid-parser = "0.8.0"727pciid-parser = "0.8.0"
721pathdiff = "0.2"728pathdiff = "0.2"
722percent-encoding = "2.3.2"729percent-encoding = "2.3.2"
@@ -798,6 +805,7 @@ stacksafe = "0.1" · 75 unmodified lines
798streaming-iterator = "0.1"805streaming-iterator = "0.1"
799strsim = "0.11"806strsim = "0.11"
800strum = { version = "0.27.2", features = ["derive"] }807strum = { version = "0.27.2", features = ["derive"] }
808swash = "0.2.6"
801syn = { version = "2.0.101", features = ["full", "extra-traits", "visit-mut"] }809syn = { version = "2.0.101", features = ["full", "extra-traits", "visit-mut"] }
802sys-locale = "0.3.1"810sys-locale = "0.3.1"
803sysinfo = "0.37.0"811sysinfo = "0.37.0"
crates/gpui/Cargo.toml+9−9
@@ -47,7 +47,7 @@ doctest = false · 46 unmodified lines
47[dependencies]47[dependencies]
48accesskit.workspace = true48accesskit.workspace = true
49anyhow.workspace = true49anyhow.workspace = true
50async-task = "4.7"50async-task.workspace = true
51backtrace = { workspace = true, optional = true }51backtrace = { workspace = true, optional = true }
52bitflags.workspace = true52bitflags.workspace = true
53 53
@@ -55,7 +55,7 @@ collections.workspace = true · 1 unmodified line
55criterion = { workspace = true, optional = true }55criterion = { workspace = true, optional = true }
56ctor.workspace = true56ctor.workspace = true
57derive_more.workspace = true57derive_more.workspace = true
58etagere = "0.2"58etagere.workspace = true
59futures.workspace = true59futures.workspace = true
60futures-concurrency.workspace = true60futures-concurrency.workspace = true
61gpui_macros.workspace = true61gpui_macros.workspace = true
@@ -111,17 +111,17 @@ uuid = { workspace = true, features = ["js"] } · 49 unmodified lines
111 111
112 112
113[target.'cfg(target_os = "macos")'.dependencies]113[target.'cfg(target_os = "macos")'.dependencies]
114block = "0.1"114block.workspace = true
115cocoa.workspace = true115cocoa.workspace = true
116cocoa-foundation.workspace = true116cocoa-foundation.workspace = true
117core-foundation.workspace = true117core-foundation.workspace = true
118core-foundation-sys.workspace = true118core-foundation-sys.workspace = true
119core-graphics = "0.24"119core-graphics.workspace = true
120core-video.workspace = true120core-video.workspace = true
121core-text = "21"121core-text.workspace = true
122# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io122# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
123font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }123font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
124foreign-types = "0.5"124foreign-types.workspace = true
125log.workspace = true125log.workspace = true
126media.workspace = true126media.workspace = true
127objc.workspace = true127objc.workspace = true
@@ -132,7 +132,7 @@ mach2.workspace = true · 4 unmodified lines
132metal.workspace = true132metal.workspace = true
133 133
134[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]134[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
135pathfinder_geometry = "0.5"135pathfinder_geometry.workspace = true
136 136
137[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]137[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
138scap = { workspace = true, optional = true }138scap = { workspace = true, optional = true }
@@ -140,7 +140,7 @@ scap = { workspace = true, optional = true } · 1 unmodified line
140 140
141 141
142[target.'cfg(target_os = "windows")'.dependencies]142[target.'cfg(target_os = "windows")'.dependencies]
143windows = { version = "0.61", features = ["Win32_Foundation", "Win32_System_Power"] }143windows = { workspace = true, features = ["Win32_Foundation", "Win32_System_Power"] }
144 144
145 145
146[dev-dependencies]146[dev-dependencies]
@@ -168,7 +168,7 @@ embed-resource = { version = "3.0", optional = true } · 21 unmodified lines
168 168
169[target.'cfg(target_os = "macos")'.build-dependencies]169[target.'cfg(target_os = "macos")'.build-dependencies]
170bindgen = "0.71"170bindgen = "0.71"
171cbindgen = { version = "0.28.0", default-features = false }171cbindgen.workspace = true
172 172
173 173
174 174
crates/gpui_linux/Cargo.toml+2−2
@@ -66,7 +66,7 @@ itertools.workspace = true · 65 unmodified lines
66libc.workspace = true66libc.workspace = true
67log.workspace = true67log.workspace = true
68parking_lot.workspace = true68parking_lot.workspace = true
69pathfinder_geometry = "0.5"69pathfinder_geometry.workspace = true
70pollster.workspace = true70pollster.workspace = true
71profiling.workspace = true71profiling.workspace = true
72smallvec.workspace = true72smallvec.workspace = true
@@ -86,7 +86,7 @@ raw-window-handle.workspace = true · 13 unmodified lines
86 86
87# Used in both windowing options87# Used in both windowing options
88ashpd = { workspace = true, optional = true }88ashpd = { workspace = true, optional = true }
89swash = { version = "0.2.6" }89swash.workspace = true
90bitflags = { workspace = true, optional = true }90bitflags = { workspace = true, optional = true }
91filedescriptor = { version = "0.8.2", optional = true }91filedescriptor = { version = "0.8.2", optional = true }
92open = { version = "5.2.0", optional = true }92open = { version = "5.2.0", optional = true }
crates/gpui_macos/Cargo.toml+8−8
@@ -25,23 +25,23 @@ gpui.workspace = true · 24 unmodified lines
25accesskit.workspace = true25accesskit.workspace = true
26accesskit_macos.workspace = true26accesskit_macos.workspace = true
27anyhow.workspace = true27anyhow.workspace = true
28async-task = "4.7"28async-task.workspace = true
29block = "0.1"29block.workspace = true
30block2.workspace = true30block2.workspace = true
31cocoa.workspace = true31cocoa.workspace = true
32collections.workspace = true32collections.workspace = true
33core-foundation.workspace = true33core-foundation.workspace = true
34core-foundation-sys.workspace = true34core-foundation-sys.workspace = true
35core-graphics = "0.24"35core-graphics.workspace = true
36core-text = "21"36core-text.workspace = true
37core-video.workspace = true37core-video.workspace = true
38ctor.workspace = true38ctor.workspace = true
39derive_more.workspace = true39derive_more.workspace = true
40dispatch2 = "0.3.1"40dispatch2 = "0.3.1"
41etagere = "0.2"41etagere.workspace = true
42# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io42# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
43font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }43font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
44foreign-types = "0.5"44foreign-types.workspace = true
45futures.workspace = true45futures.workspace = true
46gpui_util.workspace = true46gpui_util.workspace = true
47image.workspace = true47image.workspace = true
@@ -57,7 +57,7 @@ objc2-app-kit.workspace = true · 9 unmodified lines
57objc2-foundation.workspace = true57objc2-foundation.workspace = true
58objc2-user-notifications.workspace = true58objc2-user-notifications.workspace = true
59parking_lot.workspace = true59parking_lot.workspace = true
60pathfinder_geometry = "0.5"60pathfinder_geometry.workspace = true
61raw-window-handle.workspace = true61raw-window-handle.workspace = true
62semver.workspace = true62semver.workspace = true
63smallvec.workspace = true63smallvec.workspace = true
@@ -65,7 +65,7 @@ strum.workspace = true · 1 unmodified line
65uuid.workspace = true65uuid.workspace = true
66 66
67[target.'cfg(target_os = "macos")'.build-dependencies]67[target.'cfg(target_os = "macos")'.build-dependencies]
68cbindgen = { version = "0.28.0", default-features = false }68cbindgen.workspace = true
69gpui.workspace = true69gpui.workspace = true
70 70
71# When this crate is itself being tested (cargo test -p gpui_macos), its own71# When this crate is itself being tested (cargo test -p gpui_macos), its own
crates/gpui_wgpu/Cargo.toml+2−2
@@ -21,14 +21,14 @@ anyhow.workspace = true · 20 unmodified lines
21bytemuck = "1"21bytemuck = "1"
22collections.workspace = true22collections.workspace = true
23cosmic-text = "0.19.0"23cosmic-text = "0.19.0"
24etagere = "0.2"24etagere.workspace = true
25itertools.workspace = true25itertools.workspace = true
26log.workspace = true26log.workspace = true
27parking_lot.workspace = true27parking_lot.workspace = true
28profiling.workspace = true28profiling.workspace = true
29raw-window-handle.workspace = true29raw-window-handle.workspace = true
30smallvec.workspace = true30smallvec.workspace = true
31swash = "0.2.6"31swash.workspace = true
32unicode-segmentation.workspace = true32unicode-segmentation.workspace = true
33gpui_util.workspace = true33gpui_util.workspace = true
34wgpu.workspace = true34wgpu.workspace = true
crates/gpui_windows/Cargo.toml+1−1
@@ -25,7 +25,7 @@ accesskit_windows.workspace = true · 24 unmodified lines
25anyhow.workspace = true25anyhow.workspace = true
26collections.workspace = true26collections.workspace = true
27dunce.workspace = true27dunce.workspace = true
28etagere = "0.2"28etagere.workspace = true
29futures.workspace = true29futures.workspace = true
30gpui_util.workspace = true30gpui_util.workspace = true
31image.workspace = true31image.workspace = true
crates/media/Cargo.toml+1−1
@@ -19,7 +19,7 @@ anyhow.workspace = true · 18 unmodified lines
19[target.'cfg(target_os = "macos")'.dependencies]19[target.'cfg(target_os = "macos")'.dependencies]
20core-foundation.workspace = true20core-foundation.workspace = true
21ctor.workspace = true21ctor.workspace = true
22foreign-types = "0.5"22foreign-types.workspace = true
23metal.workspace = true23metal.workspace = true
24core-video.workspace = true24core-video.workspace = true
25objc.workspace = true25objc.workspace = true