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

use workspace dependencies to make our life easier maintaining them :)

Browse Source
This commit is contained in:
Marcel Märtens 2023-05-10 10:33:01 +02:00
parent 5ade37e0a5
commit 3a19669d53
37 changed files with 260 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock generated
View File

@ -477,6 +477,9 @@ name = "bitflags"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813"
dependencies = [
"serde",
]
[[package]]
name = "bitvec"
@ -5321,17 +5324,6 @@ dependencies = [
"serde",
]
[[package]]
name = "ron"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
dependencies = [
"base64 0.13.1",
"bitflags 1.3.2",
"serde",
]
[[package]]
name = "ron"
version = "0.8.0"
@ -6998,7 +6990,7 @@ name = "veloren-common"
version = "0.10.0"
dependencies = [
"approx 0.4.0",
"bitflags 1.3.2",
"bitflags 2.2.1",
"cfg-if 1.0.0",
"chrono",
"chrono-tz",
@ -7017,12 +7009,12 @@ dependencies = [
"lazy_static",
"num-derive",
"num-traits",
"ordered-float 2.10.0",
"ordered-float 3.7.0",
"petgraph 0.6.3",
"rand 0.8.5",
"rand_chacha 0.3.1",
"rayon",
"ron 0.7.1",
"ron 0.8.0",
"roots",
"serde",
"serde_json",

39
Cargo.toml
View File

@ -116,6 +116,45 @@ systems = ["x86_64-linux"]
name = "veloren-nix"
key = "veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc="
[workspace.dependencies]
lazy_static = "1.4.0"
rand = { version = "0.8" }
rand_chacha = { version = "0.3" }
bincode = { version = "1.3.3" }
bitflags = { version = "2.2.1" }
slab = { version = "0.4.2" }
chrono = { version = "0.4.24", default-features=false, features = ["clock", "std", "wasmbind", "serde"] }
chrono-tz = { version = "0.8", features = ["serde"] }
inline_tweak = { version = "1.0.8" }
tokio = { version = "1.20", default-features = false, features = ["rt"] }
tracing = { version = "0.1" }
futures-util = { version = "0.3.7", default-features = false }
prometheus = { version = "0.13", default-features = false}
prometheus-hyper = "0.1.4"
strum = { version = "0.24", features = ["derive"] }
enum-map = { version = "2.4" }
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
fxhash = { version = "0.2.1" }
crossbeam-utils = { version = "0.8.1"}
crossbeam-channel = { version = "0.5"}
ordered-float = { version = "3", default-features = false }
num = { version = "0.4" }
num-traits = { version = "0.2" }
vek = { version = "0.15.8", features = ["serde"] }
itertools = { version = "0.10" }
serde = { version = "1.0.118", features = ["derive"] }
serde_json = { version = "1.0.50" }
ron = { version = "0.8", default-features = false}
specs = { version = "0.18", features = ["nightly"] }
image = { version = "0.24", default-features = false, features = ["png"] }
rayon = { version = "1.5" }
clap = { version = "4.2", features = ["derive"]}
[patch.crates-io]
vek = { git = "https://github.com/yoanlcq/vek.git", rev = "84d5cb65841d46599a986c5477341bea4456be26" }
# patch wgpu so we can use wgpu-profiler crate

4
assets/common/abilities/sword/defensive_cascade.ron
View File

@ -21,9 +21,7 @@ ComboMelee2(
],
energy_cost_per_strike: 5,
meta: (
capabilities: (
// The ability will parry melee attacks in the buildup portion
bits: 0b00100000,
),
capabilities: ("BUILDUP_PARRIES"),
),
)

4
assets/common/abilities/sword/defensive_crescent_slash.ron
View File

@ -21,9 +21,7 @@ ComboMelee2(
],
energy_cost_per_strike: 5,
meta: (
capabilities: (
// The ability will parry melee attacks in the buildup portion
bits: 0b00100000,
),
capabilities: ("BUILDUP_PARRIES"),
),
)

4
assets/common/abilities/sword/defensive_cross_cut.ron
View File

@ -40,9 +40,7 @@ ComboMelee2(
energy_cost_per_strike: 2.5,
auto_progress: true,
meta: (
capabilities: (
// The ability will parry melee attacks in the buildup portion
bits: 0b00100000,
),
capabilities: ("BUILDUP_PARRIES"),
),
)

4
assets/common/abilities/sword/defensive_double_slash.ron
View File

@ -37,9 +37,7 @@ ComboMelee2(
],
energy_cost_per_strike: 0,
meta: (
capabilities: (
// Blocks melee attacks at 50% strength
bits: 0b00000100,
),
capabilities: ("BUILDUP_BLOCKS"),
),
)

