1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 14:26:04 +00:00

cargo autoinherit to merge dependencies

This commit is contained in:
Shayne Hartford 2024-11-23 00:15:11 -05:00
parent 00eb75df23
commit 51ddb5e2a2
21 changed files with 242 additions and 186 deletions

View file

@ -1,24 +1,80 @@
[workspace]
members = [
"azalea",
"azalea-client",
"azalea-protocol",
"azalea-chat",
"azalea-core",
"azalea-auth",
"azalea-brigadier",
"azalea-crypto",
"azalea-world",
"azalea-language",
"azalea-block",
"azalea-buf",
"azalea-physics",
"azalea-registry",
"azalea-inventory",
"azalea-entity",
"azalea",
"azalea-client",
"azalea-protocol",
"azalea-chat",
"azalea-core",
"azalea-auth",
"azalea-brigadier",
"azalea-crypto",
"azalea-world",
"azalea-language",
"azalea-block",
"azalea-buf",
"azalea-physics",
"azalea-registry",
"azalea-inventory",
"azalea-entity",
]
resolver = "2"
[workspace.dependencies]
aes = "0.8.4"
anyhow = "1.0.93"
async-recursion = "1.1.1"
async-trait = "0.1.83"
base64 = "0.22.1"
bevy_app = "0.13.2"
bevy_ecs = { version = "0.13.2", default-features = false }
bevy_log = "0.13.2"
bevy_tasks = "0.13.2"
bevy_time = "0.13.2"
byteorder = "1.5.0"
bytes = "1.8.0"
cfb8 = "0.8.1"
chrono = { version = "0.4.38", default-features = false }
criterion = "0.5.1"
derive_more = "1.0.0"
enum-as-inner = "0.6.1"
env_logger = "0.11.5"
flate2 = "1.0.35"
futures = "0.3.31"
futures-lite = "2.5.0"
#futures-util = "0.3.31"
log = "0.4.22"
md-5 = "0.10.6"
minecraft_folder_path = "0.1.2"
nohash-hasher = "0.2.0"
num-bigint = "0.4.6"
num-traits = "0.2.19"
once_cell = "1.20.2"
parking_lot = "0.12.3"
priority-queue = "2.1.1"
proc-macro2 = "1.0.92"
quote = "1.0.37"
rand = "0.8.5"
regex = "1.11.1"
reqwest = { version = "0.12.9", default-features = false }
rsa = "0.9.6"
rsa_public_encrypt_pkcs1 = "0.4.0"
rustc-hash = "2.0.0"
serde = "1.0.215"
serde_json = "1.0.133"
sha-1 = "0.10.1"
sha2 = "0.10.8"
simdnbt = "0.6"
#smallvec = "1.13.2"
socks5-impl = "0.5.17"
syn = "2.0.89"
thiserror = "2.0.3"
tokio = "1.41.1"
tokio-util = "0.7.12"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"
trust-dns-resolver = { version = "0.23.2", default-features = false }
uuid = "1.11.0"
[profile.release]
debug = true

View file

@ -11,20 +11,20 @@ version = "0.10.3+mc1.21.1"
[dependencies]
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" }
base64 = "0.22.1"
chrono = { version = "0.4.38", default-features = false, features = ["serde"] }
md-5 = "0.10.6"
#num-bigint = "0.4.6"
once_cell = "1.20.2"
reqwest = { version = "0.12.9", default-features = false, features = ["json", "rustls-tls"] }
rsa = "0.9.6"
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.133"
thiserror = "2.0.3"
tokio = { version = "1.41.1", features = ["fs"] }
tracing = "0.1.40"
uuid = { version = "1.11.0", features = ["serde", "v3"] }
base64 = { workspace = true }
chrono = { workspace = true, features = ["serde"] }
md-5 = { workspace = true }
#num-bigint = { workspace = true }
once_cell = { workspace = true }
reqwest = { workspace = true, features = ["json", "rustls-tls"] }
rsa = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["fs"] }
tracing = { workspace = true }
uuid = { workspace = true, features = ["serde", "v3"] }
[dev-dependencies]
env_logger = "0.11.5"
tokio = { version = "1.41.1", features = ["full"] }
env_logger = { workspace = true }
tokio = { workspace = true, features = ["full"] }

View file

@ -12,6 +12,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
proc-macro2 = "1.0.92"
quote = "1.0.37"
syn = "2.0.89"
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true }

View file

@ -9,13 +9,13 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dev-dependencies]
bevy_app = "0.13.2"
bevy_ecs = "0.13.2"
bevy_app = { workspace = true }
bevy_ecs = { workspace = true }
[dependencies]
azalea-buf = { path = "../azalea-buf", version = "0.10.0", optional = true }
azalea-chat = { path = "../azalea-chat", version = "0.10.0", optional = true }
parking_lot = "0.12.3"
parking_lot = { workspace = true }
[features]
azalea-buf = ["dep:azalea-buf", "dep:azalea-chat", "azalea-chat/azalea-buf"]

