Update zbus to v5

Cargo.toml

@@ -33,7 +33,7 @@ num = "0.4.0"
 rand = "0.8.1"
 serde = { version = "1.0.103", features = ["derive"] }
 sha2 = { version = "0.10.0", optional = true }
-zbus = { version = "4", default-features = false }
+zbus = { version = "5", default-features = false, features = [ "blocking-api" ] }
 openssl = { version = "^0.10.40", optional = true }
 
 [dev-dependencies]

src/blocking/collection.rs

@@ -15,8 +15,8 @@ use crate::util::{exec_prompt_blocking, format_secret, lock_or_unlock_blocking,
 
 use std::collections::HashMap;
 use zbus::{
+    proxy::CacheProperties,
     zvariant::{Dict, ObjectPath, OwnedObjectPath, Value},
-    CacheProperties,
 };
 
 // Collection struct.

src/blocking/item.rs

@@ -14,7 +14,7 @@ use crate::ss::SS_DBUS_NAME;
 use crate::util::{exec_prompt_blocking, format_secret, lock_or_unlock_blocking, LockAction};
 
 use std::collections::HashMap;
-use zbus::{zvariant::OwnedObjectPath, CacheProperties};
+use zbus::{proxy::CacheProperties, zvariant::OwnedObjectPath};
 
 pub struct Item<'a> {
     conn: zbus::blocking::Connection,

src/collection.rs

@@ -15,8 +15,8 @@ use crate::Item;
 
 use std::collections::HashMap;
 use zbus::{
+    proxy::CacheProperties,
     zvariant::{Dict, ObjectPath, OwnedObjectPath, Value},
-    CacheProperties,
 };
 
 // Collection struct.

src/item.rs

@@ -14,7 +14,7 @@ use crate::ss::SS_DBUS_NAME;
 use crate::util::{exec_prompt, format_secret, lock_or_unlock, LockAction};
 
 use std::collections::HashMap;
-use zbus::{zvariant::OwnedObjectPath, CacheProperties};
+use zbus::{proxy::CacheProperties, zvariant::OwnedObjectPath};
 
 pub struct Item<'a> {
     conn: zbus::Connection,

src/proxy/collection.rs

@@ -22,7 +22,7 @@ use super::SecretStruct;
     interface = "org.freedesktop.Secret.Collection",
     default_service = "org.freedesktop.Secret.Collection"
 )]
-trait Collection {
+pub trait Collection {
     /// Returns prompt: ObjectPath
     fn delete(&self) -> zbus::Result<OwnedObjectPath>;
 

src/proxy/item.rs

@@ -19,7 +19,7 @@ use super::SecretStruct;
     interface = "org.freedesktop.Secret.Item",
     default_service = "org.freedesktop.Secret.Item"
 )]
-trait Item {
+pub trait Item {
     fn delete(&self) -> zbus::Result<OwnedObjectPath>;
 
     /// returns `Secret`

src/proxy/prompt.rs

@@ -18,7 +18,7 @@ use zbus::zvariant::Value;
     interface = "org.freedesktop.Secret.Prompt",
     default_service = "org.freedesktop.Secret.Prompt"
 )]
-trait Prompt {
+pub trait Prompt {
     fn prompt(&self, window_id: &str) -> zbus::Result<()>;
 
     fn dismiss(&self) -> zbus::Result<()>;

src/proxy/service.rs

@@ -22,7 +22,7 @@ use zbus::zvariant::{ObjectPath, OwnedObjectPath, OwnedValue, Type, Value};
     default_service = "org.freedesktop.secrets",
     default_path = "/org/freedesktop/secrets"
 )]
-trait Service {
+pub trait Service {
     fn open_session(&self, algorithm: &str, input: Value<'_>) -> zbus::Result<OpenSessionResult>;
 
     fn create_collection(

src/util.rs

@@ -21,8 +21,8 @@ use crate::ss::SS_DBUS_NAME;
 use rand::{rngs::OsRng, Rng};
 use zbus::export::ordered_stream::OrderedStreamExt;
 use zbus::{
+    proxy::CacheProperties,
     zvariant::{self, ObjectPath},
-    CacheProperties,
 };
 
 // Helper enum for locking