From fc1e68159180572d4ac5b2830dbc172083a346d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 May 2026 23:11:34 +0000
Subject: [PATCH 1/2] deps(rust): bump gpui_platform from v1.0.1 to v1.1.7

Bumps [gpui_platform](https://github.com/zed-industries/zed) from v1.0.1 to v1.1.7.
- [Release notes](https://github.com/zed-industries/zed/releases)
- [Commits](https://github.com/zed-industries/zed/compare/ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8...c17f25cd782edffab64b7c4167abfa44f865b125)

---
updated-dependencies:
- dependency-name: gpui_platform
  dependency-version: c17f25cd782edffab64b7c4167abfa44f865b125
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock            | 439 ++++++++++++++++++++++++++++++++++++------
 shell/gpui/Cargo.toml |   2 +-
 2 files changed, 380 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2af3336..3f5ec32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -107,7 +107,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -118,7 +118,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -730,6 +730,16 @@ dependencies = [
  "piper",
 ]
 
+[[package]]
+name = "borsh"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+]
+
 [[package]]
 name = "bstr"
 version = "1.12.1"
@@ -1090,6 +1100,15 @@ dependencies = [
  "rustc-hash 2.1.2",
 ]
 
+[[package]]
+name = "collections"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "indexmap",
+ "rustc-hash 2.1.2",
+]
+
 [[package]]
 name = "color_quant"
 version = "1.1.0"
@@ -1515,6 +1534,16 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "derive_refineable"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1564,7 +1593,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -1753,7 +1782,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3290,7 +3319,7 @@ dependencies = [
  "chrono",
  "cocoa 0.26.0",
  "cocoa-foundation 0.2.0",
- "collections",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "core-graphics 0.24.0",
@@ -3304,17 +3333,17 @@ dependencies = [
  "futures",
  "futures-concurrency",
  "getrandom 0.3.4",
- "gpui_macros",
- "gpui_shared_string",
- "gpui_util",
- "http_client",
+ "gpui_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "gpui_shared_string 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
  "image",
  "inventory",
  "itertools 0.14.0",
  "log",
  "lyon",
  "mach2",
- "media",
+ "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
  "metal",
  "naga 29.0.3",
  "num_cpus",
@@ -3329,10 +3358,10 @@ dependencies = [
  "proptest",
  "rand 0.9.4",
  "raw-window-handle",
- "refineable",
+ "refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
  "regex",
  "resvg",
- "scheduler",
+ "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
  "schemars",
  "seahash",
  "serde",
@@ -3342,13 +3371,13 @@ dependencies = [
  "spin 0.10.0",
  "stacksafe",
  "strum",
- "sum_tree",
- "taffy",
+ "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "taffy 0.9.0",
  "thiserror 2.0.18",
  "ttf-parser",
  "url",
  "usvg",
- "util_macros",
+ "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
  "uuid",
  "waker-fn",
  "web-time",
@@ -3357,18 +3386,95 @@ dependencies = [
  "zed-scap",
 ]
 
+[[package]]
+name = "gpui"
+version = "0.2.2"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "anyhow",
+ "async-channel 2.5.0",
+ "async-task",
+ "bindgen",
+ "block",
+ "cbindgen",
+ "chrono",
+ "cocoa 0.26.0",
+ "cocoa-foundation 0.2.0",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "core-foundation 0.10.0",
+ "core-foundation-sys",
+ "core-graphics 0.24.0",
+ "core-text 21.0.0",
+ "core-video",
+ "ctor",
+ "derive_more",
+ "embed-resource",
+ "etagere",
+ "foreign-types",
+ "futures",
+ "futures-concurrency",
+ "getrandom 0.3.4",
+ "gpui_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui_shared_string 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "image",
+ "inventory",
+ "itertools 0.14.0",
+ "log",
+ "lyon",
+ "mach2",
+ "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "metal",
+ "num_cpus",
+ "objc",
+ "parking",
+ "parking_lot",
+ "pathfinder_geometry",
+ "pin-project",
+ "pollster 0.4.0",
+ "postage",
+ "profiling",
+ "rand 0.9.4",
+ "raw-window-handle",
+ "refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "regex",
+ "resvg",
+ "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "schemars",
+ "seahash",
+ "serde",
+ "serde_json",
+ "slotmap",
+ "smallvec",
+ "spin 0.10.0",
+ "stacksafe",
+ "strum",
+ "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "taffy 0.10.1",
+ "thiserror 2.0.18",
+ "ttf-parser",
+ "url",
+ "usvg",
+ "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "uuid",
+ "waker-fn",
+ "web-time",
+ "windows 0.61.3",
+]
+
 [[package]]
 name = "gpui_linux"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "bytemuck",
  "calloop",
- "collections",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "futures",
- "gpui",
- "http_client",
+ "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "image",
  "itertools 0.14.0",
  "libc",
@@ -3384,21 +3490,21 @@ dependencies = [
  "strum",
  "swash",
  "url",
- "util",
+ "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "uuid",
 ]
 
 [[package]]
 name = "gpui_macos"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "async-task",
  "block",
  "cbindgen",
  "cocoa 0.26.0",
- "collections",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "core-graphics 0.24.0",
@@ -3410,13 +3516,13 @@ dependencies = [
  "etagere",
  "foreign-types",
  "futures",
- "gpui",
+ "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "image",
  "itertools 0.14.0",
  "libc",
  "log",
  "mach2",
- "media",
+ "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "metal",
  "objc",
  "objc2-app-kit",
@@ -3426,7 +3532,7 @@ dependencies = [
  "semver",
  "smallvec",
  "strum",
- "util",
+ "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "uuid",
  "zed-font-kit",
 ]
@@ -3442,13 +3548,24 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "gpui_macros"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "gpui_platform"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "console_error_panic_hook",
- "gpui",
+ "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "gpui_linux",
  "gpui_macos",
  "gpui_web",
@@ -3461,9 +3578,19 @@ version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
 dependencies = [
  "derive_more",
- "gpui_util",
+ "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "gpui_shared_string"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
  "schemars",
  "serde",
+ "smol_str",
 ]
 
 [[package]]
@@ -3475,17 +3602,26 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "gpui_util"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "anyhow",
+ "log",
+]
+
 [[package]]
 name = "gpui_web"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "console_error_panic_hook",
  "futures",
- "gpui",
+ "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "gpui_wgpu",
- "http_client",
+ "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "js-sys",
  "log",
  "parking_lot",
@@ -3502,15 +3638,15 @@ dependencies = [
 [[package]]
 name = "gpui_wgpu"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "bytemuck",
- "collections",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "cosmic-text",
  "etagere",
- "gpui",
- "gpui_util",
+ "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "itertools 0.14.0",
  "js-sys",
  "log",
@@ -3529,13 +3665,13 @@ dependencies = [
 [[package]]
 name = "gpui_windows"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
- "collections",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "etagere",
  "futures",
- "gpui",
+ "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "image",
  "itertools 0.14.0",
  "log",
@@ -3543,7 +3679,7 @@ dependencies = [
  "rand 0.9.4",
  "raw-window-handle",
  "smallvec",
- "util",
+ "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "uuid",
  "windows 0.61.3",
  "windows-core 0.61.2",
@@ -3557,6 +3693,12 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681"
 
+[[package]]
+name = "grid"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5"
+
 [[package]]
 name = "half"
 version = "2.7.1"
@@ -3742,7 +3884,32 @@ dependencies = [
  "sha2 0.10.9",
  "tempfile",
  "url",
- "util",
+ "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+]
+
+[[package]]
+name = "http_client"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "anyhow",
+ "async-compression",
+ "async-fs",
+ "async-tar",
+ "bytes",
+ "derive_more",
+ "futures",
+ "http",
+ "http-body",
+ "log",
+ "parking_lot",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sha2",
+ "tempfile",
+ "url",
+ "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
 ]
 
 [[package]]
@@ -4108,7 +4275,7 @@ dependencies = [
  "directories",
  "flume 0.12.0",
  "font-kit",
- "gpui",
+ "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
  "gpui_platform",
  "hex",
  "jayjay-core",
@@ -4141,7 +4308,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde_core",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4696,6 +4863,21 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "media"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "anyhow",
+ "bindgen",
+ "core-foundation 0.10.0",
+ "core-video",
+ "ctor",
+ "foreign-types",
+ "metal",
+ "objc",
+]
+
 [[package]]
 name = "memchr"
 version = "2.8.0"
@@ -4953,7 +5135,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -5341,7 +5523,17 @@ name = "perf"
 version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
 dependencies = [
- "collections",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "perf"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "serde",
  "serde_json",
 ]
@@ -6025,7 +6217,15 @@ name = "refineable"
 version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
 dependencies = [
- "derive_refineable",
+ "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+]
+
+[[package]]
+name = "refineable"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
 ]
 
 [[package]]
@@ -6181,7 +6381,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6194,7 +6394,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6298,6 +6498,21 @@ dependencies = [
  "web-time",
 ]
 
+[[package]]
+name = "scheduler"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "async-task",
+ "backtrace",
+ "chrono",
+ "flume 0.11.1",
+ "futures",
+ "parking_lot",
+ "rand 0.9.4",
+ "web-time",
+]
+
 [[package]]
 name = "schemars"
 version = "1.2.1"
@@ -6704,6 +6919,10 @@ name = "smol_str"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
+dependencies = [
+ "borsh",
+ "serde_core",
+]
 
 [[package]]
 name = "spin"
@@ -6748,7 +6967,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "psm",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6835,7 +7054,19 @@ dependencies = [
  "log",
  "rayon",
  "tracing",
- "ztracing",
+ "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+]
+
+[[package]]
+name = "sum_tree"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "heapless 0.9.3",
+ "log",
+ "rayon",
+ "tracing",
+ "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
 ]
 
 [[package]]
@@ -6995,7 +7226,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a13e5d13f79d558b5d353a98072ca8ca0e99da429467804de959aa8c83c9a004"
 dependencies = [
  "arrayvec",
- "grid",
+ "grid 0.18.0",
+ "serde",
+ "slotmap",
+]
+
+[[package]]
+name = "taffy"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aea22054047c16c3f34d3ac473a2170be1424b1115b2a3adcf28cfb067c88859"
+dependencies = [
+ "arrayvec",
+ "grid 1.0.1",
  "serde",
  "slotmap",
 ]
@@ -7028,7 +7271,7 @@ dependencies = [
  "getrandom 0.4.2",
  "once_cell",
  "rustix 1.1.4",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7658,7 +7901,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
 dependencies = [
  "memoffset",
  "tempfile",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -7996,14 +8239,53 @@ dependencies = [
  "anyhow",
  "async-fs",
  "async_zip",
- "collections",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "command-fds",
+ "dirs",
+ "dunce",
+ "futures",
+ "futures-lite 1.13.0",
+ "globset",
+ "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "itertools 0.14.0",
+ "libc",
+ "log",
+ "mach2",
+ "nix 0.29.0",
+ "percent-encoding",
+ "regex",
+ "rust-embed",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_json_lenient",
+ "shlex",
+ "smol",
+ "take-until",
+ "tempfile",
+ "tendril",
+ "unicase",
+ "url",
+ "walkdir",
+ "which",
+]
+
+[[package]]
+name = "util"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "anyhow",
+ "async-fs",
+ "async_zip",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "command-fds",
  "dirs",
  "dunce",
  "futures",
  "futures-lite 1.13.0",
  "globset",
- "gpui_util",
+ "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "itertools 0.14.0",
  "libc",
  "log",
@@ -8032,7 +8314,17 @@ name = "util_macros"
 version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
 dependencies = [
- "perf",
+ "perf 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "util_macros"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "perf 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "quote",
  "syn",
 ]
@@ -8528,7 +8820,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -9013,7 +9305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10"
 dependencies = [
  "cfg-if",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -9439,7 +9731,18 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04
 dependencies = [
  "anyhow",
  "chrono",
- "collections",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "log",
+]
+
+[[package]]
+name = "zlog"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
  "log",
 ]
 
@@ -9456,8 +9759,19 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04
 dependencies = [
  "tracing",
  "tracing-subscriber",
- "zlog",
- "ztracing_macro",
+ "zlog 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+]
+
+[[package]]
+name = "ztracing"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+ "zlog 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
 ]
 
 [[package]]
@@ -9465,6 +9779,11 @@ name = "ztracing_macro"
 version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
 
+[[package]]
+name = "ztracing_macro"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
+
 [[package]]
 name = "zune-core"
 version = "0.4.12"
diff --git a/shell/gpui/Cargo.toml b/shell/gpui/Cargo.toml
index 80246c1..ba02f00 100644
--- a/shell/gpui/Cargo.toml
+++ b/shell/gpui/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
 [dependencies]
 jayjay-core = { path = "../../crates/jayjay-core" }
 gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.0.1" }
-gpui_platform = { git = "https://github.com/zed-industries/zed", tag = "v1.0.1", features = ["font-kit", "runtime_shaders"] }
+gpui_platform = { git = "https://github.com/zed-industries/zed", tag = "v1.1.7", features = ["font-kit", "runtime_shaders"] }
 chrono = { workspace = true }
 font-kit = "0.14"
 ureq = "3"

From 45e3e54944a62e2c9e74c7ec4c5bd9300591611c Mon Sep 17 00:00:00 2001
From: hewigovens <360470+hewigovens@users.noreply.github.com>
Date: Tue, 12 May 2026 11:42:37 +0900
Subject: [PATCH 2/2] fix(gpui): adapt gpui_platform app type

---
 Cargo.lock            | 424 +++++-------------------------------------
 shell/gpui/Cargo.toml |   4 +-
 2 files changed, 48 insertions(+), 380 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f5ec32..e3eb3b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1091,15 +1091,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "collections"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "indexmap",
- "rustc-hash 2.1.2",
-]
-
 [[package]]
 name = "collections"
 version = "0.1.0"
@@ -1524,16 +1515,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "derive_refineable"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
@@ -3306,7 +3287,7 @@ dependencies = [
 [[package]]
 name = "gpui"
 version = "0.2.2"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
+source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
  "async-channel 2.5.0",
@@ -3319,7 +3300,7 @@ dependencies = [
  "chrono",
  "cocoa 0.26.0",
  "cocoa-foundation 0.2.0",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "collections",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "core-graphics 0.24.0",
@@ -3333,19 +3314,18 @@ dependencies = [
  "futures",
  "futures-concurrency",
  "getrandom 0.3.4",
- "gpui_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "gpui_shared_string 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "gpui_macros",
+ "gpui_shared_string",
+ "gpui_util",
+ "http_client",
  "image",
  "inventory",
  "itertools 0.14.0",
  "log",
  "lyon",
  "mach2",
- "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "media",
  "metal",
- "naga 29.0.3",
  "num_cpus",
  "objc",
  "parking",
@@ -3358,10 +3338,10 @@ dependencies = [
  "proptest",
  "rand 0.9.4",
  "raw-window-handle",
- "refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "refineable",
  "regex",
  "resvg",
- "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "scheduler",
  "schemars",
  "seahash",
  "serde",
@@ -3371,13 +3351,13 @@ dependencies = [
  "spin 0.10.0",
  "stacksafe",
  "strum",
- "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "taffy 0.9.0",
+ "sum_tree",
+ "taffy",
  "thiserror 2.0.18",
  "ttf-parser",
  "url",
  "usvg",
- "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "util_macros",
  "uuid",
  "waker-fn",
  "web-time",
@@ -3386,83 +3366,6 @@ dependencies = [
  "zed-scap",
 ]
 
-[[package]]
-name = "gpui"
-version = "0.2.2"
-source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
-dependencies = [
- "anyhow",
- "async-channel 2.5.0",
- "async-task",
- "bindgen",
- "block",
- "cbindgen",
- "chrono",
- "cocoa 0.26.0",
- "cocoa-foundation 0.2.0",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "core-foundation 0.10.0",
- "core-foundation-sys",
- "core-graphics 0.24.0",
- "core-text 21.0.0",
- "core-video",
- "ctor",
- "derive_more",
- "embed-resource",
- "etagere",
- "foreign-types",
- "futures",
- "futures-concurrency",
- "getrandom 0.3.4",
- "gpui_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "gpui_shared_string 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "image",
- "inventory",
- "itertools 0.14.0",
- "log",
- "lyon",
- "mach2",
- "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "metal",
- "num_cpus",
- "objc",
- "parking",
- "parking_lot",
- "pathfinder_geometry",
- "pin-project",
- "pollster 0.4.0",
- "postage",
- "profiling",
- "rand 0.9.4",
- "raw-window-handle",
- "refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "regex",
- "resvg",
- "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "schemars",
- "seahash",
- "serde",
- "serde_json",
- "slotmap",
- "smallvec",
- "spin 0.10.0",
- "stacksafe",
- "strum",
- "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "taffy 0.10.1",
- "thiserror 2.0.18",
- "ttf-parser",
- "url",
- "usvg",
- "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "uuid",
- "waker-fn",
- "web-time",
- "windows 0.61.3",
-]
-
 [[package]]
 name = "gpui_linux"
 version = "0.1.0"
@@ -3471,10 +3374,10 @@ dependencies = [
  "anyhow",
  "bytemuck",
  "calloop",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "collections",
  "futures",
- "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui",
+ "http_client",
  "image",
  "itertools 0.14.0",
  "libc",
@@ -3490,7 +3393,7 @@ dependencies = [
  "strum",
  "swash",
  "url",
- "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "util",
  "uuid",
 ]
 
@@ -3504,7 +3407,7 @@ dependencies = [
  "block",
  "cbindgen",
  "cocoa 0.26.0",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "collections",
  "core-foundation 0.10.0",
  "core-foundation-sys",
  "core-graphics 0.24.0",
@@ -3516,13 +3419,13 @@ dependencies = [
  "etagere",
  "foreign-types",
  "futures",
- "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui",
  "image",
  "itertools 0.14.0",
  "libc",
  "log",
  "mach2",
- "media 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "media",
  "metal",
  "objc",
  "objc2-app-kit",
@@ -3532,22 +3435,11 @@ dependencies = [
  "semver",
  "smallvec",
  "strum",
- "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "util",
  "uuid",
  "zed-font-kit",
 ]
 
-[[package]]
-name = "gpui_macros"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
@@ -3565,24 +3457,13 @@ version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "console_error_panic_hook",
- "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui",
  "gpui_linux",
  "gpui_macos",
  "gpui_web",
  "gpui_windows",
 ]
 
-[[package]]
-name = "gpui_shared_string"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "derive_more",
- "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "gpui_shared_string"
 version = "0.1.0"
@@ -3593,15 +3474,6 @@ dependencies = [
  "smol_str",
 ]
 
-[[package]]
-name = "gpui_util"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "anyhow",
- "log",
-]
-
 [[package]]
 name = "gpui_util"
 version = "0.1.0"
@@ -3619,9 +3491,9 @@ dependencies = [
  "anyhow",
  "console_error_panic_hook",
  "futures",
- "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui",
  "gpui_wgpu",
- "http_client 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "http_client",
  "js-sys",
  "log",
  "parking_lot",
@@ -3642,11 +3514,11 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab
 dependencies = [
  "anyhow",
  "bytemuck",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "collections",
  "cosmic-text",
  "etagere",
- "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui",
+ "gpui_util",
  "itertools 0.14.0",
  "js-sys",
  "log",
@@ -3668,10 +3540,10 @@ version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
  "anyhow",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "collections",
  "etagere",
  "futures",
- "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui",
  "image",
  "itertools 0.14.0",
  "log",
@@ -3679,7 +3551,7 @@ dependencies = [
  "rand 0.9.4",
  "raw-window-handle",
  "smallvec",
- "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "util",
  "uuid",
  "windows 0.61.3",
  "windows-core 0.61.2",
@@ -3687,12 +3559,6 @@ dependencies = [
  "windows-registry",
 ]
 
-[[package]]
-name = "grid"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681"
-
 [[package]]
 name = "grid"
 version = "1.0.1"
@@ -3862,31 +3728,6 @@ dependencies = [
  "http",
 ]
 
-[[package]]
-name = "http_client"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "anyhow",
- "async-compression",
- "async-fs",
- "async-tar",
- "bytes",
- "derive_more",
- "futures",
- "http",
- "http-body",
- "log",
- "parking_lot",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sha2 0.10.9",
- "tempfile",
- "url",
- "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
-]
-
 [[package]]
 name = "http_client"
 version = "0.1.0"
@@ -3906,10 +3747,10 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sha2",
+ "sha2 0.10.9",
  "tempfile",
  "url",
- "util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "util",
 ]
 
 [[package]]
@@ -4275,7 +4116,7 @@ dependencies = [
  "directories",
  "flume 0.12.0",
  "font-kit",
- "gpui 0.2.2 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
+ "gpui",
  "gpui_platform",
  "hex",
  "jayjay-core",
@@ -4848,21 +4689,6 @@ dependencies = [
  "digest 0.11.3",
 ]
 
-[[package]]
-name = "media"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "anyhow",
- "bindgen",
- "core-foundation 0.10.0",
- "core-video",
- "ctor",
- "foreign-types",
- "metal",
- "objc",
-]
-
 [[package]]
 name = "media"
 version = "0.1.0"
@@ -4980,31 +4806,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "naga"
-version = "29.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd91265cc2454558f659b3b4b9640f0ddb8cc6521277f166b8a8c181c898079"
-dependencies = [
- "arrayvec",
- "bit-set 0.9.1",
- "bitflags 2.11.1",
- "cfg-if",
- "cfg_aliases",
- "codespan-reporting",
- "half",
- "hashbrown 0.16.1",
- "hexf-parse",
- "indexmap",
- "libm",
- "log",
- "num-traits",
- "once_cell",
- "rustc-hash 1.1.0",
- "thiserror 2.0.18",
- "unicode-ident",
-]
-
 [[package]]
 name = "nanorand"
 version = "0.7.0"
@@ -5518,22 +5319,12 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
-[[package]]
-name = "perf"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "perf"
 version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "collections",
  "serde",
  "serde_json",
 ]
@@ -6212,20 +6003,12 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "refineable"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
-]
-
 [[package]]
 name = "refineable"
 version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
- "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "derive_refineable",
 ]
 
 [[package]]
@@ -6483,21 +6266,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scheduler"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "async-task",
- "backtrace",
- "chrono",
- "flume 0.11.1",
- "futures",
- "parking_lot",
- "rand 0.9.4",
- "web-time",
-]
-
 [[package]]
 name = "scheduler"
 version = "0.1.0"
@@ -7045,18 +6813,6 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
-[[package]]
-name = "sum_tree"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "heapless 0.9.3",
- "log",
- "rayon",
- "tracing",
- "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
-]
-
 [[package]]
 name = "sum_tree"
 version = "0.1.0"
@@ -7066,7 +6822,7 @@ dependencies = [
  "log",
  "rayon",
  "tracing",
- "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "ztracing",
 ]
 
 [[package]]
@@ -7219,18 +6975,6 @@ dependencies = [
  "windows 0.57.0",
 ]
 
-[[package]]
-name = "taffy"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e5d13f79d558b5d353a98072ca8ca0e99da429467804de959aa8c83c9a004"
-dependencies = [
- "arrayvec",
- "grid 0.18.0",
- "serde",
- "slotmap",
-]
-
 [[package]]
 name = "taffy"
 version = "0.10.1"
@@ -7238,7 +6982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aea22054047c16c3f34d3ac473a2170be1424b1115b2a3adcf28cfb067c88859"
 dependencies = [
  "arrayvec",
- "grid 1.0.1",
+ "grid",
  "serde",
  "slotmap",
 ]
@@ -8231,45 +7975,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
-[[package]]
-name = "util"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "anyhow",
- "async-fs",
- "async_zip",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "command-fds",
- "dirs",
- "dunce",
- "futures",
- "futures-lite 1.13.0",
- "globset",
- "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "itertools 0.14.0",
- "libc",
- "log",
- "mach2",
- "nix 0.29.0",
- "percent-encoding",
- "regex",
- "rust-embed",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "shlex",
- "smol",
- "take-until",
- "tempfile",
- "tendril",
- "unicase",
- "url",
- "walkdir",
- "which",
-]
-
 [[package]]
 name = "util"
 version = "0.1.0"
@@ -8278,14 +7983,14 @@ dependencies = [
  "anyhow",
  "async-fs",
  "async_zip",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "collections",
  "command-fds",
  "dirs",
  "dunce",
  "futures",
  "futures-lite 1.13.0",
  "globset",
- "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "gpui_util",
  "itertools 0.14.0",
  "libc",
  "log",
@@ -8309,22 +8014,12 @@ dependencies = [
  "which",
 ]
 
-[[package]]
-name = "util_macros"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "perf 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "util_macros"
 version = "0.1.0"
 source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab64b7c4167abfa44f865b125"
 dependencies = [
- "perf 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "perf",
  "quote",
  "syn",
 ]
@@ -8641,7 +8336,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "js-sys",
  "log",
- "naga 29.0.0",
+ "naga",
  "parking_lot",
  "portable-atomic",
  "profiling",
@@ -8671,7 +8366,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "indexmap",
  "log",
- "naga 29.0.0",
+ "naga",
  "once_cell",
  "parking_lot",
  "portable-atomic",
@@ -8736,7 +8431,7 @@ dependencies = [
  "libc",
  "libloading",
  "log",
- "naga 29.0.0",
+ "naga",
  "ndk-sys",
  "objc2",
  "objc2-core-foundation",
@@ -8769,7 +8464,7 @@ name = "wgpu-naga-bridge"
 version = "29.0.0"
 source = "git+https://github.com/zed-industries/wgpu.git?branch=v29#a466bc382ea747f8e1ac810efdb6dcd49a514575"
 dependencies = [
- "naga 29.0.0",
+ "naga",
  "wgpu-types",
 ]
 
@@ -9724,17 +9419,6 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513"
 
-[[package]]
-name = "zlog"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "anyhow",
- "chrono",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "log",
-]
-
 [[package]]
 name = "zlog"
 version = "0.1.0"
@@ -9742,7 +9426,7 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab
 dependencies = [
  "anyhow",
  "chrono",
- "collections 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "collections",
  "log",
 ]
 
@@ -9752,17 +9436,6 @@ version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
 
-[[package]]
-name = "ztracing"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-dependencies = [
- "tracing",
- "tracing-subscriber",
- "zlog 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
- "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.0.1)",
-]
-
 [[package]]
 name = "ztracing"
 version = "0.1.0"
@@ -9770,15 +9443,10 @@ source = "git+https://github.com/zed-industries/zed?tag=v1.1.7#c17f25cd782edffab
 dependencies = [
  "tracing",
  "tracing-subscriber",
- "zlog 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
- "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?tag=v1.1.7)",
+ "zlog",
+ "ztracing_macro",
 ]
 
-[[package]]
-name = "ztracing_macro"
-version = "0.1.0"
-source = "git+https://github.com/zed-industries/zed?tag=v1.0.1#ad3e097279b3a5c04b273a4f2f6c6ed1729ea0c8"
-
 [[package]]
 name = "ztracing_macro"
 version = "0.1.0"
diff --git a/shell/gpui/Cargo.toml b/shell/gpui/Cargo.toml
index ba02f00..91562ad 100644
--- a/shell/gpui/Cargo.toml
+++ b/shell/gpui/Cargo.toml
@@ -12,7 +12,7 @@ path = "src/main.rs"
 
 [dependencies]
 jayjay-core = { path = "../../crates/jayjay-core" }
-gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.0.1" }
+gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.1.7" }
 gpui_platform = { git = "https://github.com/zed-industries/zed", tag = "v1.1.7", features = ["font-kit", "runtime_shaders"] }
 chrono = { workspace = true }
 font-kit = "0.14"
@@ -26,5 +26,5 @@ serde = { workspace = true }
 toml = { workspace = true }
 
 [dev-dependencies]
-gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.0.1", features = ["test-support"] }
+gpui = { git = "https://github.com/zed-industries/zed", tag = "v1.1.7", features = ["test-support"] }
 jj-test-fixtures = { path = "../../crates/jj-test-fixtures" }