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 ...
This commit is contained in:
1 parent
3ad8086ee8
commit
2e2fb0a218
7 files changed
+31
-23
No files matched your search
@@ -47,7 +47,7 @@ doctest = false
|
||||
[dependencies]
|
||||
accesskit.workspace = true
|
||||
anyhow.workspace = true
|
||||
async-task = "4.7"
|
||||
async-task.workspace = true
|
||||
backtrace = { workspace = true, optional = true }
|
||||
bitflags.workspace = true
|
||||
|
||||
@@ -55,7 +55,7 @@ collections.workspace = true
|
||||
criterion = { workspace = true, optional = true }
|
||||
ctor.workspace = true
|
||||
derive_more.workspace = true
|
||||
etagere = "0.2"
|
||||
etagere.workspace = true
|
||||
futures.workspace = true
|
||||
futures-concurrency.workspace = true
|
||||
gpui_macros.workspace = true
|
||||
@@ -111,17 +111,17 @@ uuid = { workspace = true, features = ["js"] }
|
||||
|
||||
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
block = "0.1"
|
||||
block.workspace = true
|
||||
cocoa.workspace = true
|
||||
cocoa-foundation.workspace = true
|
||||
core-foundation.workspace = true
|
||||
core-foundation-sys.workspace = true
|
||||
core-graphics = "0.24"
|
||||
core-graphics.workspace = true
|
||||
core-video.workspace = true
|
||||
core-text = "21"
|
||||
core-text.workspace = true
|
||||
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
|
||||
font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
|
||||
foreign-types = "0.5"
|
||||
foreign-types.workspace = true
|
||||
log.workspace = true
|
||||
media.workspace = true
|
||||
objc.workspace = true
|
||||
@@ -132,7 +132,7 @@ mach2.workspace = true
|
||||
metal.workspace = true
|
||||
|
||||
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
|
||||
pathfinder_geometry = "0.5"
|
||||
pathfinder_geometry.workspace = true
|
||||
|
||||
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "windows"))'.dependencies]
|
||||
scap = { workspace = true, optional = true }
|
||||
@@ -140,7 +140,7 @@ scap = { workspace = true, optional = true }
|
||||
|
||||
|
||||
[target.'cfg(target_os = "windows")'.dependencies]
|
||||
windows = { version = "0.61", features = ["Win32_Foundation", "Win32_System_Power"] }
|
||||
windows = { workspace = true, features = ["Win32_Foundation", "Win32_System_Power"] }
|
||||
|
||||
|
||||
[dev-dependencies]
|
||||
@@ -168,7 +168,7 @@ embed-resource = { version = "3.0", optional = true }
|
||||
|
||||
[target.'cfg(target_os = "macos")'.build-dependencies]
|
||||
bindgen = "0.71"
|
||||
cbindgen = { version = "0.28.0", default-features = false }
|
||||
cbindgen.workspace = true
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ itertools.workspace = true
|
||||
libc.workspace = true
|
||||
log.workspace = true
|
||||
parking_lot.workspace = true
|
||||
pathfinder_geometry = "0.5"
|
||||
pathfinder_geometry.workspace = true
|
||||
pollster.workspace = true
|
||||
profiling.workspace = true
|
||||
smallvec.workspace = true
|
||||
@@ -86,7 +86,7 @@ raw-window-handle.workspace = true
|
||||
|
||||
# Used in both windowing options
|
||||
ashpd = { workspace = true, optional = true }
|
||||
swash = { version = "0.2.6" }
|
||||
swash.workspace = true
|
||||
bitflags = { workspace = true, optional = true }
|
||||
filedescriptor = { version = "0.8.2", optional = true }
|
||||
open = { version = "5.2.0", optional = true }
|
||||
|
||||
@@ -25,23 +25,23 @@ gpui.workspace = true
|
||||
accesskit.workspace = true
|
||||
accesskit_macos.workspace = true
|
||||
anyhow.workspace = true
|
||||
async-task = "4.7"
|
||||
block = "0.1"
|
||||
async-task.workspace = true
|
||||
block.workspace = true
|
||||
block2.workspace = true
|
||||
cocoa.workspace = true
|
||||
collections.workspace = true
|
||||
core-foundation.workspace = true
|
||||
core-foundation-sys.workspace = true
|
||||
core-graphics = "0.24"
|
||||
core-text = "21"
|
||||
core-graphics.workspace = true
|
||||
core-text.workspace = true
|
||||
core-video.workspace = true
|
||||
ctor.workspace = true
|
||||
derive_more.workspace = true
|
||||
dispatch2 = "0.3.1"
|
||||
etagere = "0.2"
|
||||
etagere.workspace = true
|
||||
# WARNING: If you change this, you must also publish a new version of zed-font-kit to crates.io
|
||||
font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "94b0f28166665e8fd2f53ff6d268a14955c82269", package = "zed-font-kit", version = "0.14.1-zed", optional = true }
|
||||
foreign-types = "0.5"
|
||||
foreign-types.workspace = true
|
||||
futures.workspace = true
|
||||
gpui_util.workspace = true
|
||||
image.workspace = true
|
||||
@@ -57,7 +57,7 @@ objc2-app-kit.workspace = true
|
||||
objc2-foundation.workspace = true
|
||||
objc2-user-notifications.workspace = true
|
||||
parking_lot.workspace = true
|
||||
pathfinder_geometry = "0.5"
|
||||
pathfinder_geometry.workspace = true
|
||||
raw-window-handle.workspace = true
|
||||
semver.workspace = true
|
||||
smallvec.workspace = true
|
||||
@@ -65,7 +65,7 @@ strum.workspace = true
|
||||
uuid.workspace = true
|
||||
|
||||
[target.'cfg(target_os = "macos")'.build-dependencies]
|
||||
cbindgen = { version = "0.28.0", default-features = false }
|
||||
cbindgen.workspace = true
|
||||
gpui.workspace = true
|
||||
|
||||
# When this crate is itself being tested (cargo test -p gpui_macos), its own
|
||||
|
||||
@@ -21,14 +21,14 @@ anyhow.workspace = true
|
||||
bytemuck = "1"
|
||||
collections.workspace = true
|
||||
cosmic-text = "0.19.0"
|
||||
etagere = "0.2"
|
||||
etagere.workspace = true
|
||||
itertools.workspace = true
|
||||
log.workspace = true
|
||||
parking_lot.workspace = true
|
||||
profiling.workspace = true
|
||||
raw-window-handle.workspace = true
|
||||
smallvec.workspace = true
|
||||
swash = "0.2.6"
|
||||
swash.workspace = true
|
||||
unicode-segmentation.workspace = true
|
||||
gpui_util.workspace = true
|
||||
wgpu.workspace = true
|
||||
|
||||
@@ -25,7 +25,7 @@ accesskit_windows.workspace = true
|
||||
anyhow.workspace = true
|
||||
collections.workspace = true
|
||||
dunce.workspace = true
|
||||
etagere = "0.2"
|
||||
etagere.workspace = true
|
||||
futures.workspace = true
|
||||
gpui_util.workspace = true
|
||||
image.workspace = true
|
||||
|
||||
@@ -19,7 +19,7 @@ anyhow.workspace = true
|
||||
[target.'cfg(target_os = "macos")'.dependencies]
|
||||
core-foundation.workspace = true
|
||||
ctor.workspace = true
|
||||
foreign-types = "0.5"
|
||||
foreign-types.workspace = true
|
||||
metal.workspace = true
|
||||
core-video.workspace = true
|
||||
objc.workspace = true
|
||||
|
||||
Reference in new issue
Block a user