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

Use cargo workspace features #1296

Merged
merged 1 commit into from
Jan 26, 2024
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
199 changes: 96 additions & 103 deletions Cargo.lock

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,32 @@ members = [
]

exclude = ["gir", "checker"]

[workspace.package]
homepage = "https://gtk-rs.org/"
authors = ["The gtk-rs Project Developers"]
version = "0.19.0"
repository = "https://github.com/gtk-rs/gtk-rs-core"
license = "MIT"
exclude = [
"gir-files/*",
]
edition = "2021"
rust-version = "1.70"

[workspace.dependencies]
once_cell = "1.19"
libc = "0.2"
bitflags = "2.4"
thiserror = "1"
gir-format-check = "^0.1"
sdroege marked this conversation as resolved.
Show resolved Hide resolved
glib = { path = "glib" }
gio = { path = "gio" }
pango = { path = "pango" }
cairo-rs = { path = "cairo" }
glib-macros = { path = "glib-macros" }

[workspace.metadata.docs.rs]
all-features = true
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
28 changes: 12 additions & 16 deletions cairo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
[package]
name = "cairo-rs"
license = "MIT"
homepage = "https://gtk-rs.org/"
authors = ["The gtk-rs Project Developers"]
keywords = ["cairo", "gtk-rs", "gnome", "GUI"]
readme = "README.md"
documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/cairo/"
version = "0.19.0"
description = "Rust bindings for the Cairo library"
repository = "https://github.com/gtk-rs/gtk-rs-core"
edition = "2021"
rust-version = "1.70"
authors.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
license.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[lib]
name = "cairo"
Expand All @@ -30,21 +31,16 @@ xcb = ["ffi/xcb"]
xlib = ["ffi/xlib"]
win32-surface = ["ffi/win32-surface"]

[package.metadata.docs.rs]
all-features = true
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]

[dependencies.glib]
optional = true
path = "../glib"

[dependencies]
ffi = { package = "cairo-sys-rs", path = "sys" }
libc = "0.2"
bitflags = "2.4"
thiserror = "1.0.56"
once_cell = "1"
libc.workspace = true
bitflags.workspace = true
thiserror.workspace = true
once_cell.workspace = true
freetype-rs = { version = "0.35", optional = true }

[dev-dependencies]
Expand Down
21 changes: 8 additions & 13 deletions cairo/sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[package]
name = "cairo-sys-rs"
license = "MIT"
authors = ["The gtk-rs Project Developers"]
homepage = "https://gtk-rs.org/"
description = "FFI bindings to libcairo"
version = "0.19.0"
keywords = ["cairo", "ffi", "gtk-rs", "gnome"]
repository = "https://github.com/gtk-rs/gtk-rs-core"
build = "build.rs"
edition = "2021"
rust-version = "1.70"
authors.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
license.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[package.metadata.system-deps.cairo]
name = "cairo"
Expand Down Expand Up @@ -67,9 +68,3 @@ windows-sys = { version = "0.52", features = ["Win32_Graphics_Gdi"], optional =

[build-dependencies]
system-deps = "6"

[package.metadata.docs.rs]
all-features = true
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs"]
features = []
16 changes: 6 additions & 10 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
[package]
name = "gtk-rs-examples"
version = "0.0.1"
authors = ["The gtk-rs Project Developers"]
edition = "2021"
rust-version = "1.70"
authors.workspace = true
edition.workspace = true
rust-version.workspace = true
version.workspace = true

[dependencies]
futures = "0.3"
futures-channel = "0.3"
futures-util = "0.3"

[dependencies.glib]
path = "../glib"

[dependencies.gio]
path = "../gio"
glib.workspace = true
gio.workspace = true

[dependencies.async-tls]
version = "0.12"
Expand Down
33 changes: 13 additions & 20 deletions gdk-pixbuf/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
[package]
name = "gdk-pixbuf"
license = "MIT"
homepage = "https://gtk-rs.org/"
authors = ["The gtk-rs Project Developers"]
keywords = ["gdk-pixbuf", "gtk-rs", "gnome"]
readme = "README.md"
documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/gdk_pixbuf/"
version = "0.19.0"
description = "Rust bindings for the GdkPixbuf library"
repository = "https://github.com/gtk-rs/gtk-rs-core"
exclude = [
"gir-files/*",
]
edition = "2021"
rust-version = "1.70"
authors.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
license.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[lib]
name = "gdk_pixbuf"
Expand All @@ -22,17 +20,12 @@ name = "gdk_pixbuf"
v2_40 = ["ffi/v2_40"]
v2_42 = ["v2_40", "ffi/v2_42"]

[package.metadata.docs.rs]
all-features = true
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]