4
assets/common/abilities/sword/defensive_dual_cross_cut.ron
View File

@ -22,9 +22,7 @@ ComboMelee2(
],
energy_cost_per_strike: 5,
meta: (
capabilities: (
// The ability will parry melee attacks in the buildup portion
bits: 0b00100000,
),
capabilities: ("BUILDUP_PARRIES"),
),
)

4
assets/common/abilities/sword/defensive_fell_strike.ron
View File

@ -21,9 +21,7 @@ ComboMelee2(
],
energy_cost_per_strike: 5,
meta: (
capabilities: (
// The ability will parry melee attacks in the buildup portion
bits: 0b00100000,
),
capabilities: ("BUILDUP_PARRIES"),
),
)

4
assets/common/abilities/sword/defensive_skewer.ron
View File

@ -26,9 +26,7 @@ ComboMelee2(
],
energy_cost_per_strike: 5,
meta: (
capabilities: (
// The ability will parry melee attacks in the buildup portion
bits: 0b00100000,
),
capabilities: ("BUILDUP_PARRIES"),
),
)

22
client/Cargo.toml
View File

@ -22,15 +22,15 @@ common-net = { package = "veloren-common-net", path = "../common/net" }
network = { package = "veloren-network", path = "../network", features = ["compression","quic"], default-features = false }
byteorder = "1.3.2"
tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
quinn = "0.8"
image = { version = "0.24", default-features = false, features = ["png"] }
num = "0.4"
tracing = { version = "0.1", default-features = false }
rayon = "1.5"
specs = { version = "0.18", features = ["serde", "storage-event-control", "derive"] }
vek = { version = "0.15.8", features = ["serde"] }
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
image = { workspace = true }
num = { workspace = true }
tracing = { workspace = true }
rayon = { workspace = true }
specs = { workspace = true, features = ["serde", "storage-event-control", "derive"] }
vek = { workspace = true }
hashbrown = { workspace = true }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
#TODO: put bot in a different crate
@ -39,9 +39,9 @@ async-channel = { version = "1.6", optional = true }
common-ecs = { package = "veloren-common-ecs", path = "../common/ecs", optional = true }
voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../voxygen/i18n-helpers", optional = true }
client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true }
serde = { version = "1.0", features = [ "rc", "derive" ], optional = true }
ron = { version = "0.8", default-features = false, optional = true }
clap = { version = "4.2", 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 }
## logging
termcolor = { version = "1.1", optional = true }

10
client/i18n/Cargo.toml
View File

@ -9,19 +9,19 @@ version = "0.13.0"
# Assets
common = {package = "veloren-common", path = "../../common"}
common-assets = {package = "veloren-common-assets", path = "../../common/assets"}
ron = "0.8"
serde = { version = "1.0", features = ["derive"] }
ron = { workspace = true }
serde = { workspace = true }
# Localization
unic-langid = { version = "0.9"}
intl-memoizer = { git = "https://github.com/juliancoffee/fluent-rs.git", branch = "patched"}
fluent = { git = "https://github.com/juliancoffee/fluent-rs.git", branch = "patched"}
fluent-bundle = { git = "https://github.com/juliancoffee/fluent-rs.git", branch = "patched"}
# Utility
hashbrown = { version = "0.13", features = ["serde", "nightly"] }
hashbrown = { workspace = true }
deunicode = "1.0"
tracing = "0.1"
tracing = { workspace = true }
# Bin
clap = { version = "4.2", features = ["suggestions", "std", "help", "usage", "error-context"], default-features = false, optional = true }
clap = { workspace = true, optional = true }
fluent-syntax = { git = "https://github.com/juliancoffee/fluent-rs.git", branch = "patched"}
[[bin]]

50
common/Cargo.toml
View File