View file

@ -10,12 +10,12 @@ version = "0.10.3+mc1.21.1"
[dependencies]
azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.10.0" }
byteorder = "^1.5.0"
serde_json = { version = "^1.0", optional = true }
simdnbt = "0.6"
thiserror = "2.0.3"
tracing = "0.1.40"
uuid = "^1.11.0"
byteorder = { workspace = true }
serde_json = { workspace = true, optional = true }
simdnbt = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
uuid = { workspace = true }
[features]
serde_json = ["dep:serde_json"]

View file

@ -11,6 +11,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
proc-macro2 = "^1.0.92"
quote = "^1.0.37"
syn = { version = "^2.0.89", features = ["extra-traits"] }
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true, features = ["extra-traits"] }

View file

@ -18,8 +18,8 @@ numbers = ["dep:azalea-registry", "dep:simdnbt"]
azalea-buf = { path = "../azalea-buf", features = ["serde_json"], version = "0.10.0", optional = true }
azalea-language = { path = "../azalea-language", version = "0.10.0" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0", optional = true }
once_cell = "1.20.2"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0.133"
simdnbt = { version = "0.6", optional = true }
tracing = "0.1.40"
once_cell = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
simdnbt = { workspace = true, optional = true }
tracing = { workspace = true }

View file

@ -9,8 +9,8 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
anyhow = "1.0.93"
#async-trait = "0.1.83"
anyhow = { workspace = true }
#async-trait = { workspace = true }
azalea-auth = { path = "../azalea-auth", version = "0.10.0" }
azalea-block = { path = "../azalea-block", version = "0.10.0" }
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
@ -23,26 +23,26 @@ azalea-physics = { path = "../azalea-physics", version = "0.10.0" }
azalea-protocol = { path = "../azalea-protocol", version = "0.10.0" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
azalea-world = { path = "../azalea-world", version = "0.10.0" }
bevy_app = "0.13.2"
bevy_ecs = "0.13.2"
bevy_log = { version = "0.13.2", optional = true }
bevy_tasks = "0.13.2"
bevy_time = "0.13.2"
derive_more = { version = "1.0.0", features = ["deref", "deref_mut"] }
#futures = "0.3.31"
minecraft_folder_path = "0.1.2"
#nohash-hasher = "0.2.0"
once_cell = "1.20.2"
parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] }
regex = "1.11.1"
reqwest = { version = "0.12.9", default-features = false }
#serde = "1.0.215"
#serde_json = "1.0.133"
simdnbt = "0.6"
thiserror = "2.0.3"
tokio = { version = "^1.41.1", features = ["sync"] }
tracing = "0.1.40"
uuid = "^1.11.0"
bevy_app = { workspace = true }
bevy_ecs = { workspace = true }
bevy_log = { workspace = true, optional = true }
bevy_tasks = { workspace = true }
bevy_time = { workspace = true }
derive_more = { workspace = true, features = ["deref", "deref_mut"] }
#futures = { workspace = true }
minecraft_folder_path = { workspace = true }
#nohash-hasher = { workspace = true }
once_cell = { workspace = true }
parking_lot = { workspace = true, features = ["deadlock_detection"] }
regex = { workspace = true }
reqwest = { workspace = true }
#serde = { workspace = true }
#serde_json = { workspace = true }
simdnbt = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["sync"] }
tracing = { workspace = true }
uuid = { workspace = true }
[features]
default = ["log"]

View file

@ -11,14 +11,14 @@ version = "0.10.3+mc1.21.1"
[dependencies]
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
bevy_ecs = { version = "0.13.2", default-features = false, optional = true }
nohash-hasher = "0.2.0"
num-traits = "0.2.19"
serde = { version = "^1.0", optional = true }
#serde_json = "^1.0.133"
simdnbt = "0.6"
tracing = "0.1.40"
#uuid = "^1.11.0"
bevy_ecs = { workspace = true, optional = true }
nohash-hasher = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true, optional = true }
#serde_json = { workspace = true }
simdnbt = { workspace = true }
tracing = { workspace = true }
#uuid = { workspace = true }
[features]
bevy_ecs = ["dep:bevy_ecs"]

View file

