Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xMAC94x/update_deps' into 'master'

Browse Source 
update dependencies, including removal of some tracy deps as they are get through common/tracy

See merge request veloren/veloren!1867
This commit is contained in:
Marcel 2021-03-09 20:42:00 +00:00
commit afbc810b3e
15 changed files with 402 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

730
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
client/Cargo.toml
View File

@ -21,7 +21,7 @@ byteorder = "1.3.2"
futures-util = "0.3.7"
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
image = { version = "0.23.12", default-features = false, features = ["png"] }
num = "0.3.1"
num = "0.4"
tracing = { version = "0.1", default-features = false }
rayon = "1.5"
specs = { git = "https://github.com/amethyst/specs.git", rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }

6
common/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[features]
no-assets = []
tracy = ["tracy-client"]
tracy = ["common-base/tracy"]
simd = ["vek/platform_intrinsics"]
bin_csv = ["csv", "structopt"]
@ -52,10 +52,6 @@ serde_repr = "0.1.6"
csv = { version = "1.1.3", optional = true }
structopt = { version = "0.3.13", optional = true }
# Tracy
tracy-client = { version = "0.10.0", optional = true }
# Data structures
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] }
slotmap = { version = "1.0", features = ["serde"] }

2
common/base/Cargo.toml
View File

@ -13,4 +13,4 @@ tracing = { version = "0.1", default-features = false }
directories-next = "2.0"
# Tracy
tracy-client = { version = "0.10.0", optional = true }
tracy-client = { version = "0.12.0", optional = true }

7
common/net/Cargo.toml
View File

@ -5,7 +5,7 @@ name = "veloren-common-net"
version = "0.8.0"
[features]
tracy = ["tracy-client"]
tracy = ["common/tracy"]
simd = ["vek/platform_intrinsics"]
default = ["simd"]
@ -27,7 +27,4 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "bffb5181a35c19ddfd
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
# Serde
serde = { version = "1.0.110", features = ["derive"] }
# Tracy
tracy-client = { version = "0.10.0", optional = true }
serde = { version = "1.0.110", features = ["derive"] }

5
common/sys/Cargo.toml
View File

@ -5,7 +5,7 @@ name = "veloren-common-sys"
version = "0.8.0"
[features]
tracy = ["tracy-client"]
tracy = ["common/tracy"]
simd = ["vek/platform_intrinsics"]
plugins = ["toml", "tar", "wasmer", "bincode", "plugin-api"]
@ -33,9 +33,6 @@ specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "s
# Serde
serde = { version = "1.0.110", features = ["derive"] }
# Tracy
tracy-client = { version = "0.10.0", optional = true }
# Plugins
scopeguard = "1.1.0"
toml = { version = "0.5.7", optional = true }

4
network/Cargo.toml
View File

