Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use workspace package control global values #81

Merged
merged 1 commit into from
Dec 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 15 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
[workspace]
resolver = "2"
members = [
"wayshot",
"libwayshot",
]
members = ["wayshot", "libwayshot"]

[workspace.package]
authors = ["Shinyzenith <https://aakash.is-a.dev>"]
homepage = "https://waycrate.github.io"
description = "Screenshot crate for wlroots based compositors implementing the zwlr_screencopy_v1 protocol."
keywords = ["screenshot", "wayland", "wlroots", "wayshot"]
license = "BSD-2-Clause"
repository = "https://git.sr.ht/~shinyzenith/wayshot"
version = "0.3.2-dev"
edition = "2021"

[workspace.dependencies]
libwayshot = { version = "0.3.2-dev", path = "./libwayshot" }
tracing = "0.1.37"
17 changes: 9 additions & 8 deletions libwayshot/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
[package]
authors = ["Shinyzenith <https://aakash.is-a.dev>"]
description = "Screenshot crate for wlroots based compositors implementing the zwlr_screencopy_v1 protocol."
keywords = ["screenshot", "wayland", "wlroots", "wayshot"]
license = "BSD-2-Clause"
repository = "https://git.sr.ht/~shinyzenith/wayshot"
name = "libwayshot"
version = "0.3.1-dev"
edition = "2021"
authors.workspace = true
description.workspace = true
keywords.workspace = true
license.workspace = true
repository.workspace = true
version.workspace = true
edition.workspace = true

[dependencies]
tracing.workspace = true
image = { version = "0.24", default-features = false }
memmap2 = "0.9.0"
nix = { version = "0.27.1", features = ["fs", "mman"] }
thiserror = "1"
tracing = "0.1.37"

wayland-client = "0.31.1"
wayland-protocols = { version = "0.31.0", features = ["client", "unstable"] }
wayland-protocols-wlr = { version = "0.2.0", features = ["client"] }
31 changes: 18 additions & 13 deletions wayshot/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
[package]
authors = ["Shinyzenith <https://aakash.is-a.dev>"]
description = "Screenshot tool for wlroots based compositors implementing the zwlr_screencopy_v1 protocol."
documentation = "https://docs.rs/crate/wayshot/latest"
edition = "2021"
homepage = "https://waycrate.github.io"
keywords = ["screenshot", "wayland", "wlroots"]
license = "BSD-2-Clause"
name = "wayshot"
repository = "https://git.sr.ht/~shinyzenith/wayshot"
version = "1.3.2-dev"
authors.workspace = true
description.workspace = true
documentation = "https://docs.rs/crate/wayshot/latest"
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
repository.workspace = true

[build-dependencies]
flate2 = "1.0.27"

[dependencies]
clap = "4.4.6"
tracing.workspace = true

tracing = "0.1.37"
tracing-subscriber = "0.3.17"
libwayshot.workspace = true

libwayshot = { version="0.3.1-dev", path = "../libwayshot" }
clap = "4.4.6"
tracing-subscriber = "0.3.17"

image = { version = "0.24", default-features = false, features = ["jpeg", "png", "pnm", "qoi"] }
image = { version = "0.24", default-features = false, features = [
"jpeg",
"png",
"pnm",
"qoi",
] }

dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }

Expand Down
Loading