gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shift all deps to workspace versioning

Browse Source
This commit is contained in:
Luke D. Jones
2022-09-29 17:08:28 +13:00
parent 2a4754cfc4
commit cde1b4f252
12 changed files with 374 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

443
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

38
Cargo.toml
View File

@@ -1,6 +1,44 @@
[workspace]
members = ["asusctl", "asus-notify", "daemon", "daemon-user", "rog-platform", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles", "rog-control-center"]
[workspace.package]
version = "4.5.0-rc3"
[workspace.dependencies]
async-trait = "^0.1"
tokio = { version = "^1.21.1", features = ["macros", "rt-multi-thread", "time"]}
concat-idents = "1.1.3"
dirs = "^4.0"
smol = "^1.2"
zbus = "^3.1.0"
zbus_macros = "^2.0"
zvariant = "^3.2"
zvariant_derive = "^3.2"
logind-zbus = { version = "^3.0" } #, default-features = false, features = ["non_blocking"] }
serde = "^1.0"
serde_derive = "^1.0"
serde_json = "^1.0"
toml = "^0.5.8"
log = "^0.4"
env_logger = "^0.9"
glam = { version = "^0.21.2", features = ["serde"] }
gumdrop = "^0.8"
udev = "^0.6"
rusb = "^0.9"
sysfs-class = "^0.1.2"
inotify = "^0.10.0"
png_pong = "^0.8.0"
pix = "0.13"
tinybmp = "^0.3.3"
gif = "^0.11.2"
notify-rust = { version = "^4.3", default-features = false, features = ["z"] }
[profile.release]
# thin = 57s, asusd = 9.0M
# fat = 72s, asusd = 6.4M

18
asus-notify/Cargo.toml
View File

@@ -1,22 +1,16 @@
[package]
name = "asus-notify"
version = "3.1.0"
version.workspace = true
authors = ["Luke D Jones <luke@ljones.dev>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
edition = "2021"
[dependencies]
zbus = "^2.2"
zbus.workspace = true
# serialisation
serde_json = "^1.0"
serde_json.workspace = true
rog_dbus = { path = "../rog-dbus" }
rog_aura = { path = "../rog-aura" }
rog_platform = { path = "../rog-platform" }
rog_profiles = { path = "../rog-profiles" }
smol = "^1.2"
[dependencies.notify-rust]
version = "^4.3"
default-features = false
features = ["z"]
smol.workspace = true
notify-rust.workspace = true

19
asusctl/Cargo.toml
View File

@@ -1,26 +1,23 @@
[package]
name = "asusctl"
version = "4.3.3"
authors = ["Luke D Jones <luke@ljones.dev>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
edition = "2021"
version.workspace = true
[dependencies]
zbus = "^2.2"
rog_anime = { path = "../rog-anime" }
rog_aura = { path = "../rog-aura" }
rog_dbus = { path = "../rog-dbus" }
rog_profiles = { path = "../rog-profiles" }
rog_platform = { path = "../rog-platform" }
daemon = { path = "../daemon" }
gumdrop = "^0.8"
toml = "^0.5.8"
sysfs-class = "^0.1.2"
gumdrop.workspace = true
toml.workspace = true
sysfs-class.workspace = true
[dev-dependencies]
tinybmp = "^0.3.3"
glam = "^0.21.2"
gif.workspace = true
tinybmp.workspace = true
glam.workspace = true
rog_dbus = { path = "../rog-dbus" }
gif = "^0.11.2"

23
daemon-user/Cargo.toml
View File

@@ -1,8 +1,8 @@
[package]
name = "daemon-user"
version = "1.3.1"
version.workspace = true
authors = ["Luke D Jones <luke@ljones.dev>"]
edition = "2018"
edition = "2021"
description = "Usermode daemon for user settings, anime, per-key lighting"
[lib]
@@ -14,20 +14,19 @@ name = "asusd-user"
path = "src/daemon.rs"
[dependencies]
dirs.workspace = true
smol.workspace = true
# serialisation
serde = "^1.0"
serde_json = "^1.0"
serde_derive = "^1.0"
serde.workspace = true
serde_json.workspace = true
serde_derive.workspace = true
rog_anime = { path = "../rog-anime" }
rog_aura = { path = "../rog-aura" }
rog_dbus = { path = "../rog-dbus" }
rog_platform = { path = "../rog-platform" }
dirs = "^4.0"
zbus = "^2.2"
zvariant = "^3.0"
zvariant_derive = "^3.0"
smol = "^1.2"
zbus.workspace = true
zvariant.workspace = true
zvariant_derive.workspace = true

30
daemon/Cargo.toml
View File

@@ -1,13 +1,13 @@
[package]
name = "daemon"
version = "4.5.0-rc3"
version.workspace = true
license = "MPL-2.0"
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
description = "A daemon app for ASUS GX502 and similar laptops to control missing features"
edition = "2018"
edition = "2021"
[lib]
name = "daemon"
@@ -24,24 +24,24 @@ rog_platform = { path = "../rog-platform" }
rog_profiles = { path = "../rog-profiles" }
rog_dbus = { path = "../rog-dbus" }
async-trait = "^0.1"
tokio = { version = "^1.21.1", features = ["macros", "rt-multi-thread", "time"]}
async-trait.workspace = true
tokio.workspace = true
# cli and logging
log = "^0.4"
env_logger = "^0.9"
log.workspace = true
env_logger.workspace = true
zbus = "^2.2"
zvariant = "^3.2"
logind-zbus = { version = "^3.0" } #, default-features = false, features = ["non_blocking"] }
zbus.workspace = true
zvariant.workspace = true
logind-zbus.workspace = true
# serialisation
serde = "^1.0"
serde_derive = "^1.0"
serde_json = "^1.0"
toml = "^0.5.8"
serde.workspace = true
serde_derive.workspace = true
serde_json.workspace = true
toml.workspace = true
# Device control
sysfs-class = "^0.1.2" # used for backlight control and baord ID
sysfs-class.workspace = true # used for backlight control and baord ID
concat-idents = "1.1.3"
concat-idents.workspace = true

24
rog-anime/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "rog_anime"
version = "1.3.5"
version.workspace = true
license = "MPL-2.0"
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
@@ -9,7 +9,7 @@ homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
documentation = "https://docs.rs/rog-anime"
description = "Types useful for translating images and other data for display on the ASUS AniMe Matrix display"
keywords = ["ROG", "ASUS", "AniMe"]
edition = "2018"
edition = "2021"
exclude = ["data"]
[features]
@@ -18,17 +18,17 @@ dbus = ["zvariant", "zbus"]
detect = ["sysfs-class"]
[dependencies]
png_pong = "^0.8.0"
pix = "0.13"
gif = "^0.11.2"
log = "*"
png_pong.workspace = true
pix.workspace = true
gif.workspace = true
log.workspace = true
serde = "^1.0"
serde_derive = "^1.0"
serde.workspace = true
serde_derive.workspace = true
glam = { version = "^0.21.2", features = ["serde"] }
glam.workspace = true
zvariant = { version = "^3.0", optional = true }
zbus = { version = "^2.2", optional = true }
zvariant = { workspace = true, optional = true }
zbus = { workspace = true, optional = true }
sysfs-class = { version = "^0.1", optional = true }
sysfs-class = { workspace = true, optional = true }

14
rog-aura/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "rog_aura"
version = "1.3.3"
version.workspace = true
license = "MPL-2.0"
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
@@ -9,7 +9,7 @@ homepage = "https://gitlab.com/asus-linux/asusctl"
documentation = "https://docs.rs/rog-anime"
description = "Types useful for fancy keyboards on ASUS ROG laptops"
keywords = ["ROG", "ASUS", "Aura"]
edition = "2018"
edition = "2021"
exclude = ["data"]
[features]
@@ -17,10 +17,10 @@ default = ["dbus", "toml"]
dbus = ["zvariant"]
[dependencies]
serde = "^1.0"
serde_derive = "^1.0"
toml = { version = "^0.5", optional = true }
zvariant = { version = "^3.0", optional = true }
serde.workspace = true
serde_derive.workspace = true
toml = { workspace = true, optional = true }
zvariant = { workspace = true, optional = true }
[dev-dependencies]
serde_json = "^1.0"
serde_json.workspace = true

26
rog-control-center/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "rog-control-center"
version = "1.1.1"
version.workspace = true
authors = ["Luke D. Jones <luke@ljones.dev>"]
edition = "2021"
@@ -20,18 +20,16 @@ rog_profiles = { path = "../rog-profiles" }
rog_platform = { path = "../rog-platform" }
# supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git" }
smol = "^1.2"
smol.workspace = true
serde.workspace = true
toml.workspace = true
serde_json.workspace = true
serde_derive.workspace = true
zbus.workspace = true
dirs.workspace = true
notify-rust.workspace = true
serde = "^1.0"
toml = "^0.5"
serde_json = "^1.0"
serde_derive = "^1.0"
zbus = "^2.3"
nix = "^0.20.0"
tempfile = "3.2.0"
dirs = "3.0.1"
[dependencies.notify-rust]
version = "^4.3"
default-features = false
features = ["z"]
tempfile = "3.2.0"

10
rog-dbus/Cargo.toml
View File

@@ -1,19 +1,19 @@
[package]
name = "rog_dbus"
version = "4.4.0"
version.workspace = true
license = "MPL-2.0"
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
description = "dbus interface methods for asusctl"
edition = "2018"
edition = "2021"
[dependencies]
rog_anime = { path = "../rog-anime" }
rog_aura = { path = "../rog-aura" }
rog_profiles = { path = "../rog-profiles" }
rog_platform = { path = "../rog-platform" }
zbus = "^2.2"
zbus_macros = "^2.0"
zvariant = "^3.0"
zbus.workspace = true
zbus_macros.workspace = true
zvariant.workspace = true

27
rog-platform/Cargo.toml
View File

@@ -1,23 +1,18 @@
[package]
name = "rog_platform"
version = "0.1.1"
version.workspace = true
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
log = "*"
log.workspace = true
rog_aura = { path = "../rog-aura" }
serde = "^1.0"
serde_derive = "^1.0"
zvariant = "^3.0"
zvariant_derive = "^3.0"
serde.workspace = true
serde_derive.workspace = true
zvariant.workspace = true
zvariant_derive.workspace = true
sysfs-class.workspace = true
concat-idents.workspace = true
udev.workspace = true
inotify.workspace = true
udev = "^0.6"
rusb = "^0.9"
sysfs-class = "^0.1"
inotify = "^0.10.0"
# inotify = { version = "0.10.0", default-features = false }
concat-idents = "1.1.3"
rusb.workspace = true

14
rog-profiles/Cargo.toml
View File

@@ -1,17 +1,17 @@
[package]
name = "rog_profiles"
version = "1.1.3"
version.workspace = true
authors = ["Luke D. Jones <luke@ljones.dev>"]
edition = "2018"
edition = "2021"
[features]
default = ["dbus"]
dbus = ["zvariant", "zvariant_derive"]
[dependencies]
udev = "^0.6"
serde = "^1.0"
serde_derive = "^1.0"
udev.workspace = true
serde.workspace = true
serde_derive.workspace = true
zvariant = { version = "^3.0", optional = true }
zvariant_derive = { version = "^3.0", optional = true }
zvariant = { workspace = true, optional = true }
zvariant_derive = { workspace = true, optional = true }