[dependencies]
libc = "0.2"
ffi = { package = "gdk-pixbuf-sys", path = "sys" }
glib = { path = "../glib" }
gio = { path = "../gio" }
once_cell = "1"
libc.workspace = true
glib.workspace = true
gio.workspace = true
once_cell.workspace = true

[dev-dependencies]
gir-format-check = "^0.1"
gir-format-check.workspace = true
31 changes: 24 additions & 7 deletions gdk-pixbuf/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,34 @@ v2_42 = ["v2_40"]
name = "gdk_pixbuf_sys"

[package]
authors = ["The gtk-rs Project Developers"]
build = "build.rs"
description = "FFI bindings to libgdk_pixbuf-2.0"
homepage = "https://gtk-rs.org/"
keywords = ["gdk-pixbuf", "ffi", "gtk-rs", "gnome"]
license = "MIT"
name = "gdk-pixbuf-sys"
repository = "https://github.com/gtk-rs/gtk-rs-core"
version = "0.19.0"
edition = "2021"
rust-version = "1.70"

[package.authors]
workspace = true
bilelmoussaoui marked this conversation as resolved.
Show resolved Hide resolved

[package.edition]
workspace = true

[package.exclude]
workspace = true

[package.homepage]
workspace = true

[package.license]
workspace = true

[package.repository]
workspace = true

[package.rust-version]
workspace = true

[package.version]
workspace = true

[package.metadata.system-deps.gdk_pixbuf_2_0]
name = "gdk-pixbuf-2.0"
Expand Down
33 changes: 13 additions & 20 deletions gio/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
[package]
name = "gio"
license = "MIT"
homepage = "https://gtk-rs.org/"
authors = ["The gtk-rs Project Developers"]
keywords = ["glib", "gio", "gtk-rs", "gnome"]
readme = "README.md"
documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/gio/"
version = "0.19.0"
description = "Rust bindings for the Gio library"
repository = "https://github.com/gtk-rs/gtk-rs-core"
exclude = [
"gir-files/*",
]
edition = "2021"
rust-version = "1.70"
build = "build.rs"
authors.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
license.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[lib]
name = "gio"
Expand All @@ -33,26 +31,21 @@ v2_76 = ["v2_74", "ffi/v2_76", "glib/v2_76"]
v2_78 = ["v2_76", "ffi/v2_78", "glib/v2_78"]
v2_80 = ["v2_78", "ffi/v2_80", "glib/v2_80"]

[package.metadata.docs.rs]
all-features = true
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]

[dependencies]
libc = "0.2"
once_cell = "1.19"
libc.workspace = true
once_cell.workspace = true
futures-core = { version = "0.3", default-features = false }
futures-channel = "0.3"
futures-io = "0.3"
futures-util = { version = "0.3", default-features = false }
ffi = { package = "gio-sys", path = "sys" }
glib = { path = "../glib" }
thiserror = "1"
glib.workspace = true
thiserror.workspace = true
pin-project-lite = "0.2"
smallvec = "1"

[dev-dependencies]
futures = "0.3"
futures-util = { version = "0.3", features = ["io"] }
gir-format-check = "^0.1"
gir-format-check.workspace = true
serial_test = "3"
31 changes: 24 additions & 7 deletions gio/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,34 @@ v2_80 = ["v2_78"]
name = "gio_sys"

[package]
authors = ["The gtk-rs Project Developers"]
build = "build.rs"
description = "FFI bindings to libgio-2.0"
homepage = "https://gtk-rs.org/"
keywords = ["gio", "ffi", "gtk-rs", "gnome"]
license = "MIT"
name = "gio-sys"
repository = "https://github.com/gtk-rs/gtk-rs-core"
version = "0.19.0"
edition = "2021"
rust-version = "1.70"

[package.authors]
workspace = true

[package.edition]
workspace = true

[package.exclude]
workspace = true

[package.homepage]
workspace = true

[package.license]
workspace = true

[package.repository]
workspace = true

[package.rust-version]
workspace = true

[package.version]
workspace = true

[package.metadata.system-deps.gio_2_0]
name = "gio-2.0"
Expand Down
17 changes: 9 additions & 8 deletions glib-build-tools/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
[package]
name = "glib-build-tools"
license = "MIT"
homepage = "https://gtk-rs.org/"
authors = ["The gtk-rs Project Developers"]
keywords = ["glib", "gio", "gtk-rs", "gnome", "build-dependencies"]
readme = "README.md"
documentation = "https://gtk-rs.org/gtk-rs-core/stable/latest/docs/glib_build_tools"
version = "0.19.0"
description = "Rust bindings for the Gio library, build script utils crate"
repository = "https://github.com/gtk-rs/gtk-rs-core"
edition = "2021"
rust-version = "1.70"
authors.workspace = true
edition.workspace = true
exclude.workspace = true
homepage.workspace = true
license.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true

[dependencies]
gio = { path = "../gio", optional = true }
gio.workspace = true
Loading
Loading