Merge branch 'xMAC94x/update_dependencies' into 'master'

xmac94x/update dependencies

See merge request veloren/veloren!4090
This commit is contained in:
Marcel 2023-08-28 17:08:55 +00:00
commit f6b1d39cf4
8 changed files with 847 additions and 872 deletions

1699
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -42,7 +42,7 @@ client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true
serde = { workspace = true, features = [ "rc" ], optional = true }
ron = { workspace = true, optional = true }
clap = { workspace = true, optional = true }
rustyline = { version = "11.0.0", optional = true }
rustyline = { version = "12.0.0", optional = true }
## logging
termcolor = { version = "1.1", optional = true }
common-frontend = { package = "veloren-common-frontend", path = "../common/frontend", optional = true }

View File

@ -47,7 +47,7 @@ num-derive = "0.4.0"
num-traits = { workspace = true }
ordered-float = { workspace = true }
rayon = { workspace = true }
roots = "0.0.6"
roots = "0.0.8"
spin_sleep = "1.0"
tracing = { workspace = true }
uuid = { version = "0.8.1", default-features = false, features = ["serde", "v4"] }
@ -73,14 +73,14 @@ clap = { workspace = true, optional = true }
hashbrown = { workspace = true }
slab = { workspace = true }
slotmap = { version = "1.0", features = ["serde"] }
indexmap = { version = "1.3.0", features = ["rayon"] }
indexmap = { version = "1.9.3", features = ["rayon"] }
# ECS
specs = { workspace = true, features = ["serde", "storage-event-control"] }
[dev-dependencies]
#bench
criterion = "0.3"
criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support"]}
rand_chacha = { workspace = true }
#test

View File

@ -7,5 +7,5 @@ edition = "2021"
[dependencies]
find_folder = {version = "0.3.0"}
libloading = {version = "0.8"}
notify = {version = "5.0.0"}
notify = {version = "6.1.0"}
tracing = { workspace = true }

View File

@ -56,9 +56,9 @@ clap = { workspace = true }
shellexpand = "3.1.0"
serde = { version = "1.0", features = ["derive"] }
prometheus-hyper = { workspace = true }
criterion = { version = "0.3.4", features = ["default", "async_tokio"] }
criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]}
#quic
rcgen = { version = "0.10"}
rcgen = { version = "0.11"}
[[bench]]
name = "speed"

View File

@ -29,7 +29,7 @@ hashbrown = { workspace = true }
[dev-dependencies]
async-channel = "1.6"
tokio = { workspace = true, features = ["macros"] }
criterion = { version = "0.3.4", features = ["default", "async_tokio"] }
criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]}
[[bench]]
name = "protocols"

View File

@ -149,7 +149,7 @@ mimalloc = "0.1.29"
mumble-link = "0.2.0"
[dev-dependencies]
criterion = "0.3"
criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support"]}
world = {package = "veloren-world", path = "../world"}
rayon = { workspace = true }

View File

@ -55,7 +55,7 @@ clap = { workspace = true, optional = true }
[dev-dependencies]
common-frontend = { package = "veloren-common-frontend", path = "../common/frontend" }
criterion = "0.3"
criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support"]}
csv = "1.1.3"
tracing-subscriber = { version = "0.3.7", default-features = false, features = ["fmt", "time", "ansi", "smallvec", "env-filter"] }
minifb = "0.24"