@ -25,7 +25,7 @@ tokio = { version = "1.2", default-features = false, features = ["io-util", "mac
tokio-stream = { version = "0.1.2", default-features = false }
#tracing and metrics
tracing = { version = "0.1", default-features = false, features = ["attributes"]}
prometheus = { version = "0.11", default-features = false, optional = true }
prometheus = { version = "0.12", default-features = false, optional = true }
#async
futures-core = { version = "0.3", default-features = false }
futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
@ -47,7 +47,7 @@ futures-util = { version = "0.3.7", default-features = false, features = ["sink"
clap = { version = "2.33", default-features = false }
shellexpand = "2.0.0"
serde = { version = "1.0", features = ["derive"] }
prometheus-hyper = "0.1.1"
prometheus-hyper = "0.1.2"
criterion = { version = "0.3.4", features = ["default", "async_tokio"] }
[[bench]]

2
network/protocol/Cargo.toml
View File

@ -17,7 +17,7 @@ default = ["metrics"]
#tracing and metrics
tracing = { version = "0.1", default-features = false }
prometheus = { version = "0.11", default-features = false, optional = true }
prometheus = { version = "0.12", default-features = false, optional = true }
#stream flags
bitflags = "1.2.1"
rand = { version = "0.8" }

6
server-cli/Cargo.toml
View File

@ -19,9 +19,9 @@ common-net = { package = "veloren-common-net", path = "../common/net" }
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
ansi-parser = "0.7"
clap = "2.33"
crossterm = "0.18"
crossterm = "0.19"
lazy_static = "1"
signal-hook = "0.2.2"
signal-hook = "0.3.6"
termcolor = "1.1"
tracing = { version = "0.1", default-features = false }
tracing-subscriber = { version = "0.2.3", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec"] }
@ -29,7 +29,7 @@ ron = {version = "0.6", default-features = false}
serde = {version = "1.0", features = [ "rc", "derive" ]}
# Tracy
tracing-tracy = { version = "0.4.0", optional = true }
tracing-tracy = { version = "0.6.0", optional = true }
[dependencies.tui]
git = "https://github.com/fdehau/tui-rs.git"

2
server-cli/src/main.rs
View File

@ -77,7 +77,7 @@ fn main() -> io::Result<()> {
let sigusr1_signal = Arc::new(AtomicBool::new(false));
#[cfg(any(target_os = "linux", target_os = "macos"))]
let _ = signal_hook::flag::register(signal_hook::SIGUSR1, Arc::clone(&sigusr1_signal));
let _ = signal_hook::flag::register(signal_hook::consts::SIGUSR1, Arc::clone(&sigusr1_signal));
logging::init(basic);

2
server-cli/src/tui_runner.rs
View File

@ -5,7 +5,7 @@ use crossterm::{
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
};
use std::{
io::{self, Write},
io,
sync::{
atomic::{AtomicBool, Ordering},
mpsc, Arc,

6
server/Cargo.toml
View File

@ -28,8 +28,8 @@ tracing = "0.1"
vek = { version = "0.14.1", features = ["serde"] }
futures-util = "0.3.7"
tokio = { version = "1", default-features = false, features = ["rt"] }
prometheus-hyper = "0.1.1"
itertools = "0.9"
prometheus-hyper = "0.1.2"
itertools = "0.10"
lazy_static = "1.4.0"
scan_fmt = { git = "https://github.com/Imberflur/scan_fmt" }
ron = { version = "0.6", default-features = false }
@ -40,7 +40,7 @@ chrono = "0.4.9"
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] }
rayon = "1.5"
crossbeam-channel = "0.5"
prometheus = { version = "0.11", default-features = false}
prometheus = { version = "0.12", default-features = false}
portpicker = { git = "https://github.com/xMAC94x/portpicker-rs", rev = "df6b37872f3586ac3b21d08b56c8ec7cd92fb172" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "bffb5181a35c19ddfd33ee0b4aedba741aafb68d" }
libsqlite3-sys = { version = "0.18", features = ["bundled"] }

4
voxygen/Cargo.toml
View File

@ -76,7 +76,7 @@ hashbrown = {version = "0.9", features = ["rayon", "serde", "nightly"]}
image = {version = "0.23.12", default-features = false, features = ["ico", "png"]}
lazy_static = "1.4.0"
native-dialog = { version = "0.5.2", optional = true }
num = "0.3.1"
num = "0.4"
ordered-float = { version = "2.0.1", default-features = false }
rand = "0.8"
rodio = {version = "0.13", default-features = false, features = ["wav", "vorbis"]}
@ -90,7 +90,7 @@ inline_tweak = "1.0.2"
itertools = "0.10.0"
# Tracy
tracing-tracy = { version = "0.4.0", optional = true }
tracing-tracy = { version = "0.6.0", optional = true }
# Logging
termcolor = "1.1"

2
voxygen/anim/Cargo.toml
View File

@ -22,7 +22,7 @@ common = {package = "veloren-common", path = "../../common"}
find_folder = {version = "0.3.0", optional = true}
inline_tweak = "1.0.2"
lazy_static = {version = "1.4.0", optional = true}
libloading = {version = "0.6.2", optional = true}
libloading = {version = "0.7", optional = true}
notify = {version = "5.0.0-pre.2", optional = true}
tracing = {version = "0.1", optional = true}
vek = {version = "=0.14.1", features = ["serde"]}

2
world/Cargo.toml
View File

@ -20,7 +20,7 @@ image = { version = "0.23.12", default-features = false, features = ["png"] }
itertools = "0.10"
vek = { version = "0.14.1", features = ["serde"] }
noise = { version = "0.7", default-features = false }
num = "0.3.1"
num = "0.4"
ordered-float = "2.0.1"
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] }
lazy_static = "1.4.0"