Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c456bbd authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "floss: Uprev dbus-tokio dependency to 0.7.6" am: 702caaf6 am: f34e30dd am: c74587c9 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2481895



Change-Id: Id7f26cbd6479f173a065d14540c074c2cf44b830
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 925abd64 c74587c9

system/gd/rust/linux/client/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ manager_service = { path = "../mgmt" } 


dbus = "0.9.2"

dbus-crossroads = "0.4.0"

dbus-tokio = "0.7.3"

dbus-tokio = "0.7.6"



dbus_projection = { path = "../dbus_projection" }

dbus_macros = { path = "../dbus_projection/dbus_macros" }

system/gd/rust/linux/dbus_projection/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ edition = "2018" 
[dependencies]

dbus_macros = { path = "dbus_macros" }

dbus = "0.9.2"

dbus-tokio = "0.7.3"

dbus-tokio = "0.7.6"

futures = "0.3.13"

system/gd/rust/linux/mgmt/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ base64 = "0.13.0" 
clap = "2.33.3"

configparser = "3.0.0"

dbus = "0.9.2"

dbus-tokio = "0.7.3"

dbus-tokio = "0.7.6"

dbus-crossroads = "0.4.0"

dbus_projection = { path = "../dbus_projection" }

dbus_macros = { path = "../dbus_projection/dbus_macros" }

system/gd/rust/linux/service/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ dbus_macros = { path = "../dbus_projection/dbus_macros" } 


dbus = "0.9.2"

dbus-crossroads = "0.4.0"

dbus-tokio = "0.7.3"

dbus-tokio = "0.7.6"

futures = "0.3.13"

lazy_static = "1.4"

log = "0.4.14"