diff --git a/Cargo.lock b/Cargo.lock index 95e2427..5ee2577 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,6 +91,48 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" +[[package]] +name = "android-activity" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd" +dependencies = [ + "android-properties", + "bitflags 2.11.0", + "cc", + "jni 0.22.4", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror 2.0.18", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_log-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d" + +[[package]] +name = "android_logger" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3" +dependencies = [ + "android_log-sys", + "env_filter", + "log", +] + [[package]] name = "android_system_properties" version = "0.1.5" @@ -241,7 +283,7 @@ name = "assets" version = "1.0.0-beta2" dependencies = [ "anyhow", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "log", "rust-embed", ] @@ -540,7 +582,7 @@ dependencies = [ "anyhow", "common", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "gpui_tokio", "log", "semver", @@ -923,9 +965,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.58" +version = "1.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" +checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" dependencies = [ "find-msvc-tools", "jobserver", @@ -1003,7 +1045,7 @@ dependencies = [ "flume 0.11.1", "futures", "fuzzy-matcher", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "itertools 0.13.0", "log", "nostr-sdk", @@ -1024,7 +1066,7 @@ dependencies = [ "chat", "common", "flume 0.11.1", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "gpui_tokio", "itertools 0.13.0", "linkify", @@ -1203,7 +1245,16 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" +dependencies = [ + "indexmap", + "rustc-hash 2.1.2", +] + +[[package]] +name = "collections" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "indexmap", "rustc-hash 2.1.2", @@ -1250,7 +1301,7 @@ dependencies = [ "chrono", "dirs 5.0.1", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "itertools 0.13.0", "log", "nostr", @@ -1350,7 +1401,7 @@ dependencies = [ "core-text", "device", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "gpui_linux", "gpui_macos", "gpui_platform", @@ -1378,6 +1429,38 @@ dependencies = [ "webbrowser", ] +[[package]] +name = "coop_mobile" +version = "1.0.0-beta2" +dependencies = [ + "anyhow", + "assets", + "chat", + "common", + "device", + "futures", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", + "gpui-mobile", + "gpui_platform", + "gpui_tokio", + "itertools 0.13.0", + "log", + "nostr-connect", + "nostr-sdk", + "oneshot", + "person", + "relay_auth", + "serde", + "serde_json", + "settings", + "smallvec", + "smol", + "state", + "theme", + "tracing-subscriber", + "ui", +] + [[package]] name = "coop_web" version = "1.0.0-beta2" @@ -1385,13 +1468,12 @@ dependencies = [ "anyhow", "assets", "chat", - "chat_ui", "common", "console_error_panic_hook", "console_log", "device", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "gpui_platform", "gpui_tokio", "gpui_web", @@ -1711,7 +1793,17 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_refineable" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "proc-macro2", "quote", @@ -1725,7 +1817,7 @@ dependencies = [ "anyhow", "common", "flume 0.11.1", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "itertools 0.13.0", "log", "nostr-sdk", @@ -1957,6 +2049,16 @@ dependencies = [ "syn", ] +[[package]] +name = "env_filter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" +dependencies = [ + "log", + "regex", +] + [[package]] name = "equator" version = "0.4.2" @@ -2256,9 +2358,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "font-types" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73829a7b5c91198af28a99159b7ae4afbb252fb906159ff7f189f3a2ceaa3df2" +checksum = "2d9237c6d82152100c691fb77ea18037b402bcc7257d2c876a4ffac81bc22a1c" dependencies = [ "bytemuck", ] @@ -2701,19 +2803,18 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ "anyhow", "async-channel 2.5.0", "async-task", "bindgen", - "bitflags 2.11.0", "block", "cbindgen", "chrono", "cocoa 0.26.0", "cocoa-foundation 0.2.0", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", "core-foundation 0.10.0", "core-foundation-sys", "core-graphics 0.24.0", @@ -2721,22 +2822,21 @@ dependencies = [ "core-video", "ctor", "derive_more", - "embed-resource", "etagere", "foreign-types", "futures", "futures-concurrency", "getrandom 0.3.4", - "gpui_macros", - "gpui_util", - "http_client", + "gpui_macros 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", "image", "inventory", "itertools 0.14.0", "log", "lyon", "mach2", - "media", + "media 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", "metal", "naga 29.0.1", "num_cpus", @@ -2750,10 +2850,10 @@ dependencies = [ "profiling", "rand 0.9.2", "raw-window-handle", - "refineable", + "refineable 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", "regex", "resvg", - "scheduler", + "scheduler 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", "schemars", "seahash", "serde", @@ -2763,13 +2863,91 @@ dependencies = [ "spin 0.10.0", "stacksafe", "strum", - "sum_tree", + "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", "taffy", "thiserror 2.0.18", "ttf-parser", "url", "usvg", - "util_macros", + "util_macros 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "uuid", + "waker-fn", + "web-time", + "windows 0.61.3", +] + +[[package]] +name = "gpui" +version = "0.2.2" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "anyhow", + "async-channel 2.5.0", + "async-task", + "bindgen", + "bitflags 2.11.0", + "block", + "cbindgen", + "chrono", + "cocoa 0.26.0", + "cocoa-foundation 0.2.0", + "collections 0.1.0 (git+https://github.com/zed-industries/zed)", + "core-foundation 0.10.0", + "core-foundation-sys", + "core-graphics 0.24.0", + "core-text", + "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)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed)", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed)", + "image", + "inventory", + "itertools 0.14.0", + "log", + "lyon", + "mach2", + "media 0.1.0 (git+https://github.com/zed-industries/zed)", + "metal", + "naga 29.0.1", + "num_cpus", + "objc", + "parking", + "parking_lot", + "pathfinder_geometry", + "pin-project", + "pollster 0.4.0", + "postage", + "profiling", + "rand 0.9.2", + "raw-window-handle", + "refineable 0.1.0 (git+https://github.com/zed-industries/zed)", + "regex", + "resvg", + "scheduler 0.1.0 (git+https://github.com/zed-industries/zed)", + "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)", + "taffy", + "thiserror 2.0.18", + "ttf-parser", + "url", + "usvg", + "util_macros 0.1.0 (git+https://github.com/zed-industries/zed)", "uuid", "waker-fn", "web-time", @@ -2778,10 +2956,42 @@ dependencies = [ "zed-scap", ] +[[package]] +name = "gpui-mobile" +version = "0.1.0" +source = "git+https://github.com/itsbalamurali/gpui-mobile#f75068f0e036c82fb10436549537d8daea83ef06" +dependencies = [ + "android-activity", + "android_logger", + "anyhow", + "block", + "core-foundation 0.10.0", + "core-foundation-sys", + "core-graphics 0.24.0", + "core-text", + "futures", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "gpui_wgpu 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "jni 0.22.4", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "parking_lot", + "pathfinder_geometry", + "raw-window-handle", + "rustc-hash 2.1.2", + "smallvec", + "uuid", + "wgpu", + "zed-font-kit", +] + [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2790,12 +3000,12 @@ dependencies = [ "bytemuck", "calloop", "calloop-wayland-source", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed)", "filedescriptor", "futures", - "gpui", - "gpui_wgpu", - "http_client", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", + "gpui_wgpu 0.1.0 (git+https://github.com/zed-industries/zed)", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed)", "itertools 0.14.0", "libc", "log", @@ -2811,7 +3021,7 @@ dependencies = [ "strum", "swash", "url", - "util", + "util 0.1.0 (git+https://github.com/zed-industries/zed)", "uuid", "wayland-backend", "wayland-client", @@ -2829,14 +3039,14 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "anyhow", "async-task", "block", "cbindgen", "cocoa 0.26.0", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed)", "core-foundation 0.10.0", "core-foundation-sys", "core-graphics 0.24.0", @@ -2848,13 +3058,13 @@ dependencies = [ "etagere", "foreign-types", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "image", "itertools 0.14.0", "libc", "log", "mach2", - "media", + "media 0.1.0 (git+https://github.com/zed-industries/zed)", "metal", "objc", "objc2-app-kit", @@ -2864,7 +3074,7 @@ dependencies = [ "semver", "smallvec", "strum", - "util", + "util 0.1.0 (git+https://github.com/zed-industries/zed)", "uuid", "zed-font-kit", ] @@ -2872,7 +3082,18 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gpui_macros" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2883,10 +3104,10 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "console_error_panic_hook", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "gpui_linux", "gpui_macos", "gpui_web", @@ -2896,18 +3117,27 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "anyhow", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "tokio", - "util", + "util 0.1.0 (git+https://github.com/zed-industries/zed)", ] [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" +dependencies = [ + "anyhow", + "log", +] + +[[package]] +name = "gpui_util" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "anyhow", "log", @@ -2916,14 +3146,14 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "anyhow", "console_error_panic_hook", "futures", - "gpui", - "gpui_wgpu", - "http_client", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", + "gpui_wgpu 0.1.0 (git+https://github.com/zed-industries/zed)", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed)", "js-sys", "log", "parking_lot", @@ -2940,15 +3170,43 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ "anyhow", "bytemuck", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", "cosmic-text", "etagere", - "gpui", - "gpui_util", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "itertools 0.14.0", + "js-sys", + "log", + "parking_lot", + "pollster 0.4.0", + "profiling", + "raw-window-handle", + "smallvec", + "swash", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu", + "zed-font-kit", +] + +[[package]] +name = "gpui_wgpu" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "anyhow", + "bytemuck", + "collections 0.1.0 (git+https://github.com/zed-industries/zed)", + "cosmic-text", + "etagere", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed)", "itertools 0.14.0", "js-sys", "log", @@ -2968,13 +3226,13 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "anyhow", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed)", "etagere", "futures", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "image", "itertools 0.14.0", "log", @@ -2982,7 +3240,7 @@ dependencies = [ "rand 0.9.2", "raw-window-handle", "smallvec", - "util", + "util 0.1.0 (git+https://github.com/zed-industries/zed)", "uuid", "windows 0.61.3", "windows-core 0.61.2", @@ -3240,7 +3498,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ "anyhow", "async-compression", @@ -3259,13 +3517,38 @@ dependencies = [ "sha2", "tempfile", "url", - "util", + "util 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", +] + +[[package]] +name = "http_client" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +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)", ] [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3365,12 +3648,13 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" dependencies = [ "displaydoc", "potential_utf", + "utf8_iter", "yoke", "zerofrom", "zerovec", @@ -3378,9 +3662,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" dependencies = [ "displaydoc", "litemap", @@ -3391,9 +3675,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -3405,15 +3689,15 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" [[package]] name = "icu_properties" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" dependencies = [ "icu_collections", "icu_locale_core", @@ -3425,15 +3709,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" [[package]] name = "icu_provider" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" dependencies = [ "displaydoc", "icu_locale_core", @@ -3519,9 +3803,9 @@ checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" [[package]] name = "indexmap" -version = "2.13.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" dependencies = [ "equivalent", "hashbrown 0.16.1", @@ -3828,9 +4112,9 @@ checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] name = "libc" -version = "0.2.183" +version = "0.2.184" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" +checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" [[package]] name = "libfuzzer-sys" @@ -3922,9 +4206,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" [[package]] name = "litrs" @@ -4104,7 +4388,22 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" +dependencies = [ + "anyhow", + "bindgen", + "core-foundation 0.10.0", + "core-video", + "ctor", + "foreign-types", + "metal", + "objc", +] + +[[package]] +name = "media" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "anyhow", "bindgen", @@ -4276,6 +4575,21 @@ dependencies = [ "getrandom 0.2.17", ] +[[package]] +name = "ndk" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +dependencies = [ + "bitflags 2.11.0", + "jni-sys 0.3.1", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror 1.0.69", +] + [[package]] name = "ndk-context" version = "0.1.1" @@ -4355,7 +4669,7 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "nostr" version = "0.44.1" -source = "git+https://github.com/rust-nostr/nostr#6503a7a86e904800de54c8592a6811f5f17cd805" +source = "git+https://github.com/rust-nostr/nostr#fd25803fbc9b3fb3207ead372336208c1c60b37b" dependencies = [ "aes", "base64", @@ -4379,7 +4693,7 @@ dependencies = [ [[package]] name = "nostr-blossom" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#6503a7a86e904800de54c8592a6811f5f17cd805" +source = "git+https://github.com/rust-nostr/nostr#fd25803fbc9b3fb3207ead372336208c1c60b37b" dependencies = [ "base64", "nostr", @@ -4390,7 +4704,7 @@ dependencies = [ [[package]] name = "nostr-connect" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#6503a7a86e904800de54c8592a6811f5f17cd805" +source = "git+https://github.com/rust-nostr/nostr#fd25803fbc9b3fb3207ead372336208c1c60b37b" dependencies = [ "async-utility", "futures-core", @@ -4403,7 +4717,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#6503a7a86e904800de54c8592a6811f5f17cd805" +source = "git+https://github.com/rust-nostr/nostr#fd25803fbc9b3fb3207ead372336208c1c60b37b" dependencies = [ "btreecap", "flatbuffers", @@ -4413,7 +4727,7 @@ dependencies = [ [[package]] name = "nostr-gossip" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#6503a7a86e904800de54c8592a6811f5f17cd805" +source = "git+https://github.com/rust-nostr/nostr#fd25803fbc9b3fb3207ead372336208c1c60b37b" dependencies = [ "nostr", ] @@ -4421,7 +4735,7 @@ dependencies = [ [[package]] name = "nostr-gossip-memory" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#6503a7a86e904800de54c8592a6811f5f17cd805" +source = "git+https://github.com/rust-nostr/nostr#fd25803fbc9b3fb3207ead372336208c1c60b37b" dependencies = [ "indexmap", "lru", @@ -4433,7 +4747,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#6503a7a86e904800de54c8592a6811f5f17cd805" +source = "git+https://github.com/rust-nostr/nostr#fd25803fbc9b3fb3207ead372336208c1c60b37b" dependencies = [ "async-utility", "flume 0.12.0", @@ -4447,7 +4761,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.44.1" -source = "git+https://github.com/rust-nostr/nostr#6503a7a86e904800de54c8592a6811f5f17cd805" +source = "git+https://github.com/rust-nostr/nostr#fd25803fbc9b3fb3207ead372336208c1c60b37b" dependencies = [ "async-utility", "async-wsocket", @@ -4594,6 +4908,28 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26" +dependencies = [ + "num_enum_derive", + "rustversion", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "objc" version = "0.2.7" @@ -4931,9 +5267,19 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "serde", + "serde_json", +] + +[[package]] +name = "perf" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "collections 0.1.0 (git+https://github.com/zed-industries/zed)", "serde", "serde_json", ] @@ -4945,7 +5291,7 @@ dependencies = [ "anyhow", "common", "flume 0.11.1", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "log", "nostr-sdk", "smallvec", @@ -5168,9 +5514,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" dependencies = [ "zerovec", ] @@ -5206,7 +5552,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.9+spec-1.1.0", + "toml_edit 0.25.10+spec-1.1.0", ] [[package]] @@ -5643,9 +5989,17 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ - "derive_refineable", + "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", +] + +[[package]] +name = "refineable" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "derive_refineable 0.1.0 (git+https://github.com/zed-industries/zed)", ] [[package]] @@ -5684,7 +6038,7 @@ dependencies = [ "anyhow", "common", "flume 0.11.1", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "log", "nostr-sdk", "settings", @@ -5742,13 +6096,13 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "anyhow", "bytes", "futures", - "gpui_util", - "http_client", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed)", + "http_client 0.1.0 (git+https://github.com/zed-industries/zed)", "http_client_tls", "log", "regex", @@ -5800,16 +6154,16 @@ dependencies = [ [[package]] name = "rope" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "heapless 0.9.2", "log", "rayon", - "sum_tree", + "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed)", "tracing", "unicode-segmentation", - "util", - "ztracing", + "util 0.1.0 (git+https://github.com/zed-industries/zed)", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed)", ] [[package]] @@ -6062,7 +6416,22 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" +dependencies = [ + "async-task", + "backtrace", + "chrono", + "flume 0.11.1", + "futures", + "parking_lot", + "rand 0.9.2", + "web-time", +] + +[[package]] +name = "scheduler" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" dependencies = [ "async-task", "backtrace", @@ -6203,9 +6572,9 @@ checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" [[package]] name = "semver" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" dependencies = [ "serde", "serde_core", @@ -6345,7 +6714,7 @@ version = "1.0.0-beta2" dependencies = [ "anyhow", "common", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "log", "nostr-sdk", "paste", @@ -6593,7 +6962,7 @@ dependencies = [ "anyhow", "common", "flume 0.11.1", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "gpui_tokio", "log", "mime_guess", @@ -6663,13 +7032,25 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ "heapless 0.9.2", "log", "rayon", "tracing", - "ztracing", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", +] + +[[package]] +name = "sum_tree" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "heapless 0.9.2", + "log", + "rayon", + "tracing", + "ztracing 0.1.0 (git+https://github.com/zed-industries/zed)", ] [[package]] @@ -6929,7 +7310,7 @@ name = "theme" version = "1.0.0-beta2" dependencies = [ "anyhow", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "log", "schemars", "serde", @@ -7038,9 +7419,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" dependencies = [ "displaydoc", "zerovec", @@ -7067,7 +7448,7 @@ version = "1.0.0-beta2" dependencies = [ "anyhow", "common", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "linicon", "log", "nostr-sdk", @@ -7080,9 +7461,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.50.0" +version = "1.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" +checksum = "2bd1c4c0fc4a7ab90fc15ef6daaa3ec3b893f004f915f2392557ed23237820cd" dependencies = [ "bytes", "libc", @@ -7095,9 +7476,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.6.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", @@ -7237,9 +7618,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.9+spec-1.1.0" +version = "0.25.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da053d28fe57e2c9d21b48261e14e7b4c8b670b54d2c684847b91feaf4c7dac5" +checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b" dependencies = [ "indexmap", "toml_datetime 1.1.1+spec-1.1.0", @@ -7249,9 +7630,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.1.1+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ca317ebc49f06bd748bfba29533eac9485569dc9bf80b849024b025e814fb9" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ "winnow 1.0.1", ] @@ -7449,7 +7830,7 @@ version = "1.0.0-beta2" dependencies = [ "anyhow", "common", - "gpui", + "gpui 0.2.2 (git+https://github.com/zed-industries/zed)", "image", "itertools 0.13.0", "log", @@ -7460,7 +7841,7 @@ dependencies = [ "serde_json", "smallvec", "smol", - "sum_tree", + "sum_tree 0.1.0 (git+https://github.com/zed-industries/zed)", "theme", "unicode-segmentation", "uuid", @@ -7636,19 +8017,58 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ "anyhow", "async-fs", "async_zip", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", "command-fds", "dirs 4.0.0", "dunce", "futures", "futures-lite 1.13.0", "globset", - "gpui_util", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "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#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "anyhow", + "async-fs", + "async_zip", + "collections 0.1.0 (git+https://github.com/zed-industries/zed)", + "command-fds", + "dirs 4.0.0", + "dunce", + "futures", + "futures-lite 1.13.0", + "globset", + "gpui_util 0.1.0 (git+https://github.com/zed-industries/zed)", "itertools 0.14.0", "libc", "log", @@ -7675,9 +8095,19 @@ dependencies = [ [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ - "perf", + "perf 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "quote", + "syn", +] + +[[package]] +name = "util_macros" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "perf 0.1.0 (git+https://github.com/zed-industries/zed)", "quote", "syn", ] @@ -9058,9 +9488,9 @@ dependencies = [ [[package]] name = "writeable" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "x11" @@ -9200,9 +9630,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -9211,9 +9641,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" dependencies = [ "proc-macro2", "quote", @@ -9417,18 +9847,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", @@ -9458,9 +9888,9 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" dependencies = [ "displaydoc", "yoke", @@ -9469,9 +9899,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" dependencies = [ "yoke", "zerofrom", @@ -9480,9 +9910,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" dependencies = [ "proc-macro2", "quote", @@ -9492,11 +9922,22 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ "anyhow", "chrono", - "collections", + "collections 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "log", +] + +[[package]] +name = "zlog" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "anyhow", + "chrono", + "collections 0.1.0 (git+https://github.com/zed-industries/zed)", "log", ] @@ -9509,18 +9950,34 @@ checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" dependencies = [ "tracing", "tracing-subscriber", - "zlog", - "ztracing_macro", + "zlog 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", + "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121)", +] + +[[package]] +name = "ztracing" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" +dependencies = [ + "tracing", + "tracing-subscriber", + "zlog 0.1.0 (git+https://github.com/zed-industries/zed)", + "ztracing_macro 0.1.0 (git+https://github.com/zed-industries/zed)", ] [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#a9dd7e9f062933336b04c07145caaf19893c0f89" +source = "git+https://github.com/zed-industries/zed?rev=56104fb17e6c5849900a4c282f42d1bfea294121#56104fb17e6c5849900a4c282f42d1bfea294121" + +[[package]] +name = "ztracing_macro" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed#68452a3daea53843b9b388ec53a2cfd7673baac0" [[package]] name = "zune-core" diff --git a/Cargo.toml b/Cargo.toml index cc9b945..7c67cf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,6 @@ gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["fo gpui_linux = { git = "https://github.com/zed-industries/zed" } gpui_windows = { git = "https://github.com/zed-industries/zed" } gpui_macos = { git = "https://github.com/zed-industries/zed" } -gpui_web = { git = "https://github.com/zed-industries/zed" } gpui_tokio = { git = "https://github.com/zed-industries/zed" } reqwest_client = { git = "https://github.com/zed-industries/zed" } @@ -43,6 +42,7 @@ smallvec = "1.14.0" smol = "2" tracing = "0.1.40" webbrowser = "1.0.4" +tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } [profile.release] strip = true diff --git a/crates/coop/Cargo.toml b/crates/coop/Cargo.toml index e98b39e..78755f8 100644 --- a/crates/coop/Cargo.toml +++ b/crates/coop/Cargo.toml @@ -62,9 +62,9 @@ smol.workspace = true futures.workspace = true oneshot.workspace = true webbrowser.workspace = true +tracing-subscriber.workspace = true indexset = "0.12.3" -tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } [target.'cfg(target_os = "macos")'.dependencies] # Temporary workaround https://github.com/zed-industries/zed/issues/47168 diff --git a/crates/coop_mobile/Cargo.toml b/crates/coop_mobile/Cargo.toml new file mode 100644 index 0000000..c0c38f2 --- /dev/null +++ b/crates/coop_mobile/Cargo.toml @@ -0,0 +1,36 @@ +[package] +name = "coop_mobile" +version.workspace = true +edition.workspace = true +publish.workspace = true + +[dependencies] +assets = { path = "../assets" } +ui = { path = "../ui" } +theme = { path = "../theme" } +common = { path = "../common" } +state = { path = "../state" } +device = { path = "../device" } +chat = { path = "../chat" } +settings = { path = "../settings" } +person = { path = "../person" } +relay_auth = { path = "../relay_auth" } + +gpui.workspace = true +gpui_platform.workspace = true +gpui_tokio.workspace = true +gpui-mobile = { git = "https://github.com/itsbalamurali/gpui-mobile" } + +nostr-connect.workspace = true +nostr-sdk.workspace = true + +anyhow.workspace = true +serde.workspace = true +serde_json.workspace = true +itertools.workspace = true +log.workspace = true +smallvec.workspace = true +smol.workspace = true +futures.workspace = true +oneshot.workspace = true +tracing-subscriber.workspace = true diff --git a/crates/coop_mobile/src/lib.rs b/crates/coop_mobile/src/lib.rs new file mode 100644 index 0000000..e69de29 diff --git a/crates/coop_web/Cargo.toml b/crates/coop_web/Cargo.toml index 9efc0c5..e22c8a2 100644 --- a/crates/coop_web/Cargo.toml +++ b/crates/coop_web/Cargo.toml @@ -12,15 +12,14 @@ common = { path = "../common" } state = { path = "../state" } device = { path = "../device" } chat = { path = "../chat" } -chat_ui = { path = "../chat_ui" } settings = { path = "../settings" } person = { path = "../person" } relay_auth = { path = "../relay_auth" } gpui.workspace = true -gpui_web.workspace = true gpui_platform.workspace = true gpui_tokio.workspace = true +gpui_web = { git = "https://github.com/zed-industries/zed" } nostr-connect.workspace = true nostr-sdk.workspace = true @@ -35,8 +34,8 @@ smol.workspace = true futures.workspace = true oneshot.workspace = true webbrowser.workspace = true +tracing-subscriber.workspace = true -tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } console_error_panic_hook = "0.1" tracing-wasm = "0.2" console_log = "1.0" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 55d86c1..a3f50e4 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -8,5 +8,7 @@ targets = [ "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "aarch64-pc-windows-msvc", + "aarch64-apple-ios", + "aarch64-linux-android", "wasm32-unknown-unknown" ]