Merge pull request 'Update dependencies' (#188) from feat/dependencies into master

Reviewed-on: https://git.sclu1034.dev///bitsquid_dt/dtmt/pulls/188

Cargo.toml

@@ -13,12 +13,51 @@ members = [
 exclude = ["lib/color-eyre"]
 
 [workspace.dependencies]
-zip = { version = "2.1.3", default-features = false, features = ["deflate", "bzip2", "zstd", "time"] }
+ansi-parser = "0.9.1"
-minijinja = { version = "2.0.1", default-features = false }
+ansi_term = "0.12.1"
-
+async-recursion = "1.0.5"
-[patch.crates-io]
+bincode = "1.3.3"
+bitflags = "2.5.0"
+byteorder = "1.4.3"
+clap = { version = "4.0.15", features = ["color", "derive", "std", "cargo", "string", "unicode"] }
+cli-table = { version = "0.4.7", default-features = false, features = ["derive"] }
 color-eyre = { path = "lib/color-eyre" }
-ansi-parser = { git = "https://gitlab.com/lschwiderski/ansi-parser.git", branch = "issue/outdated-heapless", version = "0.9.1" }
+colors-transform = "0.2.11"
+confy = "0.6.1"
+csv-async = { version = "1.2.4", features = ["tokio", "serde"] }
+druid = { version = "0.8", features = ["im", "serde", "image", "png", "jpeg", "bmp", "webp", "svg"] }
+druid-widget-nursery = "0.1"
+dtmt-shared = { path = "lib/dtmt-shared" }
+fastrand = "2.1.0"
+futures = "0.3.25"
+futures-util = "0.3.24"
+glob = "0.3.0"
+interprocess = "2.1.0"
+lazy_static = "1.4.0"
+luajit2-sys = { path = "lib/luajit2-sys" }
+minijinja = { version = "2.0.1", default-features = false }
+nanorand = "0.7.0"
+nexusmods = { path = "lib/nexusmods" }
+notify = "6.1.1"
+oodle = { path = "lib/oodle" }
+open = "5.0.1"
+path-clean = "1.0.1"
+path-slash = "0.2.1"
+pin-project-lite = "0.2.9"
+promptly = "0.3.1"
+sdk = { path = "lib/sdk" }
+serde = { version = "1.0.152", features = ["derive", "rc"] }
+serde_sjson = { path = "lib/serde_sjson" }
+steamlocate = "2.0.0-beta.2"
+strip-ansi-escapes = "0.2.0"
+time = { version = "0.3.20", features = ["serde", "serde-well-known", "local-offset", "formatting", "macros"] }
+tokio = { version = "1.23.0", features = ["rt-multi-thread", "fs", "process", "macros", "tracing", "io-util", "io-std"] }
+tokio-stream = { version = "0.1.12", features = ["fs", "io-util"] }
+tracing = { version = "0.1.37", features = ["async-await"] }
+tracing-error = "0.2.0"
+tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
+usvg = "0.25.0"
+zip = { version = "2.1.3", default-features = false, features = ["deflate", "bzip2", "zstd", "time"] }
 
 [profile.dev.package.backtrace]
 opt-level = 3

crates/dtmm/Cargo.toml

@@ -12,37 +12,37 @@ license-file = "LICENSE"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ansi-parser = "0.9.0"
+ansi-parser = { workspace = true }
-async-recursion = "1.0.5"
+async-recursion = { workspace = true }
-bincode = "1.3.3"
+bincode = { workspace = true }
-bitflags = "2.5.0"
+bitflags = { workspace = true }
-clap = { version = "4.0.15", features = ["color", "derive", "std", "cargo", "string", "unicode"] }
+clap = { workspace = true }
-color-eyre = "0.6.2"
+color-eyre = { workspace = true }
-colors-transform = "0.2.11"
+colors-transform = { workspace = true }
-confy = "0.6.1"
+confy = { workspace = true }
-druid = { version = "0.8", features = ["im", "serde", "image", "png", "jpeg", "bmp", "webp", "svg"] }
+druid = { workspace = true }
-druid-widget-nursery = "0.1"
+druid-widget-nursery = { workspace = true }
-dtmt-shared = { path = "../../lib/dtmt-shared", version = "*" }
+dtmt-shared = { workspace = true }
-futures = "0.3.25"
+futures = { workspace = true }
-interprocess = "2.1.0"
+interprocess = { workspace = true }
-lazy_static = "1.4.0"
+lazy_static = { workspace = true }
-luajit2-sys = { path = "../../lib/luajit2-sys", version = "*" }
+luajit2-sys = { workspace = true }
 minijinja = { workspace = true }
-nexusmods = { path = "../../lib/nexusmods", version = "*" }
+nexusmods = { workspace = true }
-oodle = { path = "../../lib/oodle", version = "*" }
+oodle = { workspace = true }
-open = "5.0.1"
+open = { workspace = true }
-path-slash = "0.2.1"
+path-slash = { workspace = true }
-sdk = { path = "../../lib/sdk", version = "*" }
+sdk = { workspace = true }
-serde = { version = "1.0.152", features = ["derive", "rc"] }
+serde = { workspace = true }
-serde_sjson = { path = "../../lib/serde_sjson", version = "*" }
+serde_sjson = { workspace = true }
-strip-ansi-escapes = "0.2.0"
+strip-ansi-escapes = { workspace = true }
-time = { version = "0.3.20", features = ["serde", "serde-well-known", "local-offset"] }
+time = { workspace = true }
-tokio = { version = "1.23.0", features = ["rt", "fs", "tracing", "sync"] }
+tokio = { workspace = true }
-tokio-stream = { version = "0.1.12", features = ["fs"] }
+tokio-stream = { workspace = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
-tracing-error = "0.2.0"
+tracing-error = { workspace = true }
-tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
+tracing-subscriber = { workspace = true }
-usvg = "0.25.0"
+usvg = { workspace = true }
 zip = { workspace = true }
 
 [build-dependencies]

crates/dtmt/Cargo.toml

@@ -4,34 +4,36 @@ version = "0.3.0"
 edition = "2021"
 
 [dependencies]
-clap = { version = "4.0.15", features = ["color", "derive", "std", "cargo", "unicode"] }
+async-recursion = { workspace = true }
-cli-table = { version = "0.4.7", default-features = false, features = ["derive"] }
+clap = { workspace = true }
-color-eyre = "0.6.2"
+cli-table = { workspace = true }
-confy = "0.6.1"
+color-eyre = { workspace = true }
-csv-async = { version = "1.2.4", features = ["tokio", "serde"] }
+confy = { workspace = true }
-dtmt-shared = { path = "../../lib/dtmt-shared", version = "*" }
+csv-async = { workspace = true }
-futures = "0.3.25"
+dtmt-shared = { workspace = true }
-futures-util = "0.3.24"
+futures = { workspace = true }
-glob = "0.3.0"
+futures-util = { workspace = true }
-nanorand = "0.7.0"
+glob = { workspace = true }
-oodle = { path = "../../lib/oodle", version = "*" }
+luajit2-sys = { workspace = true }
-pin-project-lite = "0.2.9"
-promptly = "0.3.1"
-sdk = { path = "../../lib/sdk", version = "*" }
-serde_sjson = { path = "../../lib/serde_sjson", version = "*" }
-serde = { version = "1.0.147", features = ["derive"] }
 minijinja = { workspace = true }
-tokio-stream = { version = "0.1.11", features = ["fs", "io-util"] }
+nanorand = { workspace = true }
-tokio = { version = "1.21.2", features = ["rt-multi-thread", "fs", "process", "macros", "tracing", "io-util", "io-std"] }
+notify = { workspace = true }
-tracing-error = "0.2.0"
+oodle = { workspace = true }
-tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
+path-clean = { workspace = true }
-tracing = { version = "0.1.37", features = ["async-await"] }
+path-slash = { workspace = true }
+pin-project-lite = { workspace = true }
+promptly = { workspace = true }
+sdk = { workspace = true }
+serde = { workspace = true }
+serde_sjson = { workspace = true }
+tokio = { workspace = true }
+tokio-stream = { workspace = true }
+tracing = { workspace = true }
+tracing-error = { workspace = true }
+tracing-subscriber = { workspace = true }
 zip = { workspace = true }
-path-clean = "1.0.1"
+
-path-slash = "0.2.1"
+# Cannot be a workspace dependencies when it's optional
-async-recursion = "1.0.2"
-notify = "6.1.1"
-luajit2-sys = { path = "../../lib/luajit2-sys", version = "*" }
 shlex = { version = "1.2.0", optional = true }
 
 [dev-dependencies]

lib/color-eyre

@@ -1 +1 @@
-Subproject commit b40962a61c748756d7da293d9fff26aca019603e
+Subproject commit 228b8ca37ee79ab9afa45c40da415e4dcb029751

lib/dtmt-shared/Cargo.toml

@@ -6,11 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ansi_term = "0.12.1"
+ansi_term = { workspace = true }
-color-eyre = "0.6.2"
+color-eyre = { workspace = true }
-serde = "1.0.152"
+serde = { workspace = true }
-steamlocate = "2.0.0-beta.2"
+steamlocate = { workspace = true }
-time = { version = "0.3.19", features = ["formatting", "local-offset", "macros"] }
+time = { workspace = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
-tracing-error = "0.2.0"
+tracing-error = { workspace = true }
-tracing-subscriber = "0.3.16"
+tracing-subscriber = { workspace = true }

lib/luajit2-sys

@@ -1 +1 @@
-Subproject commit 5d1a075742395f767c79d9c0d7466c6fb442f106
+Subproject commit 6d94a4dd2c296bf1f044ee4c70fb10dca4c1c241

lib/oodle/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-color-eyre = "0.6.2"
+color-eyre = { workspace = true }
-tracing = "0.1.37"
+tracing = { workspace = true }
 
 [build-dependencies]
-bindgen = "0.69.4"
+bindgen = "0.70.1"

lib/oodle/src/lib.rs

@@ -7,6 +7,7 @@ use std::ptr;
 use color_eyre::{eyre, Result};
 
 #[allow(dead_code)]
+#[allow(clippy::identity_op)]
 mod bindings {
     include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 }

lib/sdk/Cargo.toml

@@ -4,23 +4,23 @@ version = "0.3.0"
 edition = "2021"
 
 [dependencies]
-bitflags = "2.5.0"
+async-recursion = { workspace = true }
-byteorder = "1.4.3"
+bitflags = { workspace = true }
-color-eyre = "0.6.2"
+byteorder = { workspace = true }
-csv-async = { version = "1.2.4", features = ["tokio", "serde"] }
+color-eyre = { workspace = true }
-fastrand = "2.1.0"
+csv-async = { workspace = true }
-futures = "0.3.25"
+fastrand = { workspace = true }
-futures-util = "0.3.24"
+futures = { workspace = true }
-glob = "0.3.0"
+futures-util = { workspace = true }
-nanorand = "0.7.0"
+glob = { workspace = true }
-pin-project-lite = "0.2.9"
+luajit2-sys = { workspace = true }
-serde = { version = "1.0.147", features = ["derive"] }
+nanorand = { workspace = true }
-serde_sjson = { path = "../../lib/serde_sjson", version = "*" }
+oodle = { workspace = true }
-oodle = { path = "../../lib/oodle", version = "*" }
+path-slash = { workspace = true }
-tokio = { version = "1.21.2", features = ["rt-multi-thread", "fs", "process", "macros", "tracing", "io-util", "io-std"] }
+pin-project-lite = { workspace = true }
-tokio-stream = { version = "0.1.11", features = ["fs", "io-util"] }
+serde = { workspace = true }
-tracing = { version = "0.1.37", features = ["async-await"] }
+serde_sjson = { workspace = true }
-tracing-error = "0.2.0"
+tokio = { workspace = true }
-luajit2-sys = { path = "../../lib/luajit2-sys", version = "*" }
+tokio-stream = { workspace = true }
-async-recursion = "1.0.2"
+tracing = { workspace = true }
-path-slash = "0.2.1"
+tracing-error = { workspace = true }