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

Second attempt (success)

Browse Source
This commit is contained in:
Imbris 2023-05-05 23:45:49 -04:00
parent 1a7e38e48b
commit af0d0f3ea4
7 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
Cargo.lock generated
View File

@ -285,7 +285,7 @@ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"log", "log",
"notify", "notify",
"parking_lot 0.12.1", "parking_lot 0.12.0",
"ron 0.8.0", "ron 0.8.0",
"serde", "serde",
"serde_json", "serde_json",
@ -1139,7 +1139,7 @@ dependencies = [
"ndk-context", "ndk-context",
"oboe", "oboe",
"once_cell", "once_cell",
"parking_lot 0.12.1", "parking_lot 0.12.0",
"stdweb 0.4.20", "stdweb 0.4.20",
"thiserror", "thiserror",
"web-sys", "web-sys",
@ -1396,8 +1396,8 @@ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"crossterm_winapi 0.9.0", "crossterm_winapi 0.9.0",
"libc", "libc",
"mio 0.8.6", "mio 0.8.2",
"parking_lot 0.12.1", "parking_lot 0.12.0",
"signal-hook 0.3.15", "signal-hook 0.3.15",
"signal-hook-mio", "signal-hook-mio",
"winapi 0.3.9", "winapi 0.3.9",
@ -1731,7 +1731,7 @@ dependencies = [
"bitflags 2.2.1", "bitflags 2.2.1",
"crossbeam-channel", "crossbeam-channel",
"num-traits", "num-traits",
"parking_lot 0.12.1", "parking_lot 0.12.0",
"serde", "serde",
"serde_json", "serde_json",
"serde_repr", "serde_repr",
@ -2098,14 +2098,14 @@ dependencies = [
[[package]] [[package]]
name = "filetime" name = "filetime"
version = "0.2.21" version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"libc", "libc",
"redox_syscall 0.2.16", "redox_syscall 0.2.16",
"windows-sys 0.48.0", "winapi 0.3.9",
] ]
[[package]] [[package]]
@ -2338,15 +2338,15 @@ dependencies = [
[[package]] [[package]]
name = "generator" name = "generator"
version = "0.7.4" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
"log", "log",
"rustversion", "rustversion",
"windows 0.48.0", "winapi 0.3.9",
] ]
[[package]] [[package]]
@ -3706,14 +3706,16 @@ dependencies = [
[[package]] [[package]]
name = "mio" name = "mio"
version = "0.8.6" version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
"miow",
"ntapi",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.45.0", "winapi 0.3.9",
] ]
[[package]] [[package]]
@ -4037,7 +4039,7 @@ dependencies = [
"inotify", "inotify",
"kqueue", "kqueue",
"libc", "libc",
"mio 0.8.6", "mio 0.8.2",
"walkdir 2.3.3", "walkdir 2.3.3",
"windows-sys 0.42.0", "windows-sys 0.42.0",
] ]
@ -4439,9 +4441,9 @@ dependencies = [
[[package]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.12.1" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
dependencies = [ dependencies = [
"lock_api 0.4.9", "lock_api 0.4.9",
"parking_lot_core 0.9.2", "parking_lot_core 0.9.2",
@ -4794,7 +4796,7 @@ dependencies = [
"fnv", "fnv",
"lazy_static", "lazy_static",
"memchr", "memchr",
"parking_lot 0.12.1", "parking_lot 0.12.0",
"thiserror", "thiserror",
] ]
@ -5609,11 +5611,12 @@ dependencies = [
[[package]] [[package]]
name = "schannel" name = "schannel"
version = "0.1.21" version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
dependencies = [ dependencies = [
"windows-sys 0.42.0", "lazy_static",
"winapi 0.3.9",
] ]
[[package]] [[package]]
@ -5938,7 +5941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
dependencies = [ dependencies = [
"libc", "libc",
"mio 0.8.6", "mio 0.8.2",
"signal-hook 0.3.15", "signal-hook 0.3.15",
] ]
@ -6498,31 +6501,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.28.0" version = "1.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"bytes", "bytes",
"libc", "libc",
"mio 0.8.6", "memchr",
"mio 0.8.2",
"num_cpus", "num_cpus",
"once_cell",
"pin-project-lite", "pin-project-lite",
"signal-hook-registry", "signal-hook-registry",
"socket2 0.4.9", "socket2 0.4.9",
"tokio-macros", "tokio-macros",
"windows-sys 0.48.0", "winapi 0.3.9",
] ]
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "2.1.0" version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [ dependencies = [
"proc-macro2 1.0.56", "proc-macro2 1.0.56",
"quote 1.0.26", "quote 1.0.26",
"syn 2.0.15", "syn 1.0.109",
] ]
[[package]] [[package]]
@ -6549,9 +6554,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.7.8" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-core", "futures-core",
@ -7278,7 +7283,7 @@ dependencies = [
"lazy_static", "lazy_static",
"noise", "noise",
"num_cpus", "num_cpus",
"parking_lot 0.12.1", "parking_lot 0.12.0",
"portpicker", "portpicker",
"prometheus", "prometheus",
"prometheus-hyper", "prometheus-hyper",

2
client/Cargo.toml
View File

@ -22,7 +22,7 @@ common-net = { package = "veloren-common-net", path = "../common/net" }
network = { package = "veloren-network", path = "../network", features = ["compression","quic"], default-features = false } network = { package = "veloren-network", path = "../network", features = ["compression","quic"], default-features = false }
byteorder = "1.3.2" byteorder = "1.3.2"
tokio = { version = "1.24", default-features = false, features = ["rt-multi-thread"] } tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] }
quinn = "0.8" quinn = "0.8"
image = { version = "0.24", default-features = false, features = ["png"] } image = { version = "0.24", default-features = false, features = ["png"] }
num = "0.4" num = "0.4"

4
network/Cargo.toml
View File

@ -24,7 +24,7 @@ serde = { version = "1.0" }
socket2 = "0.5.2" socket2 = "0.5.2"
#sending #sending
crossbeam-channel = "0.5" crossbeam-channel = "0.5"
tokio = { version = "1.24", default-features = false, features = ["io-util", "macros", "rt", "net", "time"] } tokio = { version = "1.20", default-features = false, features = ["io-util", "macros", "rt", "net", "time"] }
tokio-stream = { version = "0.1.2", default-features = false } tokio-stream = { version = "0.1.2", default-features = false }
#tracing and metrics #tracing and metrics
tracing = { version = "0.1", default-features = false, features = ["attributes"]} tracing = { version = "0.1", default-features = false, features = ["attributes"]}
@ -50,7 +50,7 @@ hashbrown = { version = "0.13" }
[dev-dependencies] [dev-dependencies]
tracing-subscriber = { version = "0.3.7", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec"] } tracing-subscriber = { version = "0.3.7", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec"] }
tokio = { version = "1.24", default-features = false, features = ["io-std", "fs", "rt-multi-thread"] } 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"] } futures-util = { version = "0.3.7", default-features = false, features = ["sink", "std"] }
clap = { version = "4.2", default-features = false, features = ["std", "color", "suggestions"] } clap = { version = "4.2", default-features = false, features = ["std", "color", "suggestions"] }
shellexpand = "3.1.0" shellexpand = "3.1.0"

