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-specs' into 'master'

Browse Source 
update specs to get rid of old deps

See merge request veloren/veloren!1871
This commit is contained in:
Marcel 2021-03-10 13:14:23 +00:00
commit cf46ce70cf
8 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Cargo.lock generated
View File

@ -37,12 +37,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]]
name = "ahash"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
[[package]]
name = "ahash"
version = "0.4.7"
@ -2238,16 +2232,6 @@ dependencies = [
"byteorder",
]
[[package]]
name = "hashbrown"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf"
dependencies = [
"ahash 0.3.8",
"autocfg",
]
[[package]]
name = "hashbrown"
version = "0.9.1"
@ -2519,7 +2503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
dependencies = [
"autocfg",
"hashbrown 0.9.1",
"hashbrown",
"serde",
]
@ -4652,12 +4636,12 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
[[package]]
name = "shred"
version = "0.10.2"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5f08237e667ac94ad20f8878b5943d91a93ccb231428446c57c21c57779016d"
checksum = "36fd542620fabd4f2e9f54ac1972956cfa62da6c5408ad3e40a8dae8afc65231"
dependencies = [
"arrayvec",
"hashbrown 0.7.2",
"hashbrown",
"mopa",
"rayon",
"shred-derive",
@ -4777,10 +4761,10 @@ dependencies = [
[[package]]
name = "specs"
version = "0.16.1"
source = "git+https://github.com/amethyst/specs.git?rev=d4435bdf496cf322c74886ca09dd8795984919b4#d4435bdf496cf322c74886ca09dd8795984919b4"
source = "git+https://github.com/amethyst/specs.git?rev=5a9b71035007be0e3574f35184acac1cd4530496#5a9b71035007be0e3574f35184acac1cd4530496"
dependencies = [
"crossbeam-queue",
"hashbrown 0.9.1",
"hashbrown",
"hibitset",
"log",
"rayon",
@ -4794,7 +4778,7 @@ dependencies = [
[[package]]
name = "specs-derive"
version = "0.4.1"
source = "git+https://github.com/amethyst/specs.git?rev=d4435bdf496cf322c74886ca09dd8795984919b4#d4435bdf496cf322c74886ca09dd8795984919b4"
source = "git+https://github.com/amethyst/specs.git?rev=5a9b71035007be0e3574f35184acac1cd4530496#5a9b71035007be0e3574f35184acac1cd4530496"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.9",
@ -4804,7 +4788,7 @@ dependencies = [
[[package]]
name = "specs-idvs"
version = "0.1.1"
source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=9fab7b396acd6454585486e50ae4bfe2069858a9#9fab7b396acd6454585486e50ae4bfe2069858a9"
source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=b65fb220e94f5d3c9bc30074a076149763795556#b65fb220e94f5d3c9bc30074a076149763795556"
dependencies = [
"specs",
]
@ -5599,7 +5583,7 @@ dependencies = [
"authc",
"byteorder",
"futures-util",
"hashbrown 0.9.1",
"hashbrown",
"image",
"num 0.4.0",
"rayon",
@ -5628,7 +5612,7 @@ dependencies = [
"csv",
"dot_vox",
"enum-iterator",
"hashbrown 0.9.1",
"hashbrown",
"image",
"indexmap",
"lazy_static",
@ -5678,7 +5662,7 @@ name = "veloren-common-net"
version = "0.8.0"
dependencies = [
"authc",
"hashbrown 0.9.1",
"hashbrown",
"serde",
"specs",
"sum_type",
@ -5692,7 +5676,7 @@ name = "veloren-common-sys"
version = "0.8.0"
dependencies = [
"bincode",
"hashbrown 0.9.1",
"hashbrown",
"indexmap",
"rand 0.8.3",
"rayon",
@ -5794,7 +5778,7 @@ dependencies = [
"diesel_migrations",
"dotenv",
"futures-util",
"hashbrown 0.9.1",
"hashbrown",
"itertools 0.10.0",
"lazy_static",
"libsqlite3-sys",
@ -5876,7 +5860,7 @@ dependencies = [
"glutin",
"glyph_brush",
"guillotiere",
"hashbrown 0.9.1",
"hashbrown",
"iced_native",
"iced_winit",
"image",
@ -5941,7 +5925,7 @@ dependencies = [
"criterion",
"enum-iterator",
"fxhash",
"hashbrown 0.9.1",
"hashbrown",
"image",
"itertools 0.10.0",
"lazy_static",

2
client/Cargo.toml
View File

@ -24,7 +24,7 @@ image = { version = "0.23.12", default-features = false, features = ["png"] }
num = "0.4"
tracing = { version = "0.1", default-features = false }
rayon = "1.5"
specs = { git = "https://github.com/amethyst/specs.git", rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
specs = { git = "https://github.com/amethyst/specs.git", rev = "5a9b71035007be0e3574f35184acac1cd4530496" }
vek = { version = "=0.14.1", features = ["serde"] }
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "bffb5181a35c19ddfd33ee0b4aedba741aafb68d" }

4
common/Cargo.toml
View File

@ -59,8 +59,8 @@ indexmap = "1.3.0"
slab = "0.4.2"
# ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "nightly"], rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "9fab7b396acd6454585486e50ae4bfe2069858a9" }
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "nightly"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" }
[dev-dependencies]
#bench

2
common/ecs/Cargo.toml
View File

@ -12,7 +12,7 @@ tracing = { version = "0.1", default-features = false }
common-base = { package = "veloren-common-base", path = "../base" }
# ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" }
[dev-dependencies]
#bench

2
common/net/Cargo.toml
View File

@ -24,7 +24,7 @@ hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "bffb5181a35c19ddfd33ee0b4aedba741aafb68d" }
# ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" }
# Serde
serde = { version = "1.0.110", features = ["derive"] }

2
common/sys/Cargo.toml
View File

@ -28,7 +28,7 @@ indexmap = "1.3.0"
slab = "0.4.2"
# ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "derive"], rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control", "derive"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" }
# Serde
serde = { version = "1.0.110", features = ["derive"] }

4
server/Cargo.toml
View File

@ -20,8 +20,8 @@ common-net = { package = "veloren-common-net", path = "../common/net" }
world = { package = "veloren-world", path = "../world" }
network = { package = "veloren-network", path = "../network", features = ["metrics", "compression"], default-features = false }
specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-derive"], rev = "d4435bdf496cf322c74886ca09dd8795984919b4" }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "9fab7b396acd6454585486e50ae4bfe2069858a9" }
specs = { git = "https://github.com/amethyst/specs.git", features = ["shred-derive"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" }
num_cpus = "1.0"
tracing = "0.1"

4
voxygen/Cargo.toml
View File

@ -46,8 +46,8 @@ window_clipboard = "0.1.1"
glyph_brush = "0.7.0"
# ECS
specs = {git = "https://github.com/amethyst/specs.git", rev = "d4435bdf496cf322c74886ca09dd8795984919b4"}
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "9fab7b396acd6454585486e50ae4bfe2069858a9" }
specs = {git = "https://github.com/amethyst/specs.git", rev = "5a9b71035007be0e3574f35184acac1cd4530496"}
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" }
# Mathematics
vek = {version = "=0.14.1", features = ["serde"]}