Update dependencies, and use workspace dependencies

Using `[workspace.dependencies]`, we can update `rev =` for a dependency
in one place, instead of each individual applet.

Cargo.toml

@@ -17,6 +17,12 @@ members = [
 
 resolver="2"
 
+[workspace.dependencies]
+cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e39748e" }
+cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "e39748e" }
+cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
+libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = ["tokio", "wayland"] }
+
 [profile.release]
 lto = "thin"
 # lto = "fat"

applet/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
 ron = { version = "0.8" }
 serde = { version = "1.0" }
 cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel" }

cosmic-app-list/Cargo.toml

@@ -5,9 +5,9 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "f0cfe09" }
+cctk.workspace = true
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "f0cfe09" }
+cosmic-protocols.workspace = true
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["wayland", "tokio"] }
+libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }
 # libcosmic = { path = "../../libcosmic", default-features = false, features = ["wayland", "tokio"] }
 ron = "0.8"

cosmic-app-list/src/app.rs

@@ -201,7 +201,7 @@ impl DockItem {
                 )
                 .on_right_release(Message::Popup(desktop_info.id.clone())),
             )
-            .on_drag(Message::StartDrag(desktop_info.id.clone()))
+            .on_drag(|_| Message::StartDrag(desktop_info.id.clone()))
             .on_cancelled(Message::DragFinished)
             .on_finished(Message::DragFinished)
         } else {

cosmic-applet-audio/Cargo.toml

@@ -10,8 +10,8 @@ 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 = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
-cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
+cosmic-time.workspace = true
 cosmic-applet = { path = "../applet" }
 log = "0.4.14"
 pretty_env_logger = "0.4.0"

cosmic-applet-battery/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2021"
 
 [dependencies]
 once_cell = "1.16.0"
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
-cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
+cosmic-time.workspace = true
 cosmic-applet = { path = "../applet" }
 futures = "0.3"
 zbus = { version = "3.13", default-features = false, features = ["tokio"] }

cosmic-applet-bluetooth/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later"
 once_cell = "1.16.0"
 bluer = { version = "0.15", features = ["bluetoothd", "id"] }
 futures-util = "0.3.21"
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["wayland", "tokio"] }
+libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }
 futures = "0.3"
 log = "0.4"

cosmic-applet-graphics/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 zbus = "3.13"
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }
 once_cell = "1"
 # Application i18n

cosmic-applet-network/Cargo.toml

@@ -8,8 +8,8 @@ license = "GPL-3.0-or-later"
 cosmic-dbus-networkmanager = { git = "https://github.com/pop-os/dbus-settings-bindings", branch = "main" }
 # cosmic-dbus-networkmanager = { path = "../../../dbus-settings-bindings/networkmanager" }
 futures-util = "0.3.21"
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
-cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
+cosmic-time.workspace = true
 cosmic-applet = { path = "../applet" }
 futures = "0.3"
 zbus = { version = "3.13", default-features = false }

cosmic-applet-notifications/Cargo.toml

@@ -6,7 +6,7 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 icon-loader = { version = "0.3.6", features = ["gtk"] }
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
-cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
+cosmic-time.workspace = true
 cosmic-applet = { path = "../applet" }
 nix = "0.24.1"

cosmic-applet-power/Cargo.toml

@@ -9,7 +9,7 @@ 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 = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }
 nix = "0.26.2"
 zbus = "3.13"

cosmic-applet-time/Cargo.toml

@@ -6,7 +6,7 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 icon-loader = { version = "0.3.6", features = ["gtk"] }
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }
 nix = "0.26.2"
 chrono = { version = "0.4.23", features = ["clock"] }

cosmic-applet-workspaces/Cargo.toml

@@ -5,10 +5,10 @@ authors = ["Ashley Wulber <ashley@system76.com>"]
 edition = "2021"
 
 [dependencies]
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }
-cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, rev = "f0cfe09" }
+cctk.workspace = true
-cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "f0cfe09" }
+cosmic-protocols.workspace = true
 wayland-backend = {version = "0.1.0", features = ["client_system"]}
 wayland-client = {version = "0.30.0"}
 calloop = "0.10.1"

cosmic-applet-workspaces/src/wayland.rs

@@ -1,5 +1,5 @@
 use calloop::channel::*;
-use cosmic_client_toolkit::{
+use cctk::{
     sctk::{
         self,
         output::{OutputHandler, OutputState},
@@ -273,6 +273,6 @@ impl WorkspaceHandler for State {
     }
 }
 
-cosmic_client_toolkit::delegate_workspace!(State);
+cctk::delegate_workspace!(State);
 sctk::delegate_output!(State);
 sctk::delegate_registry!(State);

cosmic-panel-button/Cargo.toml

@@ -6,5 +6,5 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 freedesktop-desktop-entry = "0.5.0"
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["tokio", "wayland"] }
+libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }