From 19d326740e7ccc3bdfba3e49321bc495f79f8e1a Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Sun, 7 Apr 2024 13:57:52 -0700 Subject: [PATCH] chore: upgrade komorebi-client to v0.1.23 --- packages/desktop/Cargo.lock | 277 +++++++++++++++++++----------------- packages/desktop/Cargo.toml | 2 +- 2 files changed, 150 insertions(+), 129 deletions(-) diff --git a/packages/desktop/Cargo.lock b/packages/desktop/Cargo.lock index 7a3ba9f7..6859c3da 100644 --- a/packages/desktop/Cargo.lock +++ b/packages/desktop/Cargo.lock @@ -1330,6 +1330,15 @@ dependencies = [ "rustc_version", ] +[[package]] +name = "file-id" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13be71e6ca82e91bc0cb862bebaac0b2d1924a5a1d970c822b2f98b63fda8c3" +dependencies = [ + "winapi-util", +] + [[package]] name = "filetime" version = "0.2.23" @@ -1415,41 +1424,15 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags 1.3.2", - "fsevent-sys", -] - [[package]] name = "fsevent-sys" -version = "2.0.1" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" dependencies = [ "libc", ] -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags 1.3.2", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "futf" version = "0.1.5" @@ -2033,12 +2016,13 @@ dependencies = [ [[package]] name = "hotwatch" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39301670a6f5798b75f36a1b149a379a50df5aa7c71be50f4b41ec6eab445cb8" +checksum = "9140219159163c92eb58c37955a0cc57c5814c3c44521955aae376064c668756" dependencies = [ "log", "notify", + "notify-debouncer-full", ] [[package]] @@ -2226,9 +2210,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.7.1" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ "bitflags 1.3.2", "inotify-sys", @@ -2264,15 +2248,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -2399,8 +2374,8 @@ dependencies = [ [[package]] name = "komorebi" -version = "0.1.22-dev.0" -source = "git+https://github.com/LGUG2Z/komorebi?rev=1a8b6a7398b12b3686b80c6228875a79e7165a26#1a8b6a7398b12b3686b80c6228875a79e7165a26" +version = "0.1.23" +source = "git+https://github.com/LGUG2Z/komorebi?tag=v0.1.23#bea3d1fcbca4356dcdcc91fcb65b35533511247e" dependencies = [ "bitflags 2.4.1", "clap", @@ -2414,7 +2389,7 @@ dependencies = [ "hotwatch", "komorebi-core", "lazy_static", - "miow 0.5.0", + "miow", "nanoid", "net2", "os_info", @@ -2423,7 +2398,7 @@ dependencies = [ "regex", "schemars", "serde", - "serde_json", + "serde_json_lenient", "strum", "sysinfo", "tracing", @@ -2432,28 +2407,28 @@ dependencies = [ "uds_windows", "which", "widestring", - "windows 0.52.0", - "windows-implement", - "windows-interface", + "windows 0.54.0", + "windows-implement 0.53.0", + "windows-interface 0.53.0", "winput", "winreg 0.52.0", ] [[package]] name = "komorebi-client" -version = "0.1.22-dev.0" -source = "git+https://github.com/LGUG2Z/komorebi?rev=1a8b6a7398b12b3686b80c6228875a79e7165a26#1a8b6a7398b12b3686b80c6228875a79e7165a26" +version = "0.1.23" +source = "git+https://github.com/LGUG2Z/komorebi?tag=v0.1.23#bea3d1fcbca4356dcdcc91fcb65b35533511247e" dependencies = [ "komorebi", "komorebi-core", - "serde_json", + "serde_json_lenient", "uds_windows", ] [[package]] name = "komorebi-core" -version = "0.1.22-dev.0" -source = "git+https://github.com/LGUG2Z/komorebi?rev=1a8b6a7398b12b3686b80c6228875a79e7165a26#1a8b6a7398b12b3686b80c6228875a79e7165a26" +version = "0.1.23" +source = "git+https://github.com/LGUG2Z/komorebi?tag=v0.1.23#bea3d1fcbca4356dcdcc91fcb65b35533511247e" dependencies = [ "clap", "color-eyre", @@ -2461,10 +2436,30 @@ dependencies = [ "dunce", "schemars", "serde", - "serde_json", + "serde_json_lenient", "serde_yaml", "strum", - "windows 0.52.0", + "windows 0.54.0", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", ] [[package]] @@ -2699,25 +2694,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", -] - [[package]] name = "mio" version = "0.8.9" @@ -2725,34 +2701,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - [[package]] name = "miow" version = "0.5.0" @@ -2950,20 +2903,34 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "notify" -version = "4.0.17" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", + "crossbeam-channel", "filetime", - "fsevent", "fsevent-sys", "inotify", + "kqueue", "libc", - "mio 0.6.23", - "mio-extras", + "log", + "mio", + "walkdir 2.3.3", + "windows-sys 0.48.0", +] + +[[package]] +name = "notify-debouncer-full" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4812c1eb49be776fb8df4961623bdc01ec9dfdc1abe8211ceb09150a2e64219" +dependencies = [ + "crossbeam-channel", + "file-id", + "notify", + "parking_lot", "walkdir 2.3.3", - "winapi 0.3.9", ] [[package]] @@ -3173,13 +3140,13 @@ dependencies = [ [[package]] name = "os_info" -version = "3.7.0" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", "serde", - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -4046,6 +4013,17 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_json_lenient" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc61c66b53a4035fcce237ef38043f4b2f0ebf918fd0e69541a5166104065581" +dependencies = [ + "itoa 1.0.6", + "ryu", + "serde", +] + [[package]] name = "serde_repr" version = "0.1.12" @@ -4535,7 +4513,7 @@ dependencies = [ "unicode-segmentation", "url", "windows 0.52.0", - "windows-implement", + "windows-implement 0.52.0", "windows-version", "x11-dl", ] @@ -4994,7 +4972,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 0.8.9", + "mio", "num_cpus", "parking_lot", "pin-project-lite", @@ -5609,9 +5587,9 @@ dependencies = [ "webview2-com-macros", "webview2-com-sys", "windows 0.52.0", - "windows-core", - "windows-implement", - "windows-interface", + "windows-core 0.52.0", + "windows-implement 0.52.0", + "windows-interface 0.52.0", ] [[package]] @@ -5633,7 +5611,7 @@ checksum = "d6ad85fceee6c42fa3d61239eba5a11401bf38407a849ed5ea1b407df08cca72" dependencies = [ "thiserror", "windows 0.52.0", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -5726,9 +5704,21 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", - "windows-implement", - "windows-interface", + "windows-core 0.52.0", + "windows-implement 0.52.0", + "windows-interface 0.52.0", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-implement 0.53.0", + "windows-interface 0.53.0", "windows-targets 0.52.4", ] @@ -5741,6 +5731,16 @@ dependencies = [ "windows-targets 0.52.4", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.4", +] + [[package]] name = "windows-implement" version = "0.52.0" @@ -5752,6 +5752,17 @@ dependencies = [ "syn 2.0.32", ] +[[package]] +name = "windows-implement" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "windows-interface" version = "0.52.0" @@ -5763,6 +5774,26 @@ dependencies = [ "syn 2.0.32", ] +[[package]] +name = "windows-interface" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "windows-result" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +dependencies = [ + "windows-targets 0.52.4", +] + [[package]] name = "windows-sys" version = "0.42.0" @@ -6082,21 +6113,11 @@ dependencies = [ "webkit2gtk-sys", "webview2-com", "windows 0.52.0", - "windows-implement", + "windows-implement 0.52.0", "windows-version", "x11-dl", ] -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "x11" version = "2.21.0" diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml index 34557a2a..36454774 100644 --- a/packages/desktop/Cargo.toml +++ b/packages/desktop/Cargo.toml @@ -33,7 +33,7 @@ netdev = "0.24" regex = "1" [target.'cfg(all(target_os = "windows", target_arch = "x86_64"))'.dependencies] -komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", rev = "1a8b6a7398b12b3686b80c6228875a79e7165a26" } +komorebi-client = { git = "https://github.com/LGUG2Z/komorebi", tag = "v0.1.23" } [target.'cfg(target_os = "macos")'.dependencies] cocoa = "0.25"