@ -20,71 +20,69 @@ default = ["simd"]
[dependencies]
common-base = { package = "veloren-common-base", path = "base" }
# inline_tweak = "1.0.8"
# inline_tweak = { workspace = true }
# Serde
serde = { version = "1.0.110", features = ["derive", "rc"] }
serde = { workspace = true, features = ["rc"] }
# Util
enum-map = "2.4"
vek = { version = "0.15.8", features = ["serde"] }
vek = { workspace = true }
cfg-if = "1.0.0"
chrono = { version = "0.4.24", default-features=false, features = ["clock", "std", "wasmbind", "serde"] }
chrono-tz = "0.8"
itertools = "0.10"
chrono = { workspace = true }
chrono-tz = { workspace = true }
itertools = { workspace = true }
serde_json = { workspace = true }
sha2 = "0.10"
serde_json = "1.0.50"
# Strum
strum = { version = "0.24", features = ["derive"] }
strum = { workspace = true }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
approx = "0.4.0"
crossbeam-utils = "0.8.1"
bitflags = "1.2"
crossbeam-channel = "0.5"
lazy_static = "1.4.0"
crossbeam-utils = { workspace = true }
crossbeam-channel = { workspace = true }
bitflags = { workspace = true, features = ["serde"] }
lazy_static = { workspace = true }
num-derive = "0.3"
num-traits = "0.2"
ordered-float = { version = "2.0.1", default-features = false }
rayon = "1.5"
num-traits = { workspace = true }
ordered-float = { workspace = true }
rayon = { workspace = true }
roots = "0.0.6"
spin_sleep = "1.0"
tracing = { version = "0.1", default-features = false }
tracing = { workspace = true }
uuid = { version = "0.8.1", default-features = false, features = ["serde", "v4"] }
rand = "0.8"
fxhash = "0.2.1"
rand = { workspace = true }
fxhash = { workspace = true }
# Assets
common-assets = {package = "veloren-common-assets", path = "assets"}
dot_vox = "5.1"
# Assets
serde_repr = "0.1.6"
# csv import
ron = { version = "0.7", default-features = false, optional = true }
ron = { workspace = true, optional = true }
# csv export
csv = { version = "1.1.3", optional = true }
# graphviz exporters
petgraph = { version = "0.6", optional = true }
# K-d trees used for RRT pathfinding
kiddo = { version = "0.2", optional = true }
clap = { version = "4.2", optional = true }
clap = { workspace = true, optional = true }
# Data structures
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
hashbrown = { workspace = true }
slab = { workspace = true }
slotmap = { version = "1.0", features = ["serde"] }
indexmap = { version = "1.3.0", features = ["rayon"] }
slab = "0.4.2"
# ECS
specs = { version = "0.18", features = ["serde", "storage-event-control", "nightly"] }
specs = { workspace = true, features = ["serde", "storage-event-control"] }
[dev-dependencies]
#bench
criterion = "0.3"
rand_chacha = "0.3"
rand_chacha = { workspace = true }
#test
tracing-subscriber = { version = "0.3.7", default-features = false, features = ["fmt", "time", "ansi", "smallvec", "env-filter"] }

10
common/assets/Cargo.toml
View File

@ -6,16 +6,16 @@ description = "Crate for game loading assets for veloren."
version = "0.10.0"
[dependencies]
lazy_static = "1.4.0"
lazy_static = { workspace = true }
assets_manager = {version = "0.10", features = ["bincode", "ron", "json"]}
ron = { version = "0.8", default-features = false }
ron = { workspace = true }
dot_vox = "5.1"
wavefront = "0.2" # TODO: Use vertex-colors branch when we have models that have them
image = { version = "0.24", default-features = false, features = ["png"] }
tracing = "0.1"
image = { workspace = true }
tracing = { workspace = true }
# asset tweak
serde = {version = "1.0", features = ["derive"], optional = true}
serde = { workspace = true, optional = true }
[dev-dependencies]
walkdir = "2.3.2"

2
common/base/Cargo.toml
View File

@ -9,7 +9,7 @@ version = "0.10.0"
tracy = ["profiling", "profiling/profile-with-tracy"]
[dependencies]
tracing = { version = "0.1", default-features = false }
tracing = { workspace = true }
directories-next = "2.0"
# Profiling / Tracy

2
common/dynlib/Cargo.toml
View File

@ -8,4 +8,4 @@ edition = "2021"
find_folder = {version = "0.3.0"}
libloading = {version = "0.8"}
notify = {version = "5.0.0"}
tracing = "0.1"
tracing = { workspace = true }

4
common/ecs/Cargo.toml
View File

@ -8,11 +8,11 @@ version = "0.10.0"
[dependencies]
tracing = { version = "0.1", default-features = false }
tracing = { workspace = true }
common-base = { package = "veloren-common-base", path = "../base" }
# ECS
specs = { version = "0.18", features = ["serde", "storage-event-control"] }
specs = { workspace = true, features = ["serde", "storage-event-control"] }
[dev-dependencies]
#bench

2
common/frontend/Cargo.toml
View File

