diff --git a/Cargo.lock b/Cargo.lock index bfae154b..57682c79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -548,9 +548,9 @@ dependencies = [ [[package]] name = "bluer" -version = "0.15.7" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d76ba39a871348200bbbf7dbff9fbaec30f0b988420f7391bfd9fdc5f8b5144" +checksum = "ce636932455607d7227fa44d2c6b888a9f5f48e11c0e95fc4d0d793aac71fb98" dependencies = [ "custom_debug", "dbus", @@ -563,8 +563,8 @@ dependencies = [ "libc", "log", "macaddr", - "nix 0.26.4", - "num-derive", + "nix 0.27.1", + "num-derive 0.4.2", "num-traits", "pin-project", "serde", @@ -852,17 +852,17 @@ dependencies = [ "cosmic-protocols", "futures", "futures-util", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", - "itertools 0.12.1", + "i18n-embed", + "i18n-embed-fl", + "itertools", "libcosmic", "log", - "nix 0.26.4", + "nix 0.28.0", "once_cell", "rand", "ron", - "rust-embed 6.8.1", - "rust-embed-utils 7.8.1", + "rust-embed", + "rust-embed-utils", "serde", "switcheroo-control", "tokio", @@ -879,14 +879,14 @@ name = "cosmic-applet-audio" version = "0.1.1" dependencies = [ "cosmic-time", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", + "i18n-embed", + "i18n-embed-fl", "libcosmic", "libpulse-binding", "libpulse-glib-binding", "mpris2-zbus", - "rust-embed 6.8.1", - "rust-embed-utils 7.8.1", + "rust-embed", + "rust-embed-utils", "serde", "tokio", "tracing", @@ -904,12 +904,12 @@ dependencies = [ "cosmic-time", "drm", "futures", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", + "i18n-embed", + "i18n-embed-fl", "libcosmic", "log", "once_cell", - "rust-embed 6.8.1", + "rust-embed", "tokio", "tracing", "tracing-log", @@ -927,14 +927,14 @@ dependencies = [ "cosmic-time", "futures", "futures-util", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", - "itertools 0.10.5", + "i18n-embed", + "i18n-embed-fl", + "itertools", "libcosmic", "log", "once_cell", "rand", - "rust-embed 6.8.1", + "rust-embed", "slotmap", "tokio", "tracing", @@ -947,15 +947,15 @@ name = "cosmic-applet-minimize" version = "0.1.1" dependencies = [ "anyhow", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", + "i18n-embed", + "i18n-embed-fl", "image", "libcosmic", "memmap2 0.9.4", "once_cell", "png", - "rust-embed 6.8.1", - "rust-embed-utils 7.8.1", + "rust-embed", + "rust-embed-utils", "rustix 0.38.31", "tempfile", "tokio", @@ -973,13 +973,13 @@ dependencies = [ "cosmic-time", "futures", "futures-util", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", - "itertools 0.10.5", + "i18n-embed", + "i18n-embed-fl", + "itertools", "libcosmic", "log", - "rust-embed 6.8.1", - "rust-embed-utils 7.8.1", + "rust-embed", + "rust-embed-utils", "slotmap", "tokio", "tracing", @@ -997,13 +997,13 @@ dependencies = [ "cosmic-notifications-config", "cosmic-notifications-util", "cosmic-time", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", + "i18n-embed", + "i18n-embed-fl", "libcosmic", - "nix 0.26.4", + "nix 0.28.0", "ron", - "rust-embed 6.8.1", - "rust-embed-utils 7.8.1", + "rust-embed", + "rust-embed-utils", "sendfd", "tokio", "tracing", @@ -1017,17 +1017,17 @@ dependencies = [ name = "cosmic-applet-power" version = "0.1.0" dependencies = [ - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", + "i18n-embed", + "i18n-embed-fl", "icon-loader", "libcosmic", "libpulse-binding", "libpulse-glib-binding", "logind-zbus", - "nix 0.26.4", + "nix 0.28.0", "once_cell", - "rust-embed 6.8.1", - "rust-embed-utils 7.8.1", + "rust-embed", + "rust-embed-utils", "tokio", "tracing", "tracing-log", @@ -1058,11 +1058,11 @@ dependencies = [ "cosmic-comp-config", "cosmic-protocols", "cosmic-time", - "i18n-embed 0.14.1", - "i18n-embed-fl 0.7.0", + "i18n-embed", + "i18n-embed-fl", "libcosmic", "once_cell", - "rust-embed 8.3.0", + "rust-embed", "tokio", "tracing", "tracing-log", @@ -1074,13 +1074,13 @@ name = "cosmic-applet-time" version = "0.1.0" dependencies = [ "chrono", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", + "i18n-embed", + "i18n-embed-fl", "icon-loader", "libcosmic", - "nix 0.26.4", + "nix 0.28.0", "once_cell", - "rust-embed 6.8.1", + "rust-embed", "tokio", "tracing", "tracing-log", @@ -1095,12 +1095,12 @@ dependencies = [ "cosmic-client-toolkit", "cosmic-protocols", "futures", - "i18n-embed 0.13.9", - "i18n-embed-fl 0.6.7", + "i18n-embed", + "i18n-embed-fl", "libcosmic", - "nix 0.27.1", + "nix 0.28.0", "once_cell", - "rust-embed 6.8.1", + "rust-embed", "tokio", "tracing", "tracing-log", @@ -1407,21 +1407,24 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "custom_debug" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89e0ae2c2a42be29595d05c50e3ce6096c0698a97e021c3289790f0750cc8e2" +checksum = "14e715bf0e503e909c7076c052e39dd215202e8edeb32f1c194fd630c314d256" dependencies = [ "custom_debug_derive", ] [[package]] name = "custom_debug_derive" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f3941234c9f62ceaa2782974827749de9b0a8a6487275a278da068e1baf7" +checksum = "f731440b39c73910e253cb465ec1fac97732b3c7af215639881ec0c2a38f4f69" dependencies = [ + "darling 0.20.8", + "itertools", "proc-macro2", - "syn 1.0.109", + "quote", + "syn 2.0.52", "synstructure", ] @@ -2691,28 +2694,6 @@ dependencies = [ "unic-langid", ] -[[package]] -name = "i18n-embed" -version = "0.13.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" -dependencies = [ - "arc-swap", - "fluent", - "fluent-langneg", - "fluent-syntax", - "i18n-embed-impl", - "intl-memoizer", - "lazy_static", - "locale_config", - "log", - "parking_lot 0.12.1", - "rust-embed 6.8.1", - "thiserror", - "unic-langid", - "walkdir", -] - [[package]] name = "i18n-embed" version = "0.14.1" @@ -2729,7 +2710,7 @@ dependencies = [ "locale_config", "log", "parking_lot 0.12.1", - "rust-embed 8.3.0", + "rust-embed", "thiserror", "unic-langid", "walkdir", @@ -2737,37 +2718,16 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.6.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +checksum = "8241a781f49e923415e106fcd1f89c3fab92cc9f699a521c56e95dee273903d3" dependencies = [ "dashmap", "find-crate", "fluent", "fluent-syntax", "i18n-config", - "i18n-embed 0.13.9", - "lazy_static", - "proc-macro-error", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.52", - "unic-langid", -] - -[[package]] -name = "i18n-embed-fl" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" -dependencies = [ - "dashmap", - "find-crate", - "fluent", - "fluent-syntax", - "i18n-config", - "i18n-embed 0.14.1", + "i18n-embed", "lazy_static", "proc-macro-error", "proc-macro2", @@ -2929,7 +2889,7 @@ dependencies = [ "iced_graphics", "iced_runtime", "iced_style", - "itertools 0.12.1", + "itertools", "lazy_static", "raw-window-handle 0.6.0", "smithay-client-toolkit", @@ -3149,15 +3109,6 @@ version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -3360,7 +3311,7 @@ dependencies = [ "bitflags 1.3.2", "libc", "libpulse-sys", - "num-derive", + "num-derive 0.3.3", "num-traits", "winapi", ] @@ -3395,7 +3346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" dependencies = [ "libc", - "num-derive", + "num-derive 0.3.3", "num-traits", "pkg-config", "winapi", @@ -3697,7 +3648,6 @@ dependencies = [ "cfg-if", "libc", "memoffset 0.7.1", - "pin-utils", ] [[package]] @@ -3711,6 +3661,18 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "cfg_aliases 0.1.1", + "libc", +] + [[package]] name = "notify" version = "6.1.1" @@ -3791,6 +3753,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -4567,38 +4540,14 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" -[[package]] -name = "rust-embed" -version = "6.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" -dependencies = [ - "rust-embed-impl 6.8.1", - "rust-embed-utils 7.8.1", - "walkdir", -] - [[package]] name = "rust-embed" version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" dependencies = [ - "rust-embed-impl 8.3.0", - "rust-embed-utils 8.3.0", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "6.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils 7.8.1", - "syn 2.0.52", + "rust-embed-impl", + "rust-embed-utils", "walkdir", ] @@ -4610,21 +4559,11 @@ checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" dependencies = [ "proc-macro2", "quote", - "rust-embed-utils 8.3.0", + "rust-embed-utils", "syn 2.0.52", "walkdir", ] -[[package]] -name = "rust-embed-utils" -version = "7.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" -dependencies = [ - "sha2", - "walkdir", -] - [[package]] name = "rust-embed-utils" version = "8.3.0" @@ -5038,24 +4977,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] @@ -5117,14 +5056,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "unicode-xid", + "syn 2.0.52", ] [[package]] @@ -6407,9 +6345,9 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] name = "zbus" -version = "3.15.2" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "5acecd3f8422f198b1a2f954bcc812fe89f3fa4281646f3da1da7925db80085d" dependencies = [ "async-broadcast", "async-executor", @@ -6449,9 +6387,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "2207eb71efebda17221a579ca78b45c4c5f116f074eb745c3a172e688ccf89f5" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -6509,9 +6447,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.2" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "c5b4fcf3660d30fc33ae5cd97e2017b23a96e85afd7a1dd014534cd0bf34ba67" dependencies = [ "byteorder", "enumflags2", @@ -6524,9 +6462,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "0277758a8a0afc0e573e80ed5bfd9d9c2b48bd3108ffe09384f9f738c83f4a55" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -6537,9 +6475,9 @@ dependencies = [ [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 479e888b..7008aca8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ members = [ resolver = "2" [workspace.dependencies] -anyhow = "1.0.79" +anyhow = "1.0.81" cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e65fa5e" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [ "client", @@ -29,7 +29,10 @@ cosmic-time = { git = "https://github.com/pop-os/cosmic-time", default-features "libcosmic", "once_cell", ] } - +futures = "0.3" +futures-util = "0.3" +i18n-embed = { version = "0.14.1", features = ["fluent-system", "desktop-requester"] } +i18n-embed-fl = "0.8" libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [ "applet", "applet-token", @@ -38,7 +41,10 @@ libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = fa "desktop", "dbus-config", ] } -zbus = { version = "3.14", default-features = false, features = ["tokio"] } +nix = { version = "0.28.0", features = ["user"] } +rust-embed = "8.3" +rust-embed-utils = "8.3.0" +zbus = { version = "3.15", default-features = false, features = ["tokio"] } tracing = "0.1" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } tracing-log = "0.2.0" diff --git a/cosmic-app-list/Cargo.toml b/cosmic-app-list/Cargo.toml index ea8bbc93..5285b1fc 100644 --- a/cosmic-app-list/Cargo.toml +++ b/cosmic-app-list/Cargo.toml @@ -5,28 +5,28 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +anyhow.workspace = true cctk.workspace = true cosmic-protocols.workspace = true +futures-util.workspace = true +futures.workspace = true +i18n-embed.workspace = true +i18n-embed-fl.workspace = true +itertools = "0.12.1" libcosmic.workspace = true -zbus.workspace = true -ron = "0.8" -futures = "0.3" -futures-util = "0.3" -once_cell = "1.9" -xdg = "2.4" -tracing-subscriber.workspace = true -tracing-log.workspace = true -tracing.workspace = true -nix = "0.26" -anyhow = "1.0" -serde = { version = "1.0", features = ["derive"] } log = "0.4" -tokio = { version = "1.17.0", features = ["sync", "rt", "rt-multi-thread", "macros", "process"] } -itertools = "*" -i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6" -rust-embed = "6.3" -url = "2.3.1" -rust-embed-utils = "7.5.0" +nix.workspace = true +once_cell = "1.19" rand = "0.8.5" -switcheroo-control = { git = "https://github.com/pop-os/dbus-settings-bindings" } \ No newline at end of file +ron = "0.8" +rust-embed.workspace = true +rust-embed-utils.workspace = true +serde = { version = "1.0", features = ["derive"] } +switcheroo-control = { git = "https://github.com/pop-os/dbus-settings-bindings" } +tokio = { version = "1.36.0", features = ["sync", "rt", "rt-multi-thread", "macros", "process"] } +tracing-log.workspace = true +tracing-subscriber.workspace = true +tracing.workspace = true +url = "2.5.0" +xdg = "2.5" +zbus.workspace = true diff --git a/cosmic-applet-audio/Cargo.toml b/cosmic-applet-audio/Cargo.toml index 9ab62adc..14aa9eb0 100644 --- a/cosmic-applet-audio/Cargo.toml +++ b/cosmic-applet-audio/Cargo.toml @@ -6,21 +6,20 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +cosmic-time.workspace = true +i18n-embed-fl.workspace = true +i18n-embed.workspace = true +libcosmic.workspace = true libpulse-binding = "2.28.1" libpulse-glib-binding = "2.28.1" -tokio = { version = "1.20.1", features=["full"] } -libcosmic.workspace = true -cosmic-time.workspace = true -tracing.workspace = true -tracing-subscriber.workspace = true -tracing-log.workspace = true -# Application i18n -i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6" -rust-embed = "6.6" -rust-embed-utils = "7.5.0" mpris2-zbus = { git = "https://github.com/pop-os/dbus-settings-bindings" } -serde = "1.0.130" +rust-embed-utils.workspace = true +rust-embed.workspace = true +serde = "1.0.197" +tokio = { version = "1.36.0", features=["full"] } +tracing-log.workspace = true +tracing-subscriber.workspace = true +tracing.workspace = true url = "2" -zbus.workspace = true urlencoding = "2.1.3" +zbus.workspace = true diff --git a/cosmic-applet-battery/Cargo.toml b/cosmic-applet-battery/Cargo.toml index 6ad00010..9e0c5ee1 100644 --- a/cosmic-applet-battery/Cargo.toml +++ b/cosmic-applet-battery/Cargo.toml @@ -4,19 +4,18 @@ version = "0.1.0" edition = "2021" [dependencies] -once_cell = "1.16.0" -libcosmic.workspace = true cosmic-time.workspace = true -tracing.workspace = true -futures = "0.3" -zbus.workspace = true +drm = "0.11.1" +futures.workspace = true +i18n-embed-fl.workspace = true +i18n-embed.workspace = true +libcosmic.workspace = true log = "0.4" -tracing-subscriber.workspace = true +once_cell = "1.19.0" +rust-embed.workspace = true +tokio = { version = "1.36.0", features = ["sync", "rt", "rt-multi-thread", "fs", "macros"] } tracing-log.workspace = true -# Application i18n -i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6.4" -rust-embed = "6.3.0" -tokio = { version = "1.17.0", features = ["sync", "rt", "rt-multi-thread", "fs", "macros"] } +tracing-subscriber.workspace = true +tracing.workspace = true udev = "0.8" -drm = "0.11.1" \ No newline at end of file +zbus.workspace = true diff --git a/cosmic-applet-bluetooth/Cargo.toml b/cosmic-applet-bluetooth/Cargo.toml index 0a0912b7..6d1f0c9d 100644 --- a/cosmic-applet-bluetooth/Cargo.toml +++ b/cosmic-applet-bluetooth/Cargo.toml @@ -5,22 +5,21 @@ edition = "2021" license = "GPL-3.0-or-later" [dependencies] -once_cell = "1.16.0" -bluer = { version = "0.15", features = ["bluetoothd", "id"] } -futures-util = "0.3.21" -libcosmic.workspace = true +anyhow.workspace = true +bluer = { version = "0.17", features = ["bluetoothd", "id"] } cosmic-time.workspace = true -futures = "0.3" +futures.workspace = true +futures-util.workspace = true +i18n-embed-fl.workspace = true +i18n-embed.workspace = true +itertools = "0.12.1" +libcosmic.workspace = true log = "0.4" -tracing.workspace = true +once_cell = "1.19.0" +rand = "0.8" +rust-embed.workspace = true +slotmap = "1.0.7" +tokio = { version = "1.36.0", features = ["full"] } tracing-log.workspace = true tracing-subscriber.workspace = true -itertools = "0.10.3" -slotmap = "1.0.6" -tokio = { version = "1.15.0", features = ["full"] } -anyhow = "1.0" -# Application i18n -i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6.4" -rust-embed = "6.3.0" -rand = "0.8" +tracing.workspace = true diff --git a/cosmic-applet-minimize/Cargo.toml b/cosmic-applet-minimize/Cargo.toml index ec513b60..a534f472 100644 --- a/cosmic-applet-minimize/Cargo.toml +++ b/cosmic-applet-minimize/Cargo.toml @@ -7,19 +7,18 @@ edition = "2021" [dependencies] anyhow.workspace = true +i18n-embed-fl.workspace = true +i18n-embed.workspace = true image = "0.24" libcosmic.workspace = true -memmap2 = "0.9.0" -rustix = { version = "0.38.0", features = ["fs"] } -png = "0.17.5" -tokio = { version = "1.17.0", features = ["sync", "macros"] } -tracing.workspace = true -tracing-subscriber.workspace = true -tracing-log.workspace = true -tempfile = "3.5.0" -# Application i18n -i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6" -rust-embed = "6.6" -rust-embed-utils = "7.5.0" +memmap2 = "0.9.4" once_cell = "1" +png = "0.17.13" +rust-embed-utils.workspace = true +rust-embed.workspace = true +rustix = { version = "0.38.31", features = ["fs"] } +tempfile = "3.10.1" +tokio = { version = "1.36.0", features = ["sync", "macros"] } +tracing-log.workspace = true +tracing-subscriber.workspace = true +tracing.workspace = true diff --git a/cosmic-applet-network/Cargo.toml b/cosmic-applet-network/Cargo.toml index 76c70f7e..a2a1e39a 100644 --- a/cosmic-applet-network/Cargo.toml +++ b/cosmic-applet-network/Cargo.toml @@ -5,24 +5,22 @@ edition = "2021" license = "GPL-3.0-or-later" [dependencies] + +anyhow.workspace = true cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings" } -# cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" } -futures-util = "0.3.21" -libcosmic.workspace = true cosmic-time.workspace = true -futures = "0.3" -zbus.workspace = true +futures.workspace = true +futures-util.workspace = true +i18n-embed-fl.workspace = true +i18n-embed.workspace = true +itertools = "0.12.1" +libcosmic.workspace = true log = "0.4" -tracing.workspace = true +rust-embed-utils.workspace = true +rust-embed.workspace = true +slotmap = "1.0.7" +tokio = { version = "1.36.0", features = ["full"] } tracing-log.workspace = true tracing-subscriber.workspace = true -itertools = "0.10.3" -slotmap = "1.0.6" -tokio = { version = "1.15.0", features = ["full"] } -anyhow.workspace = true -# Application i18n -i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6.4" -rust-embed = "6.3.0" -rust-embed-utils = "7.5.0" - +tracing.workspace = true +zbus.workspace = true diff --git a/cosmic-applet-notifications/Cargo.toml b/cosmic-applet-notifications/Cargo.toml index 5c707c15..3a1a2aa7 100644 --- a/cosmic-applet-notifications/Cargo.toml +++ b/cosmic-applet-notifications/Cargo.toml @@ -6,10 +6,10 @@ license = "GPL-3.0-or-later" [dependencies] anyhow.workspace = true -libcosmic.workspace = true cosmic-time.workspace = true -nix = "0.26" -tokio = { version = "1.24.1", features = [ +libcosmic.workspace = true +nix.workspace = true +tokio = { version = "1.36.0", features = [ "sync", "rt", "tracing", @@ -18,23 +18,17 @@ tokio = { version = "1.24.1", features = [ "io-util", "io-std", ] } -cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" } -cosmic-notifications-config = { git = "https://github.com/pop-os/cosmic-notifications" } -# cosmic-notifications-util = { path = "../../cosmic-notifications-daemon/cosmic-notifications-util" } -# cosmic-notifications-config = { path = "../../cosmic-notifications-daemon/cosmic-notifications-config" } -tracing.workspace = true -tracing-subscriber.workspace = true -tracing-log.workspace = true -ron = "0.8" -sendfd = { version = "0.4", features = ["tokio"] } bytemuck = "1" +cosmic-notifications-config = { git = "https://github.com/pop-os/cosmic-notifications" } +cosmic-notifications-util = { git = "https://github.com/pop-os/cosmic-notifications" } +i18n-embed-fl.workspace = true +i18n-embed.workspace = true +ron = "0.8" +rust-embed-utils.workspace = true +rust-embed.workspace = true +sendfd = { version = "0.4", features = ["tokio"] } +tracing-log.workspace = true +tracing-subscriber.workspace = true +tracing.workspace = true +url = "2.5.0" zbus.workspace = true -# Application i18n -i18n-embed = { version = "0.13.4", features = [ - "fluent-system", - "desktop-requester", -] } -i18n-embed-fl = "0.6.4" -rust-embed = "6.3.0" -rust-embed-utils = "7.5.0" -url = "2.4.0" diff --git a/cosmic-applet-power/Cargo.toml b/cosmic-applet-power/Cargo.toml index d8130fd4..39b5d1c0 100644 --- a/cosmic-applet-power/Cargo.toml +++ b/cosmic-applet-power/Cargo.toml @@ -5,21 +5,19 @@ edition = "2021" license = "GPL-3.0-or-later" [dependencies] +i18n-embed-fl.workspace = true +i18n-embed.workspace = true icon-loader = { version = "0.3.6", features = ["gtk"] } -libpulse-binding = "2.26.0" -libpulse-glib-binding = "2.25.0" -tokio = { version = "1.20.1", features=["full"] } libcosmic.workspace = true -# cosmic-applet = { path = "../applet" } -nix = "0.26.2" -zbus.workspace = true +libpulse-binding = "2.28.1" +libpulse-glib-binding = "2.28.1" logind-zbus = "3.1" -# Application i18n -i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6" -rust-embed = "6.6" -rust-embed-utils = "7.5.0" -once_cell = "1.17.1" -tracing.workspace = true +nix.workspace = true +once_cell = "1.19.0" +rust-embed-utils.workspace = true +rust-embed.workspace = true +tokio = { version = "1.36.0", features=["full"] } +tracing-log.workspace = true tracing-subscriber.workspace = true -tracing-log.workspace = true \ No newline at end of file +tracing.workspace = true +zbus.workspace = true diff --git a/cosmic-applet-status-area/Cargo.toml b/cosmic-applet-status-area/Cargo.toml index 9f13c232..387e7c8a 100644 --- a/cosmic-applet-status-area/Cargo.toml +++ b/cosmic-applet-status-area/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" license = "GPL-3.0-or-later" [dependencies] -futures = "0.3" +futures.workspace = true libcosmic.workspace = true serde = "1" -tokio = { version = "1.23.0" } +tokio = { version = "1.36.0" } tracing.workspace = true tracing-log.workspace = true tracing-subscriber.workspace = true diff --git a/cosmic-applet-tiling/Cargo.toml b/cosmic-applet-tiling/Cargo.toml index 0dd50a86..dafc4d57 100644 --- a/cosmic-applet-tiling/Cargo.toml +++ b/cosmic-applet-tiling/Cargo.toml @@ -8,24 +8,16 @@ edition = "2021" [dependencies] libcosmic.workspace = true -libcosmic.features = [ - "applet", - "applet-token", - "dbus-config", - "desktop", - "tokio", - "wayland", -] -cosmic-time.workspace = true +anyhow.workspace = true cctk.workspace = true -cosmic-protocols.workspace = true -anyhow = "1.0.79" -once_cell = "1" -i18n-embed = { version = "0.14.0", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.7.0" -rust-embed = "8.0.0" -tracing.workspace = true -tracing-subscriber.workspace = true -tracing-log.workspace = true cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp.git", rev = "5eb5af4" } -tokio = { version = "1.17.0", features = ["sync", "rt"] } +cosmic-protocols.workspace = true +cosmic-time.workspace = true +i18n-embed-fl.workspace = true +i18n-embed.workspace = true +once_cell = "1" +rust-embed.workspace = true +tokio = { version = "1.36.0", features = ["sync", "rt"] } +tracing-log.workspace = true +tracing-subscriber.workspace = true +tracing.workspace = true diff --git a/cosmic-applet-time/Cargo.toml b/cosmic-applet-time/Cargo.toml index 18e33afd..24781735 100644 --- a/cosmic-applet-time/Cargo.toml +++ b/cosmic-applet-time/Cargo.toml @@ -5,17 +5,15 @@ edition = "2021" license = "GPL-3.0-or-later" [dependencies] +chrono = { version = "0.4.35", features = ["clock"] } +i18n-embed-fl.workspace = true +i18n-embed.workspace = true icon-loader = { version = "0.3.6", features = ["gtk"] } libcosmic.workspace = true -nix = "0.26.2" -chrono = { version = "0.4.34", features = ["clock"] } +nix.workspace = true once_cell = "1" +rust-embed.workspace = true tokio = { version = "1.36.0", features = ["time"] } -tracing.workspace = true tracing-log.workspace = true tracing-subscriber.workspace = true - -# Application i18n -i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6.4" -rust-embed = "6.3.0" +tracing.workspace = true diff --git a/cosmic-applet-workspaces/Cargo.toml b/cosmic-applet-workspaces/Cargo.toml index 8c01a8b4..a57b94af 100644 --- a/cosmic-applet-workspaces/Cargo.toml +++ b/cosmic-applet-workspaces/Cargo.toml @@ -8,16 +8,15 @@ edition = "2021" libcosmic.workspace = true cctk.workspace = true cosmic-protocols.workspace = true -nix = "0.27.1" +nix.workspace = true tracing.workspace = true tracing-subscriber.workspace = true tracing-log.workspace = true -once_cell = "1.9" -futures = "0.3.21" -xdg = "2.4.0" +once_cell = "1.19" +futures.workspace = true +xdg = "2.5.2" anyhow.workspace = true -tokio = "1.35" -# Application i18n -i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } -i18n-embed-fl = "0.6.4" -rust-embed = "6.3.0" +tokio = "1.36" +i18n-embed.workspace = true +i18n-embed-fl.workspace = true +rust-embed.workspace = true diff --git a/cosmic-panel-button/Cargo.toml b/cosmic-panel-button/Cargo.toml index 1f20252a..a888d865 100644 --- a/cosmic-panel-button/Cargo.toml +++ b/cosmic-panel-button/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" license = "GPL-3.0-or-later" [dependencies] -freedesktop-desktop-entry = "0.5.0" +freedesktop-desktop-entry = "0.5.1" libcosmic.workspace = true