oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assign revs to zed dependencies so that the gpui-ce implementation doesnt get out of sync with dependency state when zed pushes commits (#31)

Browse Source
This commit is contained in:
Dustin Yost
2026-06-05 10:56:21 -04:00
committed by GitHub
parent 3042d1b3ef
commit d9005a48b0
2 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+28 -19
View File
@@ -1162,6 +1162,15 @@ dependencies = [
"unicode-width", "unicode-width",
] ]
[[package]]
name = "collections"
version = "0.1.0"
source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [
"indexmap",
"rustc-hash 2.1.1",
]
[[package]] [[package]]
name = "collections" name = "collections"
version = "0.1.0" version = "0.1.0"
@@ -1599,7 +1608,7 @@ dependencies = [
[[package]] [[package]]
name = "derive_refineable" name = "derive_refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -2461,7 +2470,7 @@ dependencies = [
"chrono", "chrono",
"cocoa 0.26.0", "cocoa 0.26.0",
"cocoa-foundation 0.2.0", "cocoa-foundation 0.2.0",
"collections", "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9)",
"core-foundation 0.10.0", "core-foundation 0.10.0",
"core-foundation-sys", "core-foundation-sys",
"core-graphics 0.24.0", "core-graphics 0.24.0",
@@ -2550,7 +2559,7 @@ dependencies = [
"bytemuck", "bytemuck",
"calloop", "calloop",
"calloop-wayland-source", "calloop-wayland-source",
"collections", "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9)",
"filedescriptor", "filedescriptor",
"futures", "futures",
"gpui", "gpui",
@@ -2598,7 +2607,7 @@ dependencies = [
"block", "block",
"cbindgen", "cbindgen",
"cocoa 0.26.0", "cocoa 0.26.0",
"collections", "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9)",
"core-foundation 0.10.0", "core-foundation 0.10.0",
"core-foundation-sys", "core-foundation-sys",
"core-graphics 0.24.0", "core-graphics 0.24.0",
@@ -2676,7 +2685,7 @@ dependencies = [
[[package]] [[package]]
name = "gpui_util" name = "gpui_util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -2711,7 +2720,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytemuck", "bytemuck",
"collections", "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9)",
"cosmic-text", "cosmic-text",
"criterion", "criterion",
"etagere", "etagere",
@@ -2741,7 +2750,7 @@ dependencies = [
"accesskit", "accesskit",
"accesskit_windows", "accesskit_windows",
"anyhow", "anyhow",
"collections", "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9)",
"etagere", "etagere",
"futures", "futures",
"gpui", "gpui",
@@ -2964,7 +2973,7 @@ dependencies = [
[[package]] [[package]]
name = "http_client" name = "http_client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",
@@ -2989,7 +2998,7 @@ dependencies = [
[[package]] [[package]]
name = "http_client_tls" name = "http_client_tls"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"rustls", "rustls",
"rustls-platform-verifier", "rustls-platform-verifier",
@@ -3752,7 +3761,7 @@ dependencies = [
[[package]] [[package]]
name = "media" name = "media"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bindgen", "bindgen",
@@ -4464,9 +4473,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
[[package]] [[package]]
name = "perf" name = "perf"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"collections", "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9)",
"serde", "serde",
"serde_json", "serde_json",
] ]
@@ -5189,7 +5198,7 @@ dependencies = [
[[package]] [[package]]
name = "refineable" name = "refineable"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"derive_refineable", "derive_refineable",
] ]
@@ -5232,7 +5241,7 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]] [[package]]
name = "reqwest_client" name = "reqwest_client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@@ -5530,7 +5539,7 @@ dependencies = [
[[package]] [[package]]
name = "scheduler" name = "scheduler"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"async-task", "async-task",
"backtrace", "backtrace",
@@ -6849,12 +6858,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]] [[package]]
name = "util" name = "util"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-fs", "async-fs",
"async_zip", "async_zip",
"collections", "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9)",
"command-fds", "command-fds",
"dirs", "dirs",
"dunce", "dunce",
@@ -6888,7 +6897,7 @@ dependencies = [
[[package]] [[package]]
name = "util_macros" name = "util_macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d76b59c05a37e9" source = "git+https://github.com/zed-industries/zed?rev=876ec5a8a074ba83cce2129ed4d76b59c05a37e9#876ec5a8a074ba83cce2129ed4d76b59c05a37e9"
dependencies = [ dependencies = [
"perf", "perf",
"quote", "quote",
@@ -8645,7 +8654,7 @@ source = "git+https://github.com/zed-industries/zed#876ec5a8a074ba83cce2129ed4d7
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
"collections", "collections 0.1.0 (git+https://github.com/zed-industries/zed)",
"log", "log",
] ]
Cargo.toml
+9 -9
View File
@@ -33,7 +33,7 @@ accesskit_windows = "0.32.1"
anyhow = "1.0.86" anyhow = "1.0.86"
backtrace = "0.3" backtrace = "0.3"
bitflags = "2.6.0" bitflags = "2.6.0"
collections = { git = "https://github.com/zed-industries/zed", version = "0.1.0" } collections = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9", version = "0.1.0" }
ctor = "1.0.6" ctor = "1.0.6"
derive_more = { version = "2.1.1", features = [ derive_more = { version = "2.1.1", features = [
"add", "add",
@@ -48,7 +48,7 @@ derive_more = { version = "2.1.1", features = [
] } ] }
futures = "0.3.32" futures = "0.3.32"
futures-concurrency = "7.7.1" futures-concurrency = "7.7.1"
http_client = { git = "https://github.com/zed-industries/zed" } http_client = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9" }
image = "0.25.1" image = "0.25.1"
inventory = "0.3.19" inventory = "0.3.19"
itertools = "0.14.0" itertools = "0.14.0"
@@ -60,9 +60,9 @@ chrono = { version = "0.4", features = ["serde"] }
profiling = "1" profiling = "1"
rand = "0.9" rand = "0.9"
regex = "1.5" regex = "1.5"
refineable = { git = "https://github.com/zed-industries/zed" } refineable = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9" }
scheduler = { git = "https://github.com/zed-industries/zed" } scheduler = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9" }
util_macros = { git = "https://github.com/zed-industries/zed" } util_macros = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9" }
schemars = { version = "1.0", features = ["indexmap2"] } schemars = { version = "1.0", features = ["indexmap2"] }
serde = { version = "1.0.221", features = ["derive", "rc"] } serde = { version = "1.0.221", features = ["derive", "rc"] }
serde_json = { version = "1.0.144", features = ["preserve_order", "raw_value"] } serde_json = { version = "1.0.144", features = ["preserve_order", "raw_value"] }
@@ -83,14 +83,14 @@ cocoa-foundation = "=0.2.0"
core-foundation = "=0.10.0" core-foundation = "=0.10.0"
core-foundation-sys = "0.8.6" core-foundation-sys = "0.8.6"
core-video = { version = "0.5.2", features = ["metal"] } core-video = { version = "0.5.2", features = ["metal"] }
media = { git = "https://github.com/zed-industries/zed" } media = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9" }
objc = "0.2" objc = "0.2"
mach2 = "0.5" mach2 = "0.5"
metal = "0.33" metal = "0.33"
scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", default-features = false, package = "zed-scap", version = "0.0.8-zed" } scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197176fb19cd0f9b180dd36eaac", default-features = false, package = "zed-scap", version = "0.0.8-zed" }
env_logger = "0.11" env_logger = "0.11"
unicode-segmentation = "1.10" unicode-segmentation = "1.10"
reqwest_client = { git = "https://github.com/zed-industries/zed" } reqwest_client = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9" }
wasm-bindgen = "0.2.120" wasm-bindgen = "0.2.120"
heck = "0.5" heck = "0.5"
proc-macro2 = "1.0.93" proc-macro2 = "1.0.93"
@@ -106,14 +106,14 @@ ashpd = { version = "0.13", default-features = false, features = [
] } ] }
libc = "0.2" libc = "0.2"
smol = "2.0" smol = "2.0"
util = { git = "https://github.com/zed-industries/zed" } util = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9" }
wgpu = { git = "https://github.com/zed-industries/wgpu.git", rev = "357a0c56e0070480ad9daea5d2eaa83150b79e88" } wgpu = { git = "https://github.com/zed-industries/wgpu.git", rev = "357a0c56e0070480ad9daea5d2eaa83150b79e88" }
criterion = { version = "0.5", features = ["html_reports"] } criterion = { version = "0.5", features = ["html_reports"] }
objc2-app-kit = { version = "0.3", default-features = false, features = [ "NSGraphics" ] } objc2-app-kit = { version = "0.3", default-features = false, features = [ "NSGraphics" ] }
semver = { version = "1.0", features = ["serde"] } semver = { version = "1.0", features = ["serde"] }
windows-core = "0.61" windows-core = "0.61"
tokio = { version = "1" } tokio = { version = "1" }
gpui_util = { git = "https://github.com/zed-industries/zed" } gpui_util = { git = "https://github.com/zed-industries/zed", rev = "876ec5a8a074ba83cce2129ed4d76b59c05a37e9" }
gpui = { path = "./crates/gpui/" } gpui = { path = "./crates/gpui/" }
gpui_platform = { path = "./crates/gpui_platform/" } gpui_platform = { path = "./crates/gpui_platform/" }