Skip to content

Commit

Permalink
Enforce version of workspace crates
Browse files Browse the repository at this point in the history
We still have the ffi crate not using cargo workspace, which is
a bit annoying.
  • Loading branch information
bilelmoussaoui committed Feb 1, 2024
1 parent 86e6769 commit ab0f68c
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ libc = "0.2"
bitflags = "2.4"
thiserror = "1"
gir-format-check = "^0.1"
glib-sys = { path = "glib/sys" }
gobject-sys = { path = "glib/gobject-sys" }
glib = { path = "glib" }
gio-sys = { path = "gio/sys" }
gio = { path = "gio" }
pango-sys = { path = "pango/sys" }
pango = { path = "pango" }
cairo-sys-rs = { path = "cairo/sys" }
cairo-rs = { path = "cairo" }
glib-macros = { path = "glib-macros" }
glib-sys = { path = "glib/sys", version = "0.19" }
gobject-sys = { path = "glib/gobject-sys", version = "0.19" }
glib = { path = "glib", version = "0.19" }
gio-sys = { path = "gio/sys", version = "0.19" }
gio = { path = "gio", version = "0.19" }
pango-sys = { path = "pango/sys", version = "0.19" }
pango = { path = "pango", version = "0.19" }
cairo-sys-rs = { path = "cairo/sys", version = "0.19" }
cairo-rs = { path = "cairo", version = "0.19" }
glib-macros = { path = "glib-macros", version = "0.19" }

[workspace.metadata.docs.rs]
all-features = true
Expand Down
2 changes: 1 addition & 1 deletion gdk-pixbuf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ v2_40 = ["ffi/v2_40"]
v2_42 = ["v2_40", "ffi/v2_42"]

[dependencies]
ffi = { package = "gdk-pixbuf-sys", path = "sys" }
ffi = { package = "gdk-pixbuf-sys", path = "sys", version = "0.19" }
libc.workspace = true
glib.workspace = true
gio.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion gio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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" }
ffi = { package = "gio-sys", path = "sys", version = "0.19" }
glib.workspace = true
thiserror.workspace = true
pin-project-lite = "0.2"
Expand Down
6 changes: 3 additions & 3 deletions glib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ futures-task = { version = "0.3", default-features = false }
futures-executor = "0.3"
futures-channel = "0.3"
futures-util = "0.3"
ffi = { package = "glib-sys", path = "sys" }
gobject_ffi = { package = "gobject-sys", path = "gobject-sys" }
ffi = { package = "glib-sys", path = "sys", version = "0.19"}
gobject_ffi = { package = "gobject-sys", path = "gobject-sys", version = "0.19" }
glib-macros.workspace = true
rs-log = { package = "log", version = "0.4", optional = true }
smallvec = { version = "1.12", features = ["union", "const_generics", "const_new"] }
thiserror.workspace = true
gio_ffi = { package = "gio-sys", path = "../gio/sys", optional = true }
gio_ffi = { package = "gio-sys", path = "../gio/sys", optional = true, version = "0.19" }
memchr = "2.7.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion graphene/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ name = "graphene"
v1_12 = ["ffi/v1_12"]

[dependencies]
ffi = { package = "graphene-sys", path = "sys" }
ffi = { package = "graphene-sys", path = "sys", version = "0.19" }
libc.workspace = true
glib.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion pango/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ v1_50 = ["v1_48", "ffi/v1_50"]
v1_52 = ["v1_50", "ffi/v1_52"]

[dependencies]
ffi = { package = "pango-sys", path = "sys" }
ffi = { package = "pango-sys", path = "sys", version = "0.19" }
libc.workspace = true
glib.workspace = true
gio.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion pangocairo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rust-version.workspace = true
version.workspace = true

[dependencies]
ffi = { package = "pangocairo-sys", path = "sys" }
ffi = { package = "pangocairo-sys", path = "sys", version = "0.19" }
libc.workspace = true
glib.workspace = true
pango.workspace = true
Expand Down

0 comments on commit ab0f68c

Please sign in to comment.