first pass of merging in warp (doesn't build)

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+6 -4
View File
@@ -21,6 +21,7 @@ dirs.workspace = true
directories.workspace = true
shellexpand.workspace = true
enum-iterator.workspace = true
futures-lite.workspace = true
galaxy_features.workspace = true
itertools.workspace = true
getset.workspace = true
@@ -28,6 +29,7 @@ http.workspace = true
lazy_static.workspace = true
log.workspace = true
parking_lot.workspace = true
pin-project.workspace = true
reqwest.workspace = true
serde.workspace = true
settings.workspace = true
@@ -36,8 +38,10 @@ serde_with.workspace = true
sentry = { workspace = true, optional = true }
sentry-log = { workspace = true, optional = true }
strum.workspace = true
strum_macros.workspace = true
sysinfo.workspace = true
thiserror.workspace = true
tracing.workspace = true
concat-idents.workspace = true
url.workspace = true
regex.workspace = true
@@ -45,13 +49,13 @@ websocket.workspace = true
instant.workspace = true
schemars = "1"
settings_value = { workspace = true, features = ["derive"] }
warp_util.workspace = true
async-broadcast.workspace = true
futures.workspace = true
line-ending.workspace = true
galaxyui.workspace = true
galaxyui_core.workspace = true
galaxyui_extras = { workspace = true, features = ["default"] }
mockito = { workspace = true, optional = true }
asset_macro.workspace = true
string-offset.workspace = true
inventory = "0.3.20"
chrono.workspace = true
@@ -60,8 +64,6 @@ chrono.workspace = true
tokio.workspace = true
[target.'cfg(target_os = "macos")'.dependencies]
cocoa.workspace = true
objc.workspace = true
objc2-foundation = { workspace = true, features = [
"NSString",
"NSURL",