@ -9,19 +9,19 @@ repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-crypto"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
aes = "0.8.4"
aes = { workspace = true }
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
cfb8 = "0.8.1"
num-bigint = "^0.4.6"
rand = { version = "^0.8.5", features = ["getrandom"] }
rsa = { version = "0.9.6", features = ["sha2"] }
rsa_public_encrypt_pkcs1 = "0.4.0"
sha-1 = "^0.10.1"
sha2 = "0.10.8"
uuid = "^1.11.0"
cfb8 = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true, features = ["getrandom"] }
rsa = { workspace = true, features = ["sha2"] }
rsa_public_encrypt_pkcs1 = { workspace = true }
sha-1 = { workspace = true }
sha2 = { workspace = true }
uuid = { workspace = true }
[dev-dependencies]
criterion = { version = "^0.5.1", features = ["html_reports"] }
criterion = { workspace = true, features = ["html_reports"] }
[[bench]]
harness = false

View file

@ -16,13 +16,13 @@ azalea-core = { version = "0.10.0", path = "../azalea-core" }
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
azalea-world = { version = "0.10.0", path = "../azalea-world" }
bevy_app = "0.13.2"
bevy_ecs = "0.13.2"
derive_more = "1.0.0"
enum-as-inner = "0.6.1"
nohash-hasher = "0.2.0"
parking_lot = "0.12.3"
simdnbt = "0.6"
thiserror = "2.0.3"
tracing = "0.1.40"
uuid = "1.11.0"
bevy_app = { workspace = true }
bevy_ecs = { workspace = true }
derive_more = { workspace = true }
enum-as-inner = { workspace = true }
nohash-hasher = { workspace = true }
parking_lot = { workspace = true }
simdnbt = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
uuid = { workspace = true }

View file

@ -14,5 +14,5 @@ azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = ["azalea
azalea-core = { version = "0.10.0", path = "../azalea-core" }
azalea-inventory-macros = { version = "0.10.0", path = "./azalea-inventory-macros" }
azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
simdnbt = "0.6"
uuid = "1.11.0"
simdnbt = { workspace = true }
uuid = { workspace = true }

View file

@ -12,6 +12,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
proc-macro2 = "1.0.92"
quote = "1.0.37"
syn = "2.0.89"
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true }

View file

@ -9,7 +9,7 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
once_cell = "1.20.2"
serde = "^1.0"
serde_json = "^1.0.133"
#tokio = { version = "^1.21.2", features = ["fs"] }
once_cell = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
#tokio = { workspace = true, features = ["fs"] }

View file

@ -15,14 +15,14 @@ azalea-entity = { version = "0.10.0", path = "../azalea-entity" }
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
azalea-world = { path = "../azalea-world", version = "0.10.0" }
bevy_app = "0.13.2"
bevy_ecs = "0.13.2"
#nohash-hasher = "0.2.0"
once_cell = "1.20.2"
parking_lot = "^0.12.3"
#smallvec = "1.13.2"
#tracing = "0.1.40"
bevy_app = { workspace = true }
bevy_ecs = { workspace = true }
#nohash-hasher = { workspace = true }
once_cell = { workspace = true }
parking_lot = { workspace = true }
#smallvec = { workspace = true }
#tracing = { workspace = true }
[dev-dependencies]
#bevy_time = "0.13.2"
uuid = "^1.11.0"
#bevy_time = { workspace = true }
uuid = { workspace = true }

View file

@ -9,7 +9,7 @@ version = "0.10.3+mc1.21.1"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
async-recursion = "1.1.1"
async-recursion = { workspace = true }
azalea-auth = { path = "../azalea-auth", version = "0.10.0" }
azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" }
azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = ["azalea-buf"] }
@ -22,24 +22,24 @@ azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.10.0" }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
azalea-world = { path = "../azalea-world", version = "0.10.0" }
bevy_ecs = { version = "0.13.2", default-features = false }
#byteorder = "^1.5.0"
bytes = "^1.8.0"
flate2 = "1.0.35"
futures = "0.3.31"
futures-lite = "2.5.0"
#futures-util = "0.3.31"
log = "0.4.22"
serde = { version = "^1.0", features = ["serde_derive"] }
serde_json = "^1.0.133"
simdnbt = "0.6"
socks5-impl = "0.5.17"
thiserror = "2.0.3"
tokio = { version = "^1.41.1", features = ["io-util", "net", "macros"] }
tokio-util = { version = "0.7.12", features = ["codec"] }
tracing = "0.1.40"
trust-dns-resolver = { version = "^0.23.2", default-features = false, features = ["tokio-runtime"] }
uuid = "1.11.0"
bevy_ecs = { workspace = true }
#byteorder = { workspace = true }
bytes = { workspace = true }
flate2 = { workspace = true }
futures = { workspace = true }
futures-lite = { workspace = true }
#futures-util = { workspace = true }
log = { workspace = true }
serde = { workspace = true, features = ["serde_derive"] }
serde_json = { workspace = true }
simdnbt = { workspace = true }
socks5-impl = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["io-util", "net", "macros"] }
tokio-util = { workspace = true, features = ["codec"] }
tracing = { workspace = true }
trust-dns-resolver = { workspace = true, features = ["tokio-runtime"] }
uuid = { workspace = true }
[features]
connecting = []
@ -47,7 +47,7 @@ default = ["packets"]
packets = ["connecting", "dep:azalea-core"]
[dev-dependencies]
anyhow = "^1.0.93"
once_cell = "1.20.2"
tracing = "^0.1.40"
tracing-subscriber = "^0.3.18"
anyhow = { workspace = true }
once_cell = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }

