Merge pull request #796 from marhkb/build/upddeps

build: Update dependencies

Author: marhkb

Cargo.lock

@@ -5,12 +5,12 @@ authors = ["Marcus Behrendt <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-adw = { version = "0.6", package = "libadwaita", features = ["v1_4"] }
+adw = { version = "0.7", package = "libadwaita", features = ["v1_5"] }
 anyhow = "1"
-ashpd = { version = "0.8", default-features = false, features = ["gtk4", "tokio"] }
+ashpd = { version = "0.9", default-features = false, features = ["gtk4", "tokio"] }
 futures = { version = "0.3", default-features = false }
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { version = "0.8", package = "gtk4", features = ["gnome_45"] }
+gtk = { version = "0.9", package = "gtk4", features = ["gnome_46"] }
 indexmap = { version = "2", features = ["serde"] }
 log = "0.4"
 multi_log = "0.1"
@@ -21,12 +21,12 @@ podman-api = { git = "https://github.com/vv9k/podman-api-rs.git", commit = "363d
 serde = "1"
 serde_json = "1"
 simplelog = { version = "0.12", features = ["paris"] }
-sourceview5 = { version = "0.8", features = ["gtk_v4_12"] }
-syslog = "6"
+sourceview5 = { version = "0.9" }
+syslog = "7"
 tokio = "1"
 tokio-tar = { version = "0.3", default-features = false }
 vte = { version = "0.13", default-features = false }
-vte4 = "0.7"
+vte4 = "0.8"
 
 [profile.release]
 lto = true

Cargo.toml

@@ -62,7 +62,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/vte.git",
-                    "tag": "0.76.0"
+                    "tag": "0.76.4"
                 }
             ]
         },

build-aux/com.github.marhkb.Pods.Devel.json

@@ -278,7 +278,7 @@
           <li>If a container is in a pod, it will now get a badge with the pod name in the container list.</li>
           <li>Logs, the result of the inspection of images, containers, and pods, and the result Kubernetes YAML generation can now be saved directly as a file.</li>
           <li>Headerbar titles were adjusted to be shorter and more concise</li>
-          <li>Many minor internal code improvements habe landed</li>
+          <li>Many minor internal code improvements have landed</li>
           <li>Dependencies and translations have been updated.</li>
         </ul>
       </description>

data/com.github.marhkb.Pods.metainfo.xml.in.in

@@ -14,12 +14,19 @@ mod imp {
 
     #[allow(dead_code)]
     #[derive(Copy, Clone, Debug)]
-    pub(crate) struct AbstractContainerList(glib::gobject_ffi::GTypeInterface);
+    pub(crate) struct AbstractContainerListClass(glib::gobject_ffi::GTypeInterface);
+
+    unsafe impl InterfaceStruct for AbstractContainerListClass {
+        type Type = AbstractContainerList;
+    }
+
+    pub(crate) struct AbstractContainerList;
 
     #[glib::object_interface]
-    unsafe impl ObjectInterface for AbstractContainerList {
+    impl ObjectInterface for AbstractContainerList {
         const NAME: &'static str = "AbstractContainerList";
         type Prerequisites = (gio::ListModel,);
+        type Interface = AbstractContainerListClass;
 
         fn signals() -> &'static [Signal] {
             static SIGNALS: OnceLock<Vec<Signal>> = OnceLock::new();

src/model/abstract_container_list.rs

@@ -9,11 +9,18 @@ mod imp {
 
     #[allow(dead_code)]
     #[derive(Copy, Clone, Debug)]
-    pub(crate) struct Selectable(glib::gobject_ffi::GTypeInterface);
+    pub(crate) struct SelectableClass(glib::gobject_ffi::GTypeInterface);
+
+    unsafe impl InterfaceStruct for SelectableClass {
+        type Type = Selectable;
+    }
+
+    pub(crate) struct Selectable;
 
     #[glib::object_interface]
-    unsafe impl ObjectInterface for Selectable {
+    impl ObjectInterface for Selectable {
         const NAME: &'static str = "Selectable";
+        type Interface = SelectableClass;
 
         fn properties() -> &'static [glib::ParamSpec] {
             static PROPERTIES: OnceLock<Vec<glib::ParamSpec>> = OnceLock::new();

src/model/selectable.rs

@@ -14,12 +14,19 @@ mod imp {
 
     #[allow(dead_code)]
     #[derive(Copy, Clone, Debug)]
-    pub(crate) struct SelectableList(glib::gobject_ffi::GTypeInterface);
+    pub(crate) struct SelectableListClass(glib::gobject_ffi::GTypeInterface);
+
+    unsafe impl InterfaceStruct for SelectableListClass {
+        type Type = SelectableList;
+    }
+
+    pub(crate) struct SelectableList;
 
     #[glib::object_interface]
-    unsafe impl ObjectInterface for SelectableList {
+    impl ObjectInterface for SelectableList {
         const NAME: &'static str = "SelectableList";
         type Prerequisites = (gio::ListModel,);
+        type Interface = SelectableListClass;
 
         fn properties() -> &'static [glib::ParamSpec] {
             static PROPERTIES: OnceLock<Vec<glib::ParamSpec>> = OnceLock::new();
@@ -58,8 +65,10 @@ impl SelectableList {
 pub(crate) trait SelectableListExt: IsA<SelectableList> {
     fn is_selection_mode(&self) -> bool;
 
+    #[allow(dead_code)]
     fn set_selection_mode(&self, value: bool);
 
+    #[allow(dead_code)]
     fn select_all(&self) {
         self.select(true);
     }

src/model/selectable_list.rs

@@ -256,18 +256,18 @@ where
             gettext("<none>"))
 }
 
-pub(crate) fn format_iter<'a, I, T: ?Sized>(iter: I, sep: &str) -> String
+pub(crate) fn format_iter<'a, I, T>(iter: I, sep: &str) -> String
 where
     I: IntoIterator<Item = &'a T>,
-    T: AsRef<str> + 'a,
+    T: AsRef<str> + ?Sized + 'a,
 {
     format_option(format_iter_or_none(iter, sep))
 }
 
-pub(crate) fn format_iter_or_none<'a, I, T: ?Sized + 'a>(iter: I, sep: &str) -> Option<String>
+pub(crate) fn format_iter_or_none<'a, I, T>(iter: I, sep: &str) -> Option<String>
 where
     I: IntoIterator<Item = &'a T>,
-    T: AsRef<str> + 'a,
+    T: AsRef<str> + ?Sized + 'a,
 {
     let mut iter = iter.into_iter();
     iter.next().map(|first| {

src/utils.rs

@@ -413,6 +413,7 @@ mod imp {
             gesture_click.set_state(gtk::EventSequenceState::Claimed);
             gesture_click
                 .widget()
+                .unwrap()
                 .downcast::<<Self as ObjectSubclass>::Type>()
                 .unwrap()
                 .activate();

src/view/container_card.rs

@@ -226,7 +226,7 @@ mod imp {
             snapshot.pop();
             snapshot.pop();
 
-            snapshot.append_node(&child_snapshot.to_node().unwrap());
+            snapshot.append_node(child_snapshot.to_node().unwrap());
             snapshot.pop();
 
             widget.snapshot_child(&*self.image, snapshot);

src/widget/circular_progress_bar.rs

@@ -116,7 +116,7 @@ mod imp {
             widget.snapshot_child(&*self.count_mask, snapshot);
             snapshot.pop();
 
-            snapshot.append_node(&child_snapshot.to_node().unwrap());
+            snapshot.append_node(child_snapshot.to_node().unwrap());
             snapshot.pop();
 
             widget.snapshot_child(&*self.count_badge, snapshot);

src/widget/count_badge.rs

@@ -183,7 +183,7 @@ mod imp {
             snapshot.pop();
             snapshot.pop();
 
-            snapshot.append_node(&child_snapshot.to_node().unwrap());
+            snapshot.append_node(child_snapshot.to_node().unwrap());
             snapshot.pop();
 
             widget.snapshot_child(&*self.image, snapshot);