-
-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
♻️ Deduplicate
rust-version
via workspace
- Loading branch information
1 parent
71324fc
commit 788e0ea
Showing
9 changed files
with
57 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ name = "zbus" | |
version = "5.2.0" | ||
authors = ["Zeeshan Ali Khan <[email protected]>"] | ||
edition = "2021" | ||
rust-version = "1.80" | ||
rust-version = { workspace = true } | ||
|
||
description = "API for D-Bus communication" | ||
repository = "https://github.com/dbus2/zbus/" | ||
|
@@ -27,16 +27,16 @@ bus-impl = ["p2p"] | |
# Enables API that is only needed for peer-to-peer (p2p) connections. | ||
p2p = ["dep:rand"] | ||
async-io = [ | ||
"dep:async-io", | ||
"async-executor", | ||
"async-task", | ||
"async-lock", | ||
"async-fs", | ||
# FIXME: We only currently only need this for unix but Cargo doesn't provide a way to enable | ||
# features for only specific target OS: https://github.com/rust-lang/cargo/issues/1197. | ||
"async-process", | ||
"blocking", | ||
"futures-util/io", | ||
"dep:async-io", | ||
"async-executor", | ||
"async-task", | ||
"async-lock", | ||
"async-fs", | ||
# FIXME: We only currently only need this for unix but Cargo doesn't provide a way to enable | ||
# features for only specific target OS: https://github.com/rust-lang/cargo/issues/1197. | ||
"async-process", | ||
"blocking", | ||
"futures-util/io", | ||
] | ||
tokio = ["dep:tokio"] | ||
vsock = ["dep:vsock", "dep:async-io"] | ||
|
@@ -49,15 +49,15 @@ serde_bytes = ["zvariant/serde_bytes"] | |
[dependencies] | ||
zbus_macros = { path = "../zbus_macros", version = "=5.2.0" } | ||
zvariant = { path = "../zvariant", version = "5.0.0", default-features = false, features = [ | ||
"enumflags2", | ||
"enumflags2", | ||
] } | ||
zbus_names = { path = "../zbus_names", version = "4.0" } | ||
serde = { version = "1.0.200", features = ["derive"] } | ||
serde_repr = "0.1.19" | ||
enumflags2 = { version = "0.7.9", features = ["serde"] } | ||
futures-core = "0.3.30" | ||
futures-util = { version = "0.3.30", default-features = false, features = [ | ||
"std", | ||
"std", | ||
] } | ||
async-broadcast = "0.7.0" | ||
hex = "0.4.3" | ||
|
@@ -80,39 +80,39 @@ async-task = { version = "4.7.1", optional = true } | |
async-fs = { version = "2.1.2", optional = true } | ||
async-process = { version = "2.2.2", optional = true } | ||
tokio = { version = "1.37.0", optional = true, features = [ | ||
"rt", | ||
"net", | ||
"time", | ||
"fs", | ||
"io-util", | ||
# FIXME: We should only enable this feature for unix. See comment above regarding `async-process` | ||
# on why we can't. | ||
"process", | ||
"sync", | ||
"tracing", | ||
"rt", | ||
"net", | ||
"time", | ||
"fs", | ||
"io-util", | ||
# FIXME: We should only enable this feature for unix. See comment above regarding `async-process` | ||
# on why we can't. | ||
"process", | ||
"sync", | ||
"tracing", | ||
] } | ||
vsock = { version = "0.5.0", optional = true } | ||
tokio-vsock = { version = "0.7", optional = true } | ||
|
||
[target.'cfg(windows)'.dependencies] | ||
windows-sys = { version = "0.59", features = [ | ||
"Win32_Foundation", | ||
"Win32_Security_Authorization", | ||
"Win32_System_Memory", | ||
"Win32_Networking", | ||
"Win32_Networking_WinSock", | ||
"Win32_NetworkManagement", | ||
"Win32_NetworkManagement_IpHelper", | ||
"Win32_System_IO", | ||
"Win32_System_Threading", | ||
"Win32_Foundation", | ||
"Win32_Security_Authorization", | ||
"Win32_System_Memory", | ||
"Win32_Networking", | ||
"Win32_Networking_WinSock", | ||
"Win32_NetworkManagement", | ||
"Win32_NetworkManagement_IpHelper", | ||
"Win32_System_IO", | ||
"Win32_System_Threading", | ||
] } | ||
uds_windows = "1.1.0" | ||
|
||
[target.'cfg(unix)'.dependencies] | ||
nix = { version = "0.29", default-features = false, features = [ | ||
"socket", | ||
"uio", | ||
"user", | ||
"socket", | ||
"uio", | ||
"user", | ||
] } | ||
|
||
[target.'cfg(any(target_os = "macos", windows))'.dependencies] | ||
|
@@ -124,22 +124,22 @@ doc-comment = "0.3.3" | |
futures-util = "0.3.30" # activate default features | ||
ntest = "0.9.2" | ||
test-log = { version = "0.2.16", features = [ | ||
"trace", | ||
"trace", | ||
], default-features = false } | ||
tokio = { version = "1.37.0", features = [ | ||
"macros", | ||
"rt-multi-thread", | ||
"fs", | ||
"io-util", | ||
"net", | ||
"sync", | ||
"time", | ||
"test-util", | ||
"macros", | ||
"rt-multi-thread", | ||
"fs", | ||
"io-util", | ||
"net", | ||
"sync", | ||
"time", | ||
"test-util", | ||
] } | ||
tracing-subscriber = { version = "0.3.18", features = [ | ||
"env-filter", | ||
"fmt", | ||
"ansi", | ||
"env-filter", | ||
"fmt", | ||
"ansi", | ||
], default-features = false } | ||
tempfile = "3.10.1" | ||
criterion = "0.5.1" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ authors = [ | |
"Zeeshan Ali Khan <[email protected]>", | ||
] | ||
edition = "2021" | ||
rust-version = "1.80" | ||
rust-version = { workspace = true } | ||
|
||
description = "proc-macros for zbus" | ||
repository = "https://github.com/dbus2/zbus/" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ name = "zbus_names" | |
version = "4.1.0" | ||
authors = ["Zeeshan Ali Khan <[email protected]>"] | ||
edition = "2021" | ||
rust-version = "1.80" | ||
rust-version = { workspace = true } | ||
|
||
description = "A collection of D-Bus bus names types" | ||
repository = "https://github.com/dbus2/zbus/" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ name = "zbus_xml" | |
version = "5.0.1" | ||
authors = ["Zeeshan Ali Khan <[email protected]>"] | ||
edition = "2021" | ||
rust-version = "1.80" | ||
rust-version = { workspace = true } | ||
|
||
description = "API to handle D-Bus introspection XML" | ||
repository = "https://github.com/dbus2/zbus/" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ authors = [ | |
"Zeeshan Ali Khan <[email protected]>", | ||
] | ||
edition = "2021" | ||
rust-version = "1.80" | ||
rust-version = { workspace = true } | ||
|
||
description = "D-Bus XML interface code generator" | ||
repository = "https://github.com/dbus2/zbus/" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ name = "zvariant" | |
version = "5.1.0" | ||
authors = ["Zeeshan Ali Khan <[email protected]>"] | ||
edition = "2021" | ||
rust-version = "1.80" | ||
rust-version = { workspace = true } | ||
|
||
description = "D-Bus & GVariant encoding & decoding" | ||
repository = "https://github.com/dbus2/zbus/" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ name = "zvariant_derive" | |
version = "5.1.0" | ||
authors = ["Zeeshan Ali Khan <[email protected]>"] | ||
edition = "2021" | ||
rust-version = "1.80" | ||
rust-version = { workspace = true } | ||
|
||
description = "D-Bus & GVariant encoding & decoding" | ||
repository = "https://github.com/dbus2/zbus/" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ authors = [ | |
"turbocooler <[email protected]>", | ||
] | ||
edition = "2021" | ||
rust-version = "1.80" | ||
rust-version = { workspace = true } | ||
|
||
description = "Various utilities used internally by the zvariant crate." | ||
repository = "https://github.com/dbus2/zbus/" | ||
|