@ -13,7 +13,7 @@ common-base = { package = "veloren-common-base", path = "../base" }
# Logging
termcolor = "1.1"
tracing = { version = "0.1", default-features = false }
tracing = { workspace = true }
tracing-appender = "0.2.0"
tracing-log = "0.1.1"
tracing-subscriber = { version = "0.3.7", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec", "tracing-log"]}

18
common/net/Cargo.toml
View File

@ -11,21 +11,21 @@ default = ["simd"]
[dependencies]
common = {package = "veloren-common", path = "../../common"}
#inline_tweak = "1.0.2"
#inline_tweak = { workspace = true }
bincode = "1.3.3"
bincode = { workspace = true }
flate2 = "1.0.20"
image = { version = "0.24", default-features = false, features = ["png", "jpeg"] }
num-traits = "0.2"
image = { workspace = true, features = ["jpeg"] }
num-traits = { workspace = true }
sum_type = "0.2.0"
vek = { version = "0.15.8", features = ["serde"] }
tracing = { version = "0.1", default-features = false }
vek = { workspace = true }
tracing = { workspace = true }
# Data structures
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
hashbrown = { workspace = true }
# ECS
specs = { version = "0.18", features = ["serde", "storage-event-control"] }
specs = { workspace = true, features = ["serde", "storage-event-control"] }
# Serde
serde = { version = "1.0.110", features = ["derive"] }
serde = { workspace = true }

2
common/src/bin/csv_import/main.rs
View File

@ -233,7 +233,6 @@ fn armor_stats() -> Result<(), Box<dyn Error>> {
let pretty_config = PrettyConfig::new()
.depth_limit(4)
.separate_tuple_members(true)
.decimal_floats(true)
.enumerate_arrays(true);
let mut path = ASSETS_PATH.clone();
@ -432,7 +431,6 @@ fn weapon_stats() -> Result<(), Box<dyn Error>> {
let pretty_config = PrettyConfig::new()
.depth_limit(4)
.separate_tuple_members(true)
.decimal_floats(true)
.enumerate_arrays(true);
let mut path = ASSETS_PATH.clone();

2
common/src/comp/ability.rs
View File

@ -2894,7 +2894,7 @@ pub enum SwordStance {
}
bitflags::bitflags! {
#[derive(Default, Serialize, Deserialize)]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize)]
// If more are ever needed, first check if any not used anymore, as some were only used in intermediary stages so may be free
pub struct Capability: u8 {
// There used to be a capability here, to keep ordering the same below this is now a placeholder

4
common/src/comp/agent.rs
View File

@ -119,14 +119,14 @@ impl Component for Alignment {
}
bitflags::bitflags! {
#[derive(Default)]
#[derive(Clone, Copy, Debug, Default)]
pub struct BehaviorCapability: u8 {
const SPEAK = 0b00000001;
const TRADE = 0b00000010;
}
}
bitflags::bitflags! {
#[derive(Default)]
#[derive(Clone, Copy, Debug, Default)]
pub struct BehaviorState: u8 {
const TRADING = 0b00000001;
const TRADING_ISSUER = 0b00000010;

2
common/src/lod.rs
View File

@ -7,7 +7,7 @@ use vek::*;
pub const ZONE_SIZE: u32 = 32;
bitflags::bitflags! {
#[derive(Serialize, Deserialize)]
#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
pub struct Flags: u8 {
const SNOW_COVERED = 0b00000001;
const IS_BUILDING = 0b00000010;

14
common/state/Cargo.toml
View File

@ -16,24 +16,24 @@ common-net = { package = "veloren-common-net", path = "../net" }
common-ecs = { package = "veloren-common-ecs", path = "../ecs" }
common-base = { package = "veloren-common-base", path = "../base" }
rayon = "1.5"
rayon = { workspace = true }
num_cpus = "1.0"
tracing = { version = "0.1", default-features = false }
vek = { version = "0.15.8", features = ["serde"] }
tracing = { workspace = true }
vek = { workspace = true }
# Data structures
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
hashbrown = { workspace = true }
# ECS
specs = { version = "0.18", features = ["serde", "storage-event-control", "derive"] }
specs = { workspace = true, features = ["serde", "storage-event-control", "derive"] }
# Plugins
scopeguard = "1.1.0"
serde = { version = "1.0.110", features = ["derive"], optional = true }
serde = { workspace = true, optional = true }
toml = { version = "0.7", optional = true }
tar = { version = "0.4.37", optional = true }
wasmer = { version = "2.0.0", optional = true, default-features = false, features = ["wat", "default-cranelift", "default-universal"] }
bincode = { version = "1.3.1", optional = true }
bincode = { workspace = true, optional = true }
plugin-api = { package = "veloren-plugin-api", path = "../../plugin/api", optional = true }
timer-queue = "0.1.0"

20
common/systems/Cargo.toml
View File

@ -15,23 +15,23 @@ common-net = { package = "veloren-common-net", path = "../net" }
common-ecs = { package = "veloren-common-ecs", path = "../ecs" }
common-base = { package = "veloren-common-base", path = "../base" }
rand = "0.8"
rayon = "1.5"
tracing = { version = "0.1", default-features = false }
vek = { version = "0.15.8", features = ["serde"] }
ordered-float = { version = "3", default-features = false }
itertools = "0.10"
rand = { workspace = true }
rayon = { workspace = true }
tracing = { workspace = true }
vek = { workspace = true }
ordered-float = { workspace = true }
itertools = { workspace = true }
# Data structures
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
hashbrown = { workspace = true }
indexmap = "1.3.0"
slab = "0.4.2"
slab = { workspace = true }
# ECS
specs = { version = "0.18", features = ["serde", "storage-event-control", "derive"] }
specs = { workspace = true, features = ["serde", "storage-event-control", "derive"] }
# Tweak running code
# inline_tweak = { version = "1.0.8", features = ["release_tweak"] }
# inline_tweak = { workspace = true, features = ["release_tweak"] }
[dev-dependencies]
# Setup a State

32
network/Cargo.toml
View File

@ -18,44 +18,44 @@ default = ["metrics","compression","quic"]
network-protocol = { package = "veloren-network-protocol", path = "protocol" }
#serialisation
bincode = "1.3.2"
serde = { version = "1.0" }
bincode = { workspace = true }
serde = { workspace = true }
#ipv4/ipv6 behavior
socket2 = "0.5.2"
#sending
crossbeam-channel = "0.5"
tokio = { version = "1.20", default-features = false, features = ["io-util", "macros", "rt", "net", "time"] }
crossbeam-channel = { workspace = true }
tokio = { workspace = true, features = ["io-util", "macros", "net", "time"] }
tokio-stream = { version = "0.1.2", default-features = false }
#tracing and metrics
tracing = { version = "0.1", default-features = false, features = ["attributes"]}
prometheus = { version = "0.13", default-features = false, optional = true }
tracing = { workspace = true }
prometheus = { workspace = true, optional = true }
#async
futures-core = { version = "0.3", default-features = false }
futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
async-channel = "1.5.1" #use for .close() channels
futures-util = { workspace = true, features = ["std"] }
async-channel = "1.6" #use for .close() channels
#mpsc channel registry
lazy_static = { version = "1.4", default-features = false }
rand = { version = "0.8" }
lazy_static = { workspace = true }
rand = { workspace = true }
#quic support
quinn = { version = "0.8", optional = true }
rustls = "0.20.1"
#stream flags
bitflags = "2.2.1"
bitflags = { workspace = true }
lz-fear = { version = "0.1.1", optional = true }
# async traits
async-trait = "0.1.42"
bytes = "^1"
# faster HashMaps
hashbrown = { version = "0.13" }
hashbrown = { workspace = true }
[dev-dependencies]
tracing-subscriber = { version = "0.3.7", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec"] }
tokio = { version = "1.20", default-features = false, features = ["io-std", "fs", "rt-multi-thread"] }
futures-util = { version = "0.3.7", default-features = false, features = ["sink", "std"] }
clap = { version = "4.2", default-features = false, features = ["std", "color", "suggestions"] }
tokio = { workspace = true, default-features = false, features = ["io-std", "fs", "rt-multi-thread"] }
futures-util = { workspace = true, default-features = false, features = ["sink", "std"] }
clap = { workspace = true }
shellexpand = "3.1.0"
serde = { version = "1.0", features = ["derive"] }
prometheus-hyper = "0.1.2"
prometheus-hyper = { workspace = true }
criterion = { version = "0.3.4", features = ["default", "async_tokio"] }
#quic
rcgen = { version = "0.10"}

14
network/protocol/Cargo.toml
View File

@ -16,19 +16,19 @@ default = ["metrics"]
[dependencies]
#tracing and metrics
tracing = { version = "0.1", default-features = false }
prometheus = { version = "0.13", default-features = false, optional = true }
tracing = { workspace = true }
prometheus = { workspace = true, optional = true }
#stream flags
bitflags = "2.2.1"
rand = { version = "0.8" }
bitflags = { workspace = true }
rand = { workspace = true }
# async traits
async-trait = "0.1.42"
bytes = "^1"
hashbrown = { version = "0.13" }
hashbrown = { workspace = true }
[dev-dependencies]
async-channel = "1.5.1"
tokio = { version = "1.20", default-features = false, features = ["rt", "macros"] }
async-channel = "1.6"
tokio = { workspace = true, features = ["macros"] }
criterion = { version = "0.3.4", features = ["default", "async_tokio"] }
[[bench]]

4
plugin/api/Cargo.toml
View File

@ -5,6 +5,6 @@ authors = ["ccgauche <gaucheron.laurent@gmail.com>"]
edition = "2021"
[dependencies]
serde = { version = "1.0.118", features = ["derive"] }
serde = { workspace = true }
common = { package = "veloren-common", path = "../../common", features = ["no-assets"] }
bincode = "1.3.1"
bincode = { workspace = true }

4
plugin/rt/Cargo.toml
View File

@ -7,8 +7,8 @@ edition = "2021"
[dependencies]
plugin-api = { package = "veloren-plugin-api", path = "../api" }
plugin-derive = { package = "veloren-plugin-derive", path = "../derive"}
serde = {version = "1.0.118", features = ["derive"]}
bincode = "1.3.1"
serde = { workspace = true }
bincode = { workspace = true }
[[example]]
name = "hello"

22
rtsim/Cargo.toml
View File

@ -6,18 +6,18 @@ edition = "2021"
[dependencies]
common = { package = "veloren-common", path = "../common" }
world = { package = "veloren-world", path = "../world" }
ron = "0.8"
serde = { version = "1.0.110", features = ["derive"] }
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
enum-map = { version = "2.4", features = ["serde"] }
vek = { version = "0.15.8", features = ["serde"] }
ron = { workspace = true }
serde = { workspace = true }
hashbrown = { workspace = true }
enum-map = { workspace = true, features = ["serde"] }
vek = { workspace = true }
rmp-serde = "1.1.0"
anymap2 = "0.13"
tracing = "0.1"
tracing = { workspace = true }
atomic_refcell = "0.1"
slotmap = { version = "1.0.6", features = ["serde"] }
rand = { version = "0.8", features = ["small_rng"] }
rand_chacha = "0.3"
fxhash = "0.2.1"
itertools = "0.10.3"
rayon = "1.5"
rand = { workspace = true, features = ["small_rng"] }
rand_chacha = { workspace = true }
fxhash = { workspace = true }
itertools = { workspace = true }
rayon = { workspace = true }

14
server-cli/Cargo.toml
View File

@ -35,18 +35,18 @@ common-net = { package = "veloren-common-net", path = "../common/net" }
common-frontend = { package = "veloren-common-frontend", path = "../common/frontend" }
world = { package = "veloren-world", path = "../world", optional = true }
tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
num_cpus = "1.0"
cansi = "2.2.1"
clap = { version = "4.2", features = ["derive"] }
clap = { workspace = true }
crossterm = "0.26"
lazy_static = "1"
lazy_static = { workspace = true }
signal-hook = "0.3.6"
shell-words = "1.0.0"
tracing = { version = "0.1", default-features = false }
ron = {version = "0.8", default-features = false}
serde = {version = "1.0", features = [ "rc", "derive" ]}
strum = { version = "0.24" }
tracing = { workspace = true }
ron = { workspace = true }
serde = { workspace = true, features = [ "rc", "derive" ]}
strum = { workspace = true }
[target.'cfg(windows)'.dependencies]
mimalloc = "0.1.29"

42
server/Cargo.toml
View File

@ -30,41 +30,41 @@ server-agent = {package = "veloren-server-agent", path = "agent"}
#inline_tweak = "1.0.8"
specs = { version = "0.18", features = ["shred-derive"] }
specs = { workspace = true, features = ["shred-derive"] }
strum = { version = "0.24", features = ["derive"] }
bincode = "1.3.2"
strum = { workspace = true }
bincode = { workspace = true }
num_cpus = "1.0"
tracing = "0.1"
vek = { version = "0.15.8", features = ["serde"] }
futures-util = "0.3.7"
tokio = { version = "1.20", default-features = false, features = ["rt"] }
prometheus-hyper = "0.1.4"
tracing = { workspace = true }
vek = { workspace = true }
futures-util = { workspace = true }
tokio = { workspace = true }
prometheus-hyper = { workspace = true }
quinn = "0.8"
rustls = { version = "0.20", default-features = false }
rustls-pemfile = { version = "1", default-features = false }
atomicwrites = "0.4"
chrono = { version = "0.4.24", default-features=false, features = ["clock", "std", "wasmbind", "serde"] }
chrono-tz = { version = "0.8", features = ["serde"] }
chrono = { workspace = true }
chrono-tz = { workspace = true }
drop_guard = { version = "0.3.0" }
humantime = "2.1.0"
itertools = "0.10"
lazy_static = "1.4.0"
ron = { version = "0.8", default-features = false }
serde = { version = "1.0.110", features = ["derive"] }
serde_json = "1.0.50"
rand = { version = "0.8", features = ["small_rng"] }
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
itertools = { workspace = true }
lazy_static = { workspace = true }
ron = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
rand = { workspace = true, features = ["small_rng"] }
hashbrown = { workspace = true }
parking_lot = { version = "0.12" }
rayon = "1.5"
crossbeam-channel = "0.5"
prometheus = { version = "0.13", default-features = false}
rayon = { workspace = true }
crossbeam-channel = { workspace = true }
prometheus = { workspace = true }
portpicker = { git = "https://github.com/xMAC94x/portpicker-rs", rev = "df6b37872f3586ac3b21d08b56c8ec7cd92fb172" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
slab = "0.4"
rand_distr = "0.4.0"
enumset = "1.0.8"
enum-map = "2.4"
enum-map = { workspace = true }
noise = { version = "0.7", default-features = false }
censor = "0.3"

12
server/agent/Cargo.toml
View File

@ -16,9 +16,9 @@ common-ecs = { package = "veloren-common-ecs", path = "../../common/ecs" }
common-dynlib = { package = "veloren-common-dynlib", path = "../../common/dynlib", optional = true}
rtsim = { package = "veloren-rtsim", path = "../../rtsim" }
specs = { version = "0.18", features = ["shred-derive"] }
vek = { version = "0.15.8", features = ["serde"] }
rand = { version = "0.8", features = ["small_rng"] }
tracing = "0.1"
itertools = "0.10"
lazy_static = "1.4.0"
specs = { workspace = true, features = ["shred-derive"] }
vek = { workspace = true }
rand = { workspace = true, features = ["small_rng"] }
tracing = { workspace = true }
itertools = { workspace = true }
lazy_static = { workspace = true }

48
voxygen/Cargo.toml
View File

@ -83,10 +83,10 @@ egui_wgpu_backend = {git = "https://github.com/hasenbanck/egui_wgpu_backend.git"
egui_winit_platform = {version = "0.8", optional = true }
# ECS
specs = { version = "0.18", features = ["serde", "storage-event-control", "derive"] }
specs = { workspace = true, features = ["serde", "storage-event-control"] }
# Mathematics
vek = {version = "0.15.8", features = ["serde"]}
vek = { workspace = true }
levenshtein = "1.0.5"
# Controller
@ -96,44 +96,44 @@ gilrs = {version = "0.10.0", features = ["serde-serialize"]}
server = { package = "veloren-server", path = "../server", optional = true, default-features = false, features = ["worldgen"] }
# CLI
clap = { version = "4.2", features = ["derive"] }
clap = { workspace = true }
# Utility
assets_manager = {version = "0.10", features = ["ab_glyph"]}
backtrace = "0.3.40"
bincode = "1.3.1"
chrono = { version = "0.4.24", default-features=false, features = ["clock", "std", "wasmbind", "serde"] }
bincode = { workspace = true }
chrono = { workspace = true }
chumsky = "0.9"
cpal = "0.14"
copy_dir = "0.1.2"
crossbeam-utils = "0.8.1"
crossbeam-channel = "0.5"
crossbeam-utils = { workspace = true }
crossbeam-channel = { workspace = true }
# TODO: remove
directories-next = "2.0"
dot_vox = "5.1"
enum-iterator = "1.1.0"
guillotiere = "0.6.2"
etagere = "0.2.7"
hashbrown = {version = "0.13", features = ["rayon", "serde", "nightly"]}
image = {version = "0.24", default-features = false, features = ["ico", "png"]}
lazy_static = "1.4.0"
hashbrown = { workspace = true }
image = { workspace = true, features = ["ico"]}
lazy_static = { workspace = true }
native-dialog = { version = "0.6.3", optional = true }
num = "0.4"
ordered-float = { version = "3", default-features = false }
rand = "0.8"
rand_chacha = "0.3"
rayon = "1.5"
num = { workspace = true }
ordered-float = { workspace = true }
rand = { workspace = true }
rand_chacha = { workspace = true }
rayon = { workspace = true }
rodio = {version = "0.15", default-features = false, features = ["vorbis"]}
ron = {version = "0.8", default-features = false}
serde = {version = "1.0", features = [ "rc", "derive" ]}
slab = "0.4.2"
strum = { version = "0.24", features = ["derive"] }
tracing = "0.1"
ron = { workspace = true }
serde = { workspace = true, features = [ "rc" ]}
slab = { workspace = true }
strum = { workspace = true }
tracing = { workspace = true }
treeculler = "0.2"
tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
num_cpus = "1.0"
inline_tweak = "1.0.2"
itertools = "0.10.0"
inline_tweak = { workspace = true }
itertools = { workspace = true }
# Discord RPC
discord-sdk = { version = "0.3.0", optional = true }
@ -154,7 +154,7 @@ mumble-link = "0.1.0"
[dev-dependencies]
criterion = "0.3"
world = {package = "veloren-world", path = "../world"}
rayon = "1.5.0"
rayon = { workspace = true }
[[bench]]
harness = false

6
voxygen/anim/Cargo.toml
View File

@ -13,10 +13,10 @@ default = ["simd"]
[dependencies]
common = {package = "veloren-common", path = "../../common"}
# inline_tweak = "1.0.2"
# inline_tweak = { workspace = true }
bytemuck = { version = "1.4", features=["derive"] }
vek = {version = "0.15.8", features = ["serde"]}
vek = { workspace = true }
common-dynlib = {package = "veloren-common-dynlib", path = "../../common/dynlib", optional = true}
# Hot Reloading
lazy_static = {version = "1.4.0", optional = true}
lazy_static = { workspace = true, optional = true}

2
voxygen/egui/Cargo.toml
View File

@ -13,7 +13,7 @@ client = {package = "veloren-client", path = "../../client"}
common = {package = "veloren-common", path = "../../common"}
egui = "0.12"
egui_winit_platform = "0.8"
lazy_static = "1.4.0"
lazy_static = { workspace = true }
common-dynlib = {package = "veloren-common-dynlib", path = "../../common/dynlib", optional = true}

2
voxygen/i18n-helpers/Cargo.toml
View File

@ -10,4 +10,4 @@ common-net = {package = "veloren-common-net", path = "../../common/net"}
common = {package = "veloren-common", path = "../../common"}
i18n = {package = "veloren-client-i18n", path = "../../client/i18n"}
# Utility
tracing = "0.1"
tracing = { workspace = true }

41
world/Cargo.toml
View File

@ -18,39 +18,39 @@ common_base = { package = "veloren-common-base", path = "../common/base"}
common-net = { package = "veloren-common-net", path = "../common/net" }
common-dynlib = {package = "veloren-common-dynlib", path = "../common/dynlib", optional = true}
bincode = "1.3.1"
bincode = { workspace = true }
bitvec = "1.0.1"
enum-iterator = "1.1.3"
enum-map = "2.4"
fxhash = "0.2.1"
image = { version = "0.24", default-features = false, features = ["png"] }
itertools = "0.10"
vek = { version = "0.15.8", features = ["serde"] }
enum-map = { workspace = true }
fxhash = { workspace = true }
image = { workspace = true }
itertools = { workspace = true }
vek = { workspace = true }
noise = { version = "0.7", default-features = false }
num = "0.4"
ordered-float = "3"
hashbrown = { version = "0.13", features = ["rayon", "serde", "nightly"] }
lazy_static = "1.4.0"
tracing = { version = "0.1", default-features = false }
rand = "0.8"
rand_chacha = "0.3"
num = { workspace = true }
ordered-float = { workspace = true }
hashbrown = { workspace = true }
lazy_static = { workspace = true }
tracing = { workspace = true }
rand = { workspace = true }
rand_chacha = { workspace = true }
arr_macro = "0.2.1"
packed_simd = { package = "packed_simd_2", version = "0.3.8", optional = true }
rayon = "1.5"
serde = { version = "1.0.110", features = ["derive"] }
ron = { version = "0.8", default-features = false }
inline_tweak = "1.0.2"
rayon = { workspace = true }
serde = { workspace = true }
ron = { workspace = true }
inline_tweak = { workspace = true }
kiddo = "0.2"
strum = "0.24.0"
strum = { workspace = true }
# compression benchmarks
lz-fear = { version = "0.1.1", optional = true }
deflate = { version = "1.0.0", optional = true }
flate2 = { version = "1.0.20", optional = true }
num-traits = { version = "0.2", optional = true }
num-traits = { workspace = true, optional = true }
fallible-iterator = { version = "0.2.0", optional = true }
rstar = { version = "0.10", optional = true }
clap = { version = "4.2", optional = true }
clap = { workspace = true, optional = true }
[dev-dependencies]
@ -61,7 +61,6 @@ tracing-subscriber = { version = "0.3.7", default-features = false, features = [
minifb = "0.24"
rusqlite = { version = "0.28.0", features = ["array", "vtab", "bundled", "trace"] }
svg_fmt = "0.4"
strum = "0.24"
[[bench]]
harness = false