chore: update dependencies (#211)

mmstick · web-flow · commit 279ff968613c · 2024-05-02T11:03:05.000-06:00
* chore: update dependencies

* release: 1.2.3

* chore(deb): update changelog to 1.2.3
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pop-launcher"
-version = "1.2.2"
+version = "1.2.3"
 license = "MPL-2.0"
 authors = ["Michael Aaron Murphy <mmstick@pm.me>"]
 description = "Library for writing plugins and frontends for pop-launcher"
@@ -11,22 +11,21 @@ edition = "2018"
 members = ["bin", "plugins", "service", "toolkit"]
 
 [dependencies]
-const_format = "0.2.30"
-dirs = "4.0.0"
-futures = "0.3.25"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.87"
-serde_with = "2.0.1"
+const_format = "0.2.32"
+dirs = "5.0.1"
+futures = "0.3.30"
+serde = { version = "1.0.198", features = ["derive"] }
+serde_json = "1.0.116"
+serde_with = "3.7.0"
 
 [profile.release]
-lto = true
+lto = "fat"
 panic = "abort"
-strip = true
 
 [dependencies.tokio]
-version = "1.21.2"
+version = "1.37.0"
 features = ["io-std", "io-util"]
 
 [dependencies.tokio-stream]
-version = "0.1.11"
+version = "0.1.15"
 features = ["io-util"]
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pop-launcher-bin"
-version = "1.2.1"
+version = "1.2.3"
 edition = "2018"
 license = "GPL-3.0-only"
 publish = false
@@ -9,11 +9,11 @@ publish = false
 
 [dependencies]
 pop-launcher-toolkit = { path = "../toolkit" }
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.16", default-features = false, features = ["std", "fmt", "env-filter"] }
-dirs = "4.0.0"
-mimalloc = "0.1.30"
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", default-features = false, features = ["std", "fmt", "env-filter"] }
+dirs = "5.0.1"
+mimalloc = "0.1.39"
 
 [dependencies.tokio]
-version = "1.21.2"
+version = "1.37.0"
 features = ["rt"]
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+pop-launcher (1.2.3) jammy; urgency=medium
+
+  * Update crate dependencies
+  * Fix order of desktop entry search
+
+ -- Michael Aaron Murphy <michael@mmurphy.dev>  Fri, 26 Apr 2024 17:05:24 +0200
+
 pop-launcher (1.2.2) jammy; urgency=medium
 
   * Various bug fixes and improvements
diff --git a/plugins/Cargo.toml b/plugins/Cargo.toml
@@ -1,49 +1,51 @@
 [package]
 name = "pop-launcher-plugins"
-version = "1.2.2"
+version = "1.2.3"
 license = "GPL-3.0-only"
 authors = ["Michael Aaron Murphy <mmstick@pm.me>"]
 edition = "2018"
 publish = false
 
 [dependencies]
 async-pidfd = "0.1.4"
-fork = "0.1.20"
-freedesktop-desktop-entry = "0.5.0"
-human_format = "1.0.3"
+fork = "0.1.23"
+freedesktop-desktop-entry = "0.5.2"
+human_format = "1.1.0"
 human-sort = "0.2.2"
 new_mime_guess = "4.0.1"
 pop-launcher = { path = "../" }
-regex = "1.6.0"
-ron = "0.8.0"
-serde = "1.0.147"
-serde_json = "1.0.87"
-slab = "0.4.7"
-strsim = "0.10.0"
-tracing = "0.1.37"
-urlencoding = "2.1.2"
-zbus = "3.14.0"
-zvariant = "3.7.1"
+regex = "1.10.4"
+ron = "0.8.1"
+serde = "1.0.198"
+serde_json = "1.0.116"
+slab = "0.4.9"
+strsim = "0.11.1"
+tracing = "0.1.40"
+urlencoding = "2.1.3"
+zbus = "3.15.2"
+zvariant = "3.15.2"
 ward = "2.1.0"
-url = "2.3.1"
+url = "2.5.0"
 sysfs-class = "0.1.3"
-anyhow = "1.0.66"
-flume = "0.10.14"
-dirs = "4.0.0"
-futures = "0.3.25"
-bytes = "1.2.1"
+anyhow = "1.0.82"
+flume = "0.11.0"
+dirs = "5.0.1"
+futures = "0.3.30"
+bytes = "1.6.0"
 recently-used-xbel = "1.0.0"
 
 # dependencies cosmic toplevel
 cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit" }
+sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "3bed072", features = ["calloop"] }
+
 # dependencies desktop entries
 switcheroo-control = { git = "https://github.com/pop-os/dbus-settings-bindings" }
 
 [dependencies.reqwest]
-version = "0.11.12"
+version = "0.12.3"
 default-features = false
 features = ["rustls-tls"]
 
 [dependencies.tokio]
-version = "1.21.2"
+version = "1.37.0"
 features = ["fs", "io-std", "macros", "process", "rt"]