View file

@ -11,6 +11,6 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
proc-macro2 = "^1.0.92"
quote = "^1.0.37"
syn = "^2.0.89"
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true }

View file

@ -11,9 +11,9 @@ version = "0.10.3+mc1.21.1"
[dependencies]
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-registry-macros = { path = "./azalea-registry-macros", version = "0.10.0" }
once_cell = "1.20.2"
serde = { version = "^1.0", optional = true }
simdnbt = "0.6"
once_cell = { workspace = true }
serde = { workspace = true, optional = true }
simdnbt = { workspace = true }
[features]
serde = ["azalea-registry-macros/serde", "dep:serde"]

View file

@ -12,9 +12,9 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
#proc-macro2 = "1.0.92"
quote = "1.0.37"
syn = "2.0.89"
#proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true }
[features]
serde = []

View file

@ -13,22 +13,22 @@ azalea-block = { path = "../azalea-block", default-features = false, version = "
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
azalea-core = { path = "../azalea-core", version = "0.10.0", features = ["bevy_ecs"] }
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
bevy_ecs = "0.13.2"
derive_more = { version = "1.0.0", features = ["deref", "deref_mut"] }
nohash-hasher = "0.2.0"
#once_cell = "1.20.2"
parking_lot = "^0.12.3"
rustc-hash = "2.0.0"
#serde = "1.0.215"
#serde_json = "1.0.133"
simdnbt = "0.6"
thiserror = "2.0.3"
tracing = "0.1.40"
#uuid = "1.11.0"
bevy_ecs = { workspace = true }
derive_more = { workspace = true, features = ["deref", "deref_mut"] }
nohash-hasher = { workspace = true }
#once_cell = { workspace = true }
parking_lot = { workspace = true }
rustc-hash = { workspace = true }
#serde = { workspace = true }
#serde_json = { workspace = true }
simdnbt = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
#uuid = { workspace = true }
[dev-dependencies]
azalea-client = { path = "../azalea-client" }
criterion = "0.5.1"
criterion = { workspace = true }
[[bench]]
name = "chunks"

View file

@ -12,8 +12,8 @@ pre-release-replacements = [
]
[dependencies]
anyhow = "^1.0.93"
#async-trait = "0.1.83"
anyhow = { workspace = true }
#async-trait = { workspace = true }
azalea-auth = { version = "0.10.0", path = "../azalea-auth" }
azalea-block = { version = "0.10.0", path = "../azalea-block" }
azalea-brigadier = { version = "0.10.0", path = "../azalea-brigadier" }
@ -27,28 +27,28 @@ azalea-physics = { version = "0.10.0", path = "../azalea-physics" }
azalea-protocol = { version = "0.10.0", path = "../azalea-protocol" }
azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
azalea-world = { version = "0.10.0", path = "../azalea-world" }
bevy_app = "0.13.2"
bevy_ecs = "0.13.2"
bevy_log = "0.13.2"
bevy_tasks = { version = "0.13.2", features = ["multi-threaded"] }
#bevy_time = "0.13.2"
derive_more = { version = "1.0.0", features = ["deref", "deref_mut"] }
futures = "0.3.31"
futures-lite = "2.5.0"
nohash-hasher = "0.2.0"
num-traits = "0.2.19"
parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] }
priority-queue = "2.1.1"
rustc-hash = "2.0.0"
serde = { version = "1", optional = true }
thiserror = "2.0.3"
tokio = "^1.41.1"
tracing = "0.1.40"
uuid = "1.11.0"
bevy_app = { workspace = true }
bevy_ecs = { workspace = true }
bevy_log = { workspace = true }
bevy_tasks = { workspace = true, features = ["multi-threaded"] }
#bevy_time = { workspace = true }
derive_more = { workspace = true, features = ["deref", "deref_mut"] }
futures = { workspace = true }
futures-lite = { workspace = true }
nohash-hasher = { workspace = true }
num-traits = { workspace = true }
parking_lot = { workspace = true, features = ["deadlock_detection"] }
priority-queue = { workspace = true }
rustc-hash = { workspace = true }
serde = { workspace = true, optional = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }
uuid = { workspace = true }
[dev-dependencies]
criterion = "0.5.1"
rand = "0.8.5"
criterion = { workspace = true }
rand = { workspace = true }
[features]
default = ["log", "serde"]