xtex/azalea
1
0
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2024-09-19 14:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix conflicts that happen sometimes with serde

Browse source
This commit is contained in:
mat 2023-05-01 18:36:40 -05:00
parent 67dc5b367f
commit 1fb4418f2c
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
azalea-auth/Cargo.toml
View file

@ -18,7 +18,7 @@ reqwest = { version = "0.11.12", default-features = false, features = [
"json",
"rustls-tls",
] }
serde = { version = "1.0.152", features = ["derive"] }
serde = { version = "^1.0", features = ["derive"] }
serde_json = "1.0.93"
thiserror = "1.0.37"
tokio = { version = "1.24.2", features = ["fs"] }

2
azalea-chat/Cargo.toml
View file

@ -18,5 +18,5 @@ azalea-buf = { path = "../azalea-buf", features = [
azalea-language = { path = "../azalea-language", version = "^0.6.0" }
log = "0.4.17"
once_cell = "1.16.0"
serde = { version = "^1.0.152", features = ["derive"] }
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0.93"

2
azalea-core/Cargo.toml
View file

@ -12,7 +12,7 @@ version = "0.6.0"
azalea-buf = { path = "../azalea-buf", version = "^0.6.0" }
azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0" }
bevy_ecs = { version = "0.10.0", default-features = false, optional = true }
serde = {version = "^1.0.152", optional = true}
serde = { version = "^1.0", optional = true }
uuid = "^1.1.2"
[features]

2
azalea-language/Cargo.toml
View file

@ -10,6 +10,6 @@ version = "0.6.0"
[dependencies]
once_cell = "1.16.0"
serde = "^1.0.152"
serde = "^1.0"
serde_json = "^1.0.93"
# tokio = {version = "^1.21.2", features = ["fs"]}

2
azalea-nbt/Cargo.toml
View file

@ -16,7 +16,7 @@ enum-as-inner = "0.5.1"
flate2 = "^1.0.25"
log = "0.4.17"
packed_simd_2 = "0.3.8"
serde = { version = "1.0.152", features = ["derive"], optional = true }
serde = { version = "^1.0", features = ["derive"], optional = true }
[dev-dependencies]
criterion = { version = "^0.4.0", features = ["html_reports"] }

2
azalea-protocol/Cargo.toml
View file

@ -38,7 +38,7 @@ flate2 = "1.0.25"
futures = "0.3.24"
futures-util = "0.3.24"
log = "0.4.17"
serde = { version = "1.0.152", features = ["serde_derive"] }
serde = { version = "^1.0", features = ["serde_derive"] }
serde_json = "^1.0.93"
thiserror = "1.0.37"
tokio = { version = "^1.24.2", features = ["io-util", "net", "macros"] }

2
azalea-registry/Cargo.toml
View file

@ -11,7 +11,7 @@ version = "0.6.0"
[dependencies]
azalea-buf = { path = "../azalea-buf", version = "^0.6.0" }
azalea-registry-macros = { path = "./azalea-registry-macros", version = "^0.6.0" }
serde = { version = "1.0.155", optional = true }
serde = { version = "^1.0", optional = true }
[features]
serde = ["dep:serde", "azalea-registry-macros/serde"]