From 1fa1520feac05763805f006b996b11ef3d59c845 Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 15 Jun 2025 21:47:56 -0100 Subject: [PATCH] put all azalea-* deps in the workspace Cargo.toml --- Cargo.toml | 21 +++++++++++++++++++++ azalea-auth/Cargo.toml | 4 ++-- azalea-block/Cargo.toml | 4 ++-- azalea-chat/Cargo.toml | 2 +- azalea-client/Cargo.toml | 24 ++++++++++++------------ azalea-core/Cargo.toml | 6 +++--- azalea-crypto/Cargo.toml | 2 +- azalea-entity/Cargo.toml | 12 ++++++------ azalea-inventory/Cargo.toml | 6 +++--- azalea-physics/Cargo.toml | 8 ++++---- azalea-protocol/Cargo.toml | 14 +++++++------- azalea-registry/Cargo.toml | 2 +- azalea-world/Cargo.toml | 8 ++++---- 13 files changed, 67 insertions(+), 46 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8a3a81d0..12013947 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,6 +83,27 @@ 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.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" } +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 --- [profile.release] diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml index fb1b37c9..3f788e20 100644 --- a/azalea-auth/Cargo.toml +++ b/azalea-auth/Cargo.toml @@ -7,8 +7,8 @@ license.workspace = true repository.workspace = true [dependencies] -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } -azalea-crypto = { path = "../azalea-crypto", version = "0.12.0" } +azalea-buf.workspace = true +azalea-crypto.workspace = true base64.workspace = true chrono = { workspace = true, features = ["serde"] } md-5.workspace = true diff --git a/azalea-block/Cargo.toml b/azalea-block/Cargo.toml index ad40aeaf..218ab685 100644 --- a/azalea-block/Cargo.toml +++ b/azalea-block/Cargo.toml @@ -8,5 +8,5 @@ repository.workspace = true [dependencies] azalea-block-macros = { path = "./azalea-block-macros", version = "0.12.0" } -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } -azalea-registry = { path = "../azalea-registry", version = "0.12.0" } +azalea-buf.workspace = true +azalea-registry.workspace = true diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml index 044d0a16..c7e8c78e 100644 --- a/azalea-chat/Cargo.toml +++ b/azalea-chat/Cargo.toml @@ -16,7 +16,7 @@ numbers = ["dep:azalea-registry", "dep:simdnbt"] azalea-buf = { path = "../azalea-buf", version = "0.12.0", optional = true, features = [ "serde_json", ] } -azalea-language = { path = "../azalea-language", version = "0.12.0" } +azalea-language.workspace = true azalea-registry = { path = "../azalea-registry", version = "0.12.0", optional = true } serde = { workspace = true, features = ["derive"] } serde_json.workspace = true diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml index c9adbe5a..b4a4b7ea 100644 --- a/azalea-client/Cargo.toml +++ b/azalea-client/Cargo.toml @@ -8,18 +8,18 @@ repository.workspace = true [dependencies] async-compat.workspace = true -azalea-auth = { path = "../azalea-auth", version = "0.12.0" } -azalea-block = { path = "../azalea-block", version = "0.12.0" } -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } -azalea-chat = { path = "../azalea-chat", version = "0.12.0" } -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 = { path = "../azalea-inventory", version = "0.12.0" } -azalea-physics = { path = "../azalea-physics", version = "0.12.0" } -azalea-protocol = { path = "../azalea-protocol", version = "0.12.0" } -azalea-registry = { path = "../azalea-registry", version = "0.12.0" } -azalea-world = { path = "../azalea-world", version = "0.12.0" } +azalea-auth.workspace = true +azalea-block.workspace = true +azalea-buf.workspace = true +azalea-chat.workspace = true +azalea-core.workspace = true +azalea-crypto.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, optional = true } diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml index 89442649..706964f3 100644 --- a/azalea-core/Cargo.toml +++ b/azalea-core/Cargo.toml @@ -7,15 +7,15 @@ license.workspace = true repository.workspace = true [dependencies] -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } -azalea-registry = { path = "../azalea-registry", version = "0.12.0" } +azalea-buf.workspace = true +azalea-registry.workspace = true bevy_ecs = { workspace = true, optional = true } nohash-hasher.workspace = true num-traits.workspace = true serde = { workspace = true, optional = true } simdnbt.workspace = true tracing.workspace = true -azalea-chat = { path = "../azalea-chat", version = "0.12.0" } +azalea-chat.workspace = true indexmap.workspace = true [features] diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml index f55bc6bf..6b0128ba 100644 --- a/azalea-crypto/Cargo.toml +++ b/azalea-crypto/Cargo.toml @@ -11,7 +11,7 @@ criterion.workspace = true [dependencies] aes.workspace = true -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } +azalea-buf.workspace = true cfb8.workspace = true num-bigint.workspace = true rand = { workspace = true, features = ["os_rng"] } diff --git a/azalea-entity/Cargo.toml b/azalea-entity/Cargo.toml index e88907cc..310b3390 100644 --- a/azalea-entity/Cargo.toml +++ b/azalea-entity/Cargo.toml @@ -7,15 +7,15 @@ license.workspace = true repository.workspace = true [dependencies] -azalea-block = { path = "../azalea-block", version = "0.12.0" } -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } +azalea-block.workspace = true +azalea-buf.workspace = true azalea-chat = { path = "../azalea-chat", version = "0.12.0", features = [ "azalea-buf", ] } -azalea-core = { path = "../azalea-core", version = "0.12.0" } -azalea-inventory = { path = "../azalea-inventory", version = "0.12.0" } -azalea-registry = { path = "../azalea-registry", version = "0.12.0" } -azalea-world = { path = "../azalea-world", version = "0.12.0" } +azalea-core.workspace = true +azalea-inventory.workspace = true +azalea-registry.workspace = true +azalea-world.workspace = true bevy_app.workspace = true bevy_ecs.workspace = true derive_more.workspace = true diff --git a/azalea-inventory/Cargo.toml b/azalea-inventory/Cargo.toml index 157d8cde..ccc62b9c 100644 --- a/azalea-inventory/Cargo.toml +++ b/azalea-inventory/Cargo.toml @@ -7,13 +7,13 @@ license.workspace = true repository.workspace = true [dependencies] -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } +azalea-buf.workspace = true azalea-chat = { path = "../azalea-chat", version = "0.12.0", features = [ "azalea-buf", ] } -azalea-core = { path = "../azalea-core", version = "0.12.0" } +azalea-core.workspace = true azalea-inventory-macros = { path = "./azalea-inventory-macros", version = "0.12.0" } -azalea-registry = { path = "../azalea-registry", version = "0.12.0" } +azalea-registry.workspace = true indexmap.workspace = true simdnbt.workspace = true diff --git a/azalea-physics/Cargo.toml b/azalea-physics/Cargo.toml index c6e25882..8f0ac36b 100644 --- a/azalea-physics/Cargo.toml +++ b/azalea-physics/Cargo.toml @@ -11,12 +11,12 @@ bevy_time.workspace = true uuid.workspace = true [dependencies] -azalea-block = { path = "../azalea-block", version = "0.12.0" } -azalea-core = { path = "../azalea-core", version = "0.12.0" } +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-registry = { path = "../azalea-registry", version = "0.12.0" } -azalea-world = { path = "../azalea-world", version = "0.12.0" } +azalea-registry.workspace = true +azalea-world.workspace = true bevy_app.workspace = true bevy_ecs.workspace = true tracing.workspace = true diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index d1215a92..be711592 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -13,12 +13,12 @@ tracing-subscriber.workspace = true [dependencies] async-recursion.workspace = true -azalea-auth = { path = "../azalea-auth", version = "0.12.0" } +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-buf = { path = "../azalea-buf", version = "0.12.0" } +azalea-buf.workspace = true azalea-chat = { path = "../azalea-chat", version = "0.12.0", features = [ "numbers", "azalea-buf", @@ -26,12 +26,12 @@ azalea-chat = { path = "../azalea-chat", version = "0.12.0", features = [ azalea-core = { path = "../azalea-core", version = "0.12.0", optional = true, features = [ "serde", ] } -azalea-crypto = { path = "../azalea-crypto", version = "0.12.0" } -azalea-entity = { path = "../azalea-entity", version = "0.12.0" } -azalea-inventory = { path = "../azalea-inventory", version = "0.12.0" } +azalea-crypto.workspace = true +azalea-entity.workspace = true +azalea-inventory.workspace = true azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.12.0" } -azalea-registry = { path = "../azalea-registry", version = "0.12.0" } -azalea-world = { path = "../azalea-world", version = "0.12.0" } +azalea-registry.workspace = true +azalea-world.workspace = true bevy_ecs.workspace = true # byteorder.workspace = true flate2.workspace = true diff --git a/azalea-registry/Cargo.toml b/azalea-registry/Cargo.toml index d5cdd3f3..604ecadc 100644 --- a/azalea-registry/Cargo.toml +++ b/azalea-registry/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true repository.workspace = true [dependencies] -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } +azalea-buf.workspace = true azalea-registry-macros = { path = "./azalea-registry-macros", version = "0.12.0" } serde = { workspace = true, optional = true, features = ["derive"] } simdnbt.workspace = true diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml index 5e419343..e2774c95 100644 --- a/azalea-world/Cargo.toml +++ b/azalea-world/Cargo.toml @@ -7,16 +7,16 @@ license.workspace = true repository.workspace = true [dev-dependencies] -azalea-client = { path = "../azalea-client" } +azalea-client.workspace = true criterion = "0.6.0" [dependencies] -azalea-block = { path = "../azalea-block", default-features = false, version = "0.12.0" } -azalea-buf = { path = "../azalea-buf", version = "0.12.0" } +azalea-block.workspace = true +azalea-buf.workspace = true azalea-core = { path = "../azalea-core", version = "0.12.0", features = [ "bevy_ecs", ] } -azalea-registry = { path = "../azalea-registry", version = "0.12.0" } +azalea-registry.workspace = true bevy_ecs.workspace = true derive_more = { workspace = true, features = ["deref", "deref_mut"] } nohash-hasher.workspace = true