leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies, and use workspace dependencies

Browse source 
Using `[workspace.dependencies]`, we can update `rev =` for a dependency
in one place, instead of each individual applet.
This commit is contained in:
Ian Douglas Scott 2023-07-20 14:57:51 -07:00 • committed by Jeremy Soller
parent 322e13c80d
commit 294cf6f3a7
16 changed files with 370 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

596
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

6
Cargo.toml
View file

@ -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"

4
applet/Cargo.toml
View file

@ -6,8 +6,8 @@ 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" }
log = { version = "0.4" }
log = { version = "0.4" }

6
cosmic-app-list/Cargo.toml
View file

@ -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" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "f0cfe09" }
libcosmic = { git = "https://github.com/pop-os/libcosmic/", default-features = false, features = ["wayland", "tokio"] }
cctk.workspace = true
cosmic-protocols.workspace = true
libcosmic.workspace = true
cosmic-applet = { path = "../applet" }
# libcosmic = { path = "../../libcosmic", default-features = false, features = ["wayland", "tokio"] }
ron = "0.8"

2
cosmic-app-list/src/app.rs
View file

@ -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 {

4
cosmic-applet-audio/Cargo.toml
View file

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

4
cosmic-applet-battery/Cargo.toml
View file

@ -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"] }
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
libcosmic.workspace = true
cosmic-time.workspace = true
cosmic-applet = { path = "../applet" }
futures = "0.3"
zbus = { version = "3.13", default-features = false, features = ["tokio"] }

2
cosmic-applet-bluetooth/Cargo.toml
View file

@ -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"

2
cosmic-applet-graphics/Cargo.toml
View file

@ -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

4
cosmic-applet-network/Cargo.toml
View file

@ -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"] }
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
libcosmic.workspace = true
cosmic-time.workspace = true
cosmic-applet = { path = "../applet" }
futures = "0.3"
zbus = { version = "3.13", default-features = false }

4
cosmic-applet-notifications/Cargo.toml
View file

@ -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"] }
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
libcosmic.workspace = true
cosmic-time.workspace = true
cosmic-applet = { path = "../applet" }
nix = "0.24.1"

2
cosmic-applet-power/Cargo.toml
View file

@ -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"

2
cosmic-applet-time/Cargo.toml
View file

@ -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"] }

6
cosmic-applet-workspaces/Cargo.toml
View file

@ -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" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "f0cfe09" }
cctk.workspace = true
cosmic-protocols.workspace = true
wayland-backend = {version = "0.1.0", features = ["client_system"]}
wayland-client = {version = "0.30.0"}
calloop = "0.10.1"

4
cosmic-applet-workspaces/src/wayland.rs
View file

@ -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);

2
cosmic-panel-button/Cargo.toml
View file

@ -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" }