2
network/protocol/Cargo.toml
View File

@ -28,7 +28,7 @@ hashbrown = { version = "0.13" }
[dev-dependencies] [dev-dependencies]
async-channel = "1.5.1" async-channel = "1.5.1"
tokio = { version = "1.24", default-features = false, features = ["rt", "macros"] } tokio = { version = "1.20", default-features = false, features = ["rt", "macros"] }
criterion = { version = "0.3.4", features = ["default", "async_tokio"] } criterion = { version = "0.3.4", features = ["default", "async_tokio"] }
[[bench]] [[bench]]

2
server-cli/Cargo.toml
View File

@ -35,7 +35,7 @@ common-net = { package = "veloren-common-net", path = "../common/net" }
common-frontend = { package = "veloren-common-frontend", path = "../common/frontend" } common-frontend = { package = "veloren-common-frontend", path = "../common/frontend" }
world = { package = "veloren-world", path = "../world", optional = true } world = { package = "veloren-world", path = "../world", optional = true }
tokio = { version = "1.24", default-features = false, features = ["rt-multi-thread"] } tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] }
num_cpus = "1.0" num_cpus = "1.0"
cansi = "2.2.1" cansi = "2.2.1"
clap = { version = "4.2", features = ["derive"] } clap = { version = "4.2", features = ["derive"] }

2
server/Cargo.toml
View File

@ -38,7 +38,7 @@ num_cpus = "1.0"
tracing = "0.1" tracing = "0.1"
vek = { version = "0.15.8", features = ["serde"] } vek = { version = "0.15.8", features = ["serde"] }
futures-util = "0.3.7" futures-util = "0.3.7"
tokio = { version = "1.24", default-features = false, features = ["rt"] } tokio = { version = "1.20", default-features = false, features = ["rt"] }
prometheus-hyper = "0.1.4" prometheus-hyper = "0.1.4"
quinn = "0.8" quinn = "0.8"
rustls = { version = "0.20", default-features = false } rustls = { version = "0.20", default-features = false }

2
voxygen/Cargo.toml
View File

@ -130,7 +130,7 @@ slab = "0.4.2"
strum = { version = "0.24", features = ["derive"] } strum = { version = "0.24", features = ["derive"] }
tracing = "0.1" tracing = "0.1"
treeculler = "0.2" treeculler = "0.2"
tokio = { version = "1.24", default-features = false, features = ["rt-multi-thread"] } tokio = { version = "1.20", default-features = false, features = ["rt-multi-thread"] }
num_cpus = "1.0" num_cpus = "1.0"
inline_tweak = "1.0.2" inline_tweak = "1.0.2"
itertools = "0.10.0" itertools = "0.10.0"