diff --git a/plugins/src/cosmic_toplevel/toplevel_handler.rs b/plugins/src/cosmic_toplevel/toplevel_handler.rs
@@ -1,15 +1,17 @@
 use cctk::{
     cosmic_protocols,
-    sctk::{
-        self,
-        event_loop::WaylandSource,
-        reexports::{calloop, client::protocol::wl_seat::WlSeat},
-        seat::{SeatHandler, SeatState},
-    },
     toplevel_info::{ToplevelInfo, ToplevelInfoHandler, ToplevelInfoState},
     toplevel_management::{ToplevelManagerHandler, ToplevelManagerState},
     wayland_client::{self, protocol::wl_output::WlOutput, WEnum},
 };
+use sctk::{
+    self,
+    reexports::{
+        calloop, calloop_wayland_source::WaylandSource, client::protocol::wl_seat::WlSeat,
+    },
+    seat::{SeatHandler, SeatState},
+};
+
 use cosmic_protocols::{
     toplevel_info::v1::client::zcosmic_toplevel_handle_v1::{self, ZcosmicToplevelHandleV1},
     toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
@@ -152,7 +154,7 @@ pub(crate) fn toplevel_handler(
     let (globals, event_queue) = registry_queue_init(&conn)?;
     let mut event_loop = calloop::EventLoop::<AppData>::try_new()?;
     let qh = event_queue.handle();
-    let wayland_source = WaylandSource::new(event_queue)?;
+    let wayland_source = WaylandSource::new(conn, event_queue);
     let handle = event_loop.handle();
 
     handle.insert_source(wayland_source, |_, q, state| q.dispatch_pending(state))?;
diff --git a/service/Cargo.toml b/service/Cargo.toml
@@ -1,35 +1,35 @@
 [package]
 name = "pop-launcher-service"
-version= "1.2.2"
+version= "1.2.3"
 license = "MPL-2.0"
 edition = "2018"
 
 [dependencies]
-anyhow = "1.0.66"
-async-oneshot = "0.5.0"
-async-trait = "0.1.58"
-dirs = "4.0.0"
-futures = "0.3.25"
+anyhow = "1.0.82"
+async-oneshot = "0.5.9"
+async-trait = "0.1.80"
+dirs = "5.0.1"
+futures = "0.3.30"
 futures_codec = "0.4.1"
 gen-z = "0.1.0"
-num_cpus = "1.14.0"
+num_cpus = "1.16.0"
 pop-launcher = { path = "../" }
-regex = "1.6.0"
-ron = "0.8.0"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.87"
-serde_with = "2.0.1"
-slab = "0.4.7"
-strsim = "0.10.0"
-toml = "0.5.9"
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.16", default-features = false, features = ["std", "fmt", "env-filter"] }
-flume = "0.10.14"
+regex = "1.10.4"
+ron = "0.8.1"
+serde = { version = "1.0.198", features = ["derive"] }
+serde_json = "1.0.116"
+serde_with = "3.7.0"
+slab = "0.4.9"
+strsim = "0.11.1"
+toml = "0.8.12"
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", default-features = false, features = ["std", "fmt", "env-filter"] }
+flume = "0.11.0"
 
 [dependencies.tokio]
-version= "1.21.2"
+version= "1.37.0"
 features = ["io-std", "process", "rt"]
 
 [dependencies.tokio-stream]
-version= "0.1.11"
+version= "0.1.15"
 features = ["io-util"]
diff --git a/service/src/plugins/mod.rs b/service/src/plugins/mod.rs
@@ -7,7 +7,7 @@ pub mod help;
 
 pub use external::load;
 
-pub use self::config::{PluginBinary, PluginConfig, PluginPriority, PluginQuery};
+pub use self::config::{PluginConfig, PluginPriority, PluginQuery};
 pub use self::external::ExternalPlugin;
 pub use self::help::HelpPlugin;
 
diff --git a/toolkit/Cargo.toml b/toolkit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pop-launcher-toolkit"
-version = "0.1.0"
+version = "1.2.3"
 edition = "2021"
 description = "A wrapper around pop-launcher, pop-launcher-service and pop-launcher-plugins types for writing plugins and frontends for pop-launcher."
 
@@ -10,15 +10,15 @@ description = "A wrapper around pop-launcher, pop-launcher-service and pop-launc
 pop-launcher-plugins = { path = "../plugins"}
 pop-launcher-service = { path = "../service"}
 pop-launcher = { path = "../" }
-async-trait = "0.1.58"
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.16", default-features = false, features = ["std", "fmt", "env-filter"] }
-dirs = "4.0.0"
-futures = "0.3.25"
+async-trait = "0.1.80"
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", default-features = false, features = ["std", "fmt", "env-filter"] }
+dirs = "5.0.1"
+futures = "0.3.30"
 
 [dev-dependencies]
 tokio = { version = "1", features = [ "rt" ] }
-fork = "0.1.20"
+fork = "0.1.23"
 
 [[example]]
 name = "man-pages-plugin"
