Update soon-to-be incompatible dependencies (#3315)

* utils/cargo: Bump `wezterm` dependency

to 0.22.0 which, according to [their changelog][1], doesn't introduce
any changes at all over the previously used 0.20.0. It does, however,
update some of its' dependencies allowing us to update the transitive
deps `nom v5.1.2` and `terminfo v0.7.3`, which have caused warnings
during build/installation for quite some time now.

[1]: https://github.com/wez/wezterm/blob/main/termwiz/CHANGELOG.md

* server/cargo: Bump `daemonize` dependency

to v0.5.0, which eliminates a future-compat warning that has been around
for a while now. It doesn't state changes in the Changelog that we
should be aware of and doesn't cause apparent breakage during builds
either.

* utils/cargo: Sort dependencies alphabetically.

* CHANGELOG: Add PR #3315.

* server/lib: Convert bitmask to u32

to avoid type conversion issues on MacOS builds.
This commit is contained in:
har7an 2024-05-18 11:59:14 +00:00 committed by GitHub
parent 78b3909112
commit 64a5ac095c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 363 additions and 193 deletions

View File

@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [Unreleased] ## [Unreleased]
* feat(layouts): allow consuming a layout through a url (https://github.com/zellij-org/zellij/pull/3351) * feat(layouts): allow consuming a layout through a url (https://github.com/zellij-org/zellij/pull/3351)
* dependencies: eliminate future incompatibility warnings (https://github.com/zellij-org/zellij/pull/3315)
## [0.40.1] - 2024-05-02 ## [0.40.1] - 2024-05-02
* fix(sessions): issue where sessions would occasionally become unresponsive (https://github.com/zellij-org/zellij/pull/3281) * fix(sessions): issue where sessions would occasionally become unresponsive (https://github.com/zellij-org/zellij/pull/3281)

521
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@ ansi_term = "0.12.1"
async-trait = "0.1.50" async-trait = "0.1.50"
base64 = "0.13.0" base64 = "0.13.0"
byteorder = "1.4.3" byteorder = "1.4.3"
daemonize = "0.4.1" daemonize = "0.5"
serde_json = "1.0" serde_json = "1.0"
unicode-width = "0.1.8" unicode-width = "0.1.8"
url = "2.2.2" url = "2.2.2"

View File

@ -288,7 +288,7 @@ pub fn start_server(mut os_input: Box<dyn ServerOsApi>, socket_path: PathBuf) {
umask(current_umask); umask(current_umask);
daemonize::Daemonize::new() daemonize::Daemonize::new()
.working_directory(std::env::current_dir().unwrap()) .working_directory(std::env::current_dir().unwrap())
.umask(current_umask.bits()) .umask(current_umask.bits() as u32)
.start() .start()
.expect("could not daemonize the server process"); .expect("could not daemonize the server process");

View File

@ -11,43 +11,43 @@ include = ["src/**/*", "assets/"]
[dependencies] [dependencies]
anyhow = { version = "1.0.70", features = ["backtrace"] } anyhow = { version = "1.0.70", features = ["backtrace"] }
async-channel = "1.8.0"
backtrace = "0.3.55" backtrace = "0.3.55"
rmp-serde = "1.1.0"
clap = { version = "3.2.2", features = ["derive", "env"] } clap = { version = "3.2.2", features = ["derive", "env"] }
clap_complete = "3.2.1" clap_complete = "3.2.1"
colored = "2.0.0" colored = "2.0.0"
colorsys = "0.6.5" colorsys = "0.6.5"
common-path = "1.0.0"
crossbeam = "0.8.1" crossbeam = "0.8.1"
directories = "5.0" directories = "5.0"
include_dir = "0.7.3"
kdl = { version = "4.5.0", features = ["span"] }
lazy_static = "1.4.0" lazy_static = "1.4.0"
libc = "0.2" libc = "0.2"
log = "0.4.17"
miette = { version = "5.7.0", features = ["fancy"] }
nix = "0.23.1" nix = "0.23.1"
once_cell = "1.8.0" once_cell = "1.8.0"
percent-encoding = "2.1.0" percent-encoding = "2.1.0"
prost = "0.11.9"
regex = "1.5.5"
rmp-serde = "1.1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
shellexpand = "3.0.0"
strip-ansi-escapes = "0.1.0" strip-ansi-escapes = "0.1.0"
strum = "0.20.0" strum = "0.20.0"
strum_macros = "0.20.1" strum_macros = "0.20.1"
thiserror = "1.0.30"
url = { version = "2.2.2", features = ["serde"] }
vte = { version = "0.11.0", default-features = false }
log = "0.4.17"
unicode-width = "0.1.8"
miette = { version = "5.7.0", features = ["fancy"] }
regex = "1.5.5"
tempfile = "3.2.0" tempfile = "3.2.0"
kdl = { version = "4.5.0", features = ["span"] } thiserror = "1.0.30"
shellexpand = "3.0.0" unicode-width = "0.1.8"
url = { version = "2.2.2", features = ["serde"] }
uuid = { version = "1.4.1", features = ["serde", "v4"] } uuid = { version = "1.4.1", features = ["serde", "v4"] }
async-channel = "1.8.0" vte = { version = "0.11.0", default-features = false }
include_dir = "0.7.3"
prost = "0.11.9"
common-path = "1.0.0"
#[cfg(not(target_family = "wasm"))] #[cfg(not(target_family = "wasm"))]
[target.'cfg(not(target_family = "wasm"))'.dependencies] [target.'cfg(not(target_family = "wasm"))'.dependencies]
termwiz = "0.20.0" termwiz = "0.22"
log4rs = "1.2.0" log4rs = "1.2.0"
signal-hook = "0.3" signal-hook = "0.3"
interprocess = "1.2.1" interprocess = "1.2.1"