diff --git a/Cargo.lock b/Cargo.lock index 7beddce..2288e8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "appdirs" @@ -1677,9 +1677,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" dependencies = [ "bytemuck", "byteorder-lite", @@ -1700,9 +1700,9 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f" dependencies = [ "byteorder-lite", "quick-error", @@ -2831,9 +2831,6 @@ name = "rgb" version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" -dependencies = [ - "bytemuck", -] [[package]] name = "rocket" @@ -3193,9 +3190,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -3235,17 +3232,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sha2" version = "0.10.8" @@ -4369,9 +4355,9 @@ dependencies = [ [[package]] name = "zbus" -version = "4.4.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +checksum = "0d17185ff0b54cf0af51da5762f9ccef45b633af5006651669fe90bb97e830f4" dependencies = [ "async-broadcast", "async-executor", @@ -4386,19 +4372,16 @@ dependencies = [ "enumflags2", "event-listener", "futures-core", - "futures-sink", "futures-util", "hex", "nix", "ordered-stream", - "rand", "serde", "serde_repr", - "sha1", "static_assertions", "tracing", "uds_windows", - "windows-sys 0.52.0", + "windows-sys 0.59.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4407,9 +4390,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.4.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +checksum = "ed3ad52bf7d51ef2a7b1bf9bbac6a2ebb8c77c7df297d3246963573d931bd5fd" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4420,9 +4403,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +checksum = "cdc27fbd3593ff015cef906527a2ec4115e2e3dbf6204a24d952ac4975c80614" dependencies = [ "serde", "static_assertions", @@ -4476,22 +4459,23 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.2.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +checksum = "b909387da6d5787949f780919b5149d7f29f2f03f75eb883a67206e780b48fab" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "zvariant_derive", + "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "4.2.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +checksum = "67fb722e4d5e0d88a4c370c17abf3e2323c549d9580b4c2d775f475a45b34307" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4502,11 +4486,14 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +checksum = "05195b9a8930cfccb637b8ff1531404b5e16c5383f8f025078106793e24f9974" dependencies = [ + "nom", "proc-macro2", "quote", + "serde", + "static_assertions", "syn", ] diff --git a/Cargo.toml b/Cargo.toml index 9aa13a1..dd50786 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ name = "awatcher" path = "src/main.rs" [build-dependencies] -image = { version = "0.25.1" } +image = { version = "0.25.4" } [workspace] members = ["watchers"] @@ -21,19 +21,19 @@ members = ["watchers"] version = "0.3.0" [workspace.dependencies] -anyhow = "1.0.89" -log = { version = "0.4.21", features = ["std"] } -tokio = { version = "1.37.0" } -serde = "1.0.202" +anyhow = "1.0.90" +log = { version = "0.4.22", features = ["std"] } +tokio = { version = "1.40.0" } +serde = "1.0.210" [dev-dependencies] rstest = "0.23.0" -tempfile = "3.10.1" +tempfile = "3.13.0" [dependencies] watchers = { path = "./watchers", default-features = false } chrono = "0.4.38" -toml = "0.8.13" +toml = "0.8.19" clap = { version = "4.5.20", features = ["string"] } fern = { version = "0.6.2", features = ["colored"] } log = { workspace = true } @@ -43,7 +43,7 @@ tokio = { workspace = true, features = ["rt", "macros", "signal"] } ksni = {version = "0.2.2", optional = true} aw-server = { git = "https://github.com/ActivityWatch/aw-server-rust", optional = true, rev = "bb787fd" } aw-datastore = { git = "https://github.com/ActivityWatch/aw-server-rust", optional = true, rev = "bb787fd" } -open = { version = "5.1.3", optional = true } +open = { version = "5.3.0", optional = true } serde = { workspace = true, optional = true } [features] diff --git a/watchers/Cargo.toml b/watchers/Cargo.toml index 3e6efe2..9818d4f 100644 --- a/watchers/Cargo.toml +++ b/watchers/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" [dev-dependencies] rstest = "0.23.0" -tempfile = "3.10.1" +tempfile = "3.13.0" [dependencies] aw-client-rust = { git = "https://github.com/ActivityWatch/aw-server-rust", rev = "bb787fd" } @@ -20,18 +20,18 @@ wayland-protocols = { version = "0.31.2", features = ["staging", "client" ]} wayland-protocols-plasma = { version = "0.2.0", features = ["client"] } wayland-protocols-wlr = { version = "0.2.0", features = ["client"] } x11rb = { version = "0.13.1", features = ["screensaver"] } -zbus = {version = "4.2.1", optional = true} +zbus = {version = "5.0.0", optional = true} chrono = "0.4.38" -toml = "0.8.13" +toml = "0.8.19" dirs = "5.0.1" serde = { workspace = true, features = ["derive"] } serde_default = "0.2.0" -serde_json = "1.0.117" -regex = "1.10.4" +serde_json = "1.0.132" +regex = "1.11.0" gethostname = "0.5.0" log = { workspace = true } anyhow = { workspace = true } -async-trait = "0.1.80" +async-trait = "0.1.83" tokio = { workspace = true, features = ["time", "sync", "macros"] } [features] diff --git a/watchers/src/watchers/kwin_window.rs b/watchers/src/watchers/kwin_window.rs index 4baf3f5..1831785 100644 --- a/watchers/src/watchers/kwin_window.rs +++ b/watchers/src/watchers/kwin_window.rs @@ -13,7 +13,7 @@ use std::sync::{mpsc::channel, Arc}; use std::thread; use tokio::sync::Mutex; use zbus::interface; -use zbus::{Connection, ConnectionBuilder}; +use zbus::{Connection, conn::Builder as ConnectionBuilder}; const KWIN_SCRIPT_NAME: &str = "activity_watcher"; const KWIN_SCRIPT: &str = include_str!("kwin_window.js");