aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormat <git@matdoes.dev>2023-05-01 18:36:40 -0500
committermat <git@matdoes.dev>2023-05-01 18:36:40 -0500
commit1fb4418f2c9cbd004c64c2f23d2d0352ee12c0e5 (patch)
tree63ce6ed0e9115f06f98184f575a44243d5d6b506
parent67dc5b367f67909d9679f9898c9c352e09a409fd (diff)
downloadazalea-drasl-1fb4418f2c9cbd004c64c2f23d2d0352ee12c0e5.tar.xz
fix conflicts that happen sometimes with serde
-rw-r--r--azalea-auth/Cargo.toml2
-rw-r--r--azalea-chat/Cargo.toml2
-rw-r--r--azalea-core/Cargo.toml2
-rw-r--r--azalea-language/Cargo.toml2
-rw-r--r--azalea-nbt/Cargo.toml2
-rw-r--r--azalea-protocol/Cargo.toml2
-rw-r--r--azalea-registry/Cargo.toml2
7 files changed, 7 insertions, 7 deletions
diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml
index 0f2c7125..c635d01b 100644
--- a/azalea-auth/Cargo.toml
+++ b/azalea-auth/Cargo.toml
@@ -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"] }
diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml
index 33a3aafe..c3ffb464 100644
--- a/azalea-chat/Cargo.toml
+++ b/azalea-chat/Cargo.toml
@@ -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"
diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml
index 0193a3b0..6f49774c 100644
--- a/azalea-core/Cargo.toml
+++ b/azalea-core/Cargo.toml
@@ -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]
diff --git a/azalea-language/Cargo.toml b/azalea-language/Cargo.toml
index 5d872451..2e518b70 100644
--- a/azalea-language/Cargo.toml
+++ b/azalea-language/Cargo.toml
@@ -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"]}
diff --git a/azalea-nbt/Cargo.toml b/azalea-nbt/Cargo.toml
index bead5ba3..6958e992 100644
--- a/azalea-nbt/Cargo.toml
+++ b/azalea-nbt/Cargo.toml
@@ -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"] }
diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml
index 4a3f7cb3..f61f076e 100644
--- a/azalea-protocol/Cargo.toml
+++ b/azalea-protocol/Cargo.toml
@@ -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"] }
diff --git a/azalea-registry/Cargo.toml b/azalea-registry/Cargo.toml
index b2f1460b..6fc93849 100644
--- a/azalea-registry/Cargo.toml
+++ b/azalea-registry/Cargo.toml
@@ -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"]