From 57bdb88272fd9fc2ebc55aad16d3e162afa9bb2f Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 16 Jun 2025 01:20:37 +0100 Subject: [PATCH] use workspace deps everywhere --- Cargo.toml | 42 ++++++++++++++++++------------------- azalea-block/Cargo.toml | 2 +- azalea-brigadier/Cargo.toml | 4 ++-- azalea-buf/Cargo.toml | 2 +- azalea-chat/Cargo.toml | 6 ++---- azalea-entity/Cargo.toml | 4 +--- azalea-inventory/Cargo.toml | 6 ++---- azalea-physics/Cargo.toml | 4 ++-- azalea-protocol/Cargo.toml | 17 +++++---------- azalea-registry/Cargo.toml | 2 +- azalea-world/Cargo.toml | 6 ++---- azalea/Cargo.toml | 26 +++++++++++------------ 12 files changed, 53 insertions(+), 68 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fb4e9ce3..46053b19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ resolver = "2" # --- Workspace Settings --- [workspace.package] -version = "0.13.0+mc1.21.5" +version = "0.12.0+mc1.21.5" edition = "2024" license = "MIT" repository = "https://github.com/azalea-rs/azalea" @@ -83,26 +83,26 @@ compact_str = "0.9.0" crc32fast = "1.4.2" async-compat = "0.2.4" -azalea-block-macros = { path = "azalea-block/azalea-block-macros", version = "0.13.0" } -azalea-block = { path = "azalea-block", version = "0.13.0" } -azalea-auth = { path = "azalea-auth", version = "0.13.0" } -azalea-brigadier = { path = "azalea-brigadier", version = "0.13.0" } -azalea-buf-macros = { path = "azalea-buf/azalea-buf-macros", version = "0.13.0" } -azalea-buf = { path = "azalea-buf", version = "0.13.0" } -azalea-chat = { path = "azalea-chat", version = "0.13.0" } -azalea-client = { path = "azalea-client", version = "0.13.0" } -azalea-core = { path = "azalea-core", version = "0.13.0" } -azalea-crypto = { path = "azalea-crypto", version = "0.13.0" } -azalea-entity = { path = "azalea-entity", version = "0.13.0" } -azalea-inventory-macros = { path = "azalea-inventory/azalea-inventory-macros", version = "0.13.0" } -azalea-inventory = { path = "azalea-inventory", version = "0.13.0" } -azalea-language = { path = "azalea-language", version = "0.13.0" } -azalea-physics = { path = "azalea-physics", version = "0.13.0" } -azalea-protocol-macros = { path = "azalea-protocol/azalea-protocol-macros", version = "0.13.0" } -azalea-protocol = { path = "azalea-protocol", version = "0.13.0" } -azalea-registry-macros = { path = "azalea-registry/azalea-registry-macros", version = "0.13.0" } -azalea-registry = { path = "azalea-registry", version = "0.13.0" } -azalea-world = { path = "azalea-world", version = "0.13.0" } +azalea-block-macros = { path = "azalea-block/azalea-block-macros", version = "0.12.0" } +azalea-block = { path = "azalea-block", version = "0.12.0" } +azalea-auth = { path = "azalea-auth", version = "0.12.0" } +azalea-brigadier = { path = "azalea-brigadier", version = "0.12.0" } +azalea-buf-macros = { path = "azalea-buf/azalea-buf-macros", version = "0.12.0" } +azalea-buf = { path = "azalea-buf", version = "0.12.0" } +azalea-chat = { path = "azalea-chat", version = "0.12.0" } +azalea-client = { path = "azalea-client", version = "0.12.0", default-features = false } +azalea-core = { path = "azalea-core", version = "0.12.0" } +azalea-crypto = { path = "azalea-crypto", version = "0.12.0" } +azalea-entity = { path = "azalea-entity", version = "0.12.0" } +azalea-inventory-macros = { path = "azalea-inventory/azalea-inventory-macros", version = "0.12.0" } +azalea-inventory = { path = "azalea-inventory", version = "0.12.0" } +azalea-language = { path = "azalea-language", version = "0.12.0" } +azalea-physics = { path = "azalea-physics", version = "0.12.0" } +azalea-protocol-macros = { path = "azalea-protocol/azalea-protocol-macros", version = "0.12.0" } +azalea-protocol = { path = "azalea-protocol", version = "0.12.0" } +azalea-registry-macros = { path = "azalea-registry/azalea-registry-macros", version = "0.12.0" } +azalea-registry = { path = "azalea-registry", version = "0.12.0" } +azalea-world = { path = "azalea-world", version = "0.12.0" } # --- Profile Settings --- diff --git a/azalea-block/Cargo.toml b/azalea-block/Cargo.toml index 218ab685..a4800bbf 100644 --- a/azalea-block/Cargo.toml +++ b/azalea-block/Cargo.toml @@ -7,6 +7,6 @@ license.workspace = true repository.workspace = true [dependencies] -azalea-block-macros = { path = "./azalea-block-macros", version = "0.12.0" } +azalea-block-macros.workspace = true azalea-buf.workspace = true azalea-registry.workspace = true diff --git a/azalea-brigadier/Cargo.toml b/azalea-brigadier/Cargo.toml index 19c404c4..3016af79 100644 --- a/azalea-brigadier/Cargo.toml +++ b/azalea-brigadier/Cargo.toml @@ -11,8 +11,8 @@ bevy_app.workspace = true bevy_ecs.workspace = true [dependencies] -azalea-buf = { path = "../azalea-buf", version = "0.12.0", optional = true } -azalea-chat = { path = "../azalea-chat", version = "0.12.0", optional = true } +azalea-buf = { workspace = true, optional = true } +azalea-chat = { workspace = true, optional = true } parking_lot.workspace = true [features] diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml index 50177e4c..e5fc7f07 100644 --- a/azalea-buf/Cargo.toml +++ b/azalea-buf/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true repository.workspace = true [dependencies] -azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.12.0" } +azalea-buf-macros.workspace = true byteorder.workspace = true serde_json = { workspace = true, optional = true } simdnbt.workspace = true diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml index c7e8c78e..69d1acf0 100644 --- a/azalea-chat/Cargo.toml +++ b/azalea-chat/Cargo.toml @@ -13,11 +13,9 @@ azalea-buf = ["dep:azalea-buf", "simdnbt"] numbers = ["dep:azalea-registry", "dep:simdnbt"] [dependencies] -azalea-buf = { path = "../azalea-buf", version = "0.12.0", optional = true, features = [ - "serde_json", -] } +azalea-buf = { workspace = true, optional = true, features = ["serde_json"] } azalea-language.workspace = true -azalea-registry = { path = "../azalea-registry", version = "0.12.0", optional = true } +azalea-registry = { workspace = true, optional = true } serde = { workspace = true, features = ["derive"] } serde_json.workspace = true simdnbt = { workspace = true, optional = true } diff --git a/azalea-entity/Cargo.toml b/azalea-entity/Cargo.toml index 310b3390..c11ffab5 100644 --- a/azalea-entity/Cargo.toml +++ b/azalea-entity/Cargo.toml @@ -9,9 +9,7 @@ repository.workspace = true [dependencies] azalea-block.workspace = true azalea-buf.workspace = true -azalea-chat = { path = "../azalea-chat", version = "0.12.0", features = [ - "azalea-buf", -] } +azalea-chat = { workspace = true, features = ["azalea-buf"] } azalea-core.workspace = true azalea-inventory.workspace = true azalea-registry.workspace = true diff --git a/azalea-inventory/Cargo.toml b/azalea-inventory/Cargo.toml index ccc62b9c..018dd8b3 100644 --- a/azalea-inventory/Cargo.toml +++ b/azalea-inventory/Cargo.toml @@ -8,11 +8,9 @@ repository.workspace = true [dependencies] azalea-buf.workspace = true -azalea-chat = { path = "../azalea-chat", version = "0.12.0", features = [ - "azalea-buf", -] } +azalea-chat = { workspace = true, features = ["azalea-buf"] } azalea-core.workspace = true -azalea-inventory-macros = { path = "./azalea-inventory-macros", version = "0.12.0" } +azalea-inventory-macros.workspace = true azalea-registry.workspace = true indexmap.workspace = true diff --git a/azalea-physics/Cargo.toml b/azalea-physics/Cargo.toml index 8f0ac36b..912c17c9 100644 --- a/azalea-physics/Cargo.toml +++ b/azalea-physics/Cargo.toml @@ -13,8 +13,8 @@ uuid.workspace = true [dependencies] azalea-block.workspace = true azalea-core.workspace = true -azalea-entity = { version = "0.12.0", path = "../azalea-entity" } -azalea-inventory = { version = "0.12.0", path = "../azalea-inventory" } +azalea-entity.workspace = true +azalea-inventory.workspace = true azalea-registry.workspace = true azalea-world.workspace = true bevy_app.workspace = true diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index be711592..92814e74 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -14,22 +14,15 @@ tracing-subscriber.workspace = true [dependencies] async-recursion.workspace = true azalea-auth.workspace = true -azalea-block = { path = "../azalea-block", version = "0.12.0", default-features = false } -azalea-brigadier = { path = "../azalea-brigadier", version = "0.12.0", features = [ - "azalea-buf", -] } +azalea-block.workspace = true +azalea-brigadier = { workspace = true, features = ["azalea-buf"] } azalea-buf.workspace = true -azalea-chat = { path = "../azalea-chat", version = "0.12.0", features = [ - "numbers", - "azalea-buf", -] } -azalea-core = { path = "../azalea-core", version = "0.12.0", optional = true, features = [ - "serde", -] } +azalea-chat = { workspace = true, features = ["numbers", "azalea-buf"] } +azalea-core = { workspace = true, optional = true, features = ["serde"] } azalea-crypto.workspace = true azalea-entity.workspace = true azalea-inventory.workspace = true -azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.12.0" } +azalea-protocol-macros.workspace = true azalea-registry.workspace = true azalea-world.workspace = true bevy_ecs.workspace = true diff --git a/azalea-registry/Cargo.toml b/azalea-registry/Cargo.toml index 604ecadc..d85a378c 100644 --- a/azalea-registry/Cargo.toml +++ b/azalea-registry/Cargo.toml @@ -8,7 +8,7 @@ repository.workspace = true [dependencies] azalea-buf.workspace = true -azalea-registry-macros = { path = "./azalea-registry-macros", version = "0.12.0" } +azalea-registry-macros.workspace = true serde = { workspace = true, optional = true, features = ["derive"] } simdnbt.workspace = true diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml index e2774c95..69eef97f 100644 --- a/azalea-world/Cargo.toml +++ b/azalea-world/Cargo.toml @@ -8,14 +8,12 @@ repository.workspace = true [dev-dependencies] azalea-client.workspace = true -criterion = "0.6.0" +criterion.workspace = true [dependencies] azalea-block.workspace = true azalea-buf.workspace = true -azalea-core = { path = "../azalea-core", version = "0.12.0", features = [ - "bevy_ecs", -] } +azalea-core = { workspace = true, features = ["bevy_ecs"] } azalea-registry.workspace = true bevy_ecs.workspace = true derive_more = { workspace = true, features = ["deref", "deref_mut"] } diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index 0896ab45..a8f15d06 100644 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -13,19 +13,19 @@ pre-release-replacements = [ [dependencies] #async-trait.workspace = true -azalea-auth = { version = "0.12.0", path = "../azalea-auth" } -azalea-block = { version = "0.12.0", path = "../azalea-block" } -azalea-brigadier = { version = "0.12.0", path = "../azalea-brigadier" } -azalea-buf = { version = "0.12.0", path = "../azalea-buf" } -azalea-chat = { version = "0.12.0", path = "../azalea-chat" } -azalea-client = { version = "0.12.0", path = "../azalea-client", default-features = false } -azalea-core = { version = "0.12.0", path = "../azalea-core" } -azalea-entity = { version = "0.12.0", path = "../azalea-entity" } -azalea-inventory = { version = "0.12.0", path = "../azalea-inventory" } -azalea-physics = { version = "0.12.0", path = "../azalea-physics" } -azalea-protocol = { version = "0.12.0", path = "../azalea-protocol" } -azalea-registry = { version = "0.12.0", path = "../azalea-registry" } -azalea-world = { version = "0.12.0", path = "../azalea-world" } +azalea-auth.workspace = true +azalea-block.workspace = true +azalea-brigadier.workspace = true +azalea-buf.workspace = true +azalea-chat.workspace = true +azalea-client.workspace = true +azalea-core.workspace = true +azalea-entity.workspace = true +azalea-inventory.workspace = true +azalea-physics.workspace = true +azalea-protocol.workspace = true +azalea-registry.workspace = true +azalea-world.workspace = true bevy_app.workspace = true bevy_ecs.workspace = true bevy_log.workspace = true