Start the transition to workspace dependencies

This will ultimately make it simpler to update crate dependencies and
reduce duplicate when specifying requirements. Generally, this change
does not touch dependencies that are only used by a single crate. We
could consider moving them to workspace dependencies in the future.
This commit is contained in:
Martin Robinson 2023-05-16 19:54:19 +02:00
parent c5d31c3ab6
commit 2f4c47bfe7
64 changed files with 540 additions and 467 deletions

View file

@ -15,8 +15,8 @@ crate-type = ["cdylib"]
path = "lib.rs"
[dependencies]
crossbeam-channel = "0.4"
euclid = "0.22"
crossbeam-channel = { workspace = true }
euclid = { workspace = true }
glib = "0.9"
gstreamer = "0.15"
gstreamer-base = "0.15"
@ -24,14 +24,14 @@ gstreamer-gl = "0.15"
gstreamer-gl-sys = { version = "0.8", features = ["wayland"] }
gstreamer-sys = "0.8"
gstreamer-video = "0.15"
lazy_static = "1.4"
lazy_static = { workspace = true }
libservo = { path = "../../components/servo" }
log = "0.4"
log = { workspace = true }
servo-media = { git = "https://github.com/servo/media" }
sparkle = "0.1"
surfman = "0.6"
surfman-chains = "0.7"
surfman-chains-api = "0.2"
sparkle = { workspace = true }
surfman = { workspace = true }
surfman-chains = { workspace = true }
surfman-chains-api = { workspace = true }
webxr = { git = "https://github.com/servo/webxr", features = ["glwindow"] }
[build-dependencies]

View file

@ -18,11 +18,11 @@ layout-2013 = ["simpleservo/layout-2013"]
layout-2020 = ["simpleservo/layout-2020"]
[dependencies]
libc = "0.2"
libc = { workspace = true }
libservo = { path = "../../components/servo", features = ["no_static_freetype"] }
log = "0.4"
log = { workspace = true }
servo-egl = "0.2"
simpleservo = { path = "../libsimpleservo/api", features = ["no_static_freetype"] }
smallvec = "1.9"
smallvec = { workspace = true }
webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "magicleap"] }
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }

View file

@ -7,30 +7,30 @@ edition = "2018"
publish = false
[dependencies]
getopts = "0.2.11"
ipc-channel = "0.14"
getopts = { workspace = true }
ipc-channel = { workspace = true }
libservo = { path = "../../../components/servo" }
log = "0.4"
log = { workspace = true }
servo-media = { git = "https://github.com/servo/media" }
surfman = { version = "0.6", features = ["sm-angle-default"] }
surfman = { workspace = true, features = ["sm-angle-default"] }
webxr = { git = "https://github.com/servo/webxr"}
webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
[target.'cfg(not(target_os = "macos"))'.dependencies]
libc = "0.2"
libc = { workspace = true }
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.6"
[target.'cfg(target_os = "windows")'.dependencies]
winapi = "0.3.2"
winapi = { workspace = true }
[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))'.dependencies]
libloading = "0.5"
[build-dependencies]
gl_generator = "0.14"
serde_json = "1.0"
serde_json = { workspace = true }
[features]
debugmozjs = ["libservo/debugmozjs"]

View file

@ -13,17 +13,17 @@ test = false
bench = false
[dependencies]
backtrace = "0.3"
env_logger = "0.8"
lazy_static = "1"
log = "0.4"
backtrace = { workspace = true }
env_logger = { workspace = true }
lazy_static = { workspace = true }
log = { workspace = true }
simpleservo = { path = "../api" }
surfman = "0.6"
keyboard-types = "0.6"
surfman = { workspace = true }
keyboard-types = { workspace = true }
[target.'cfg(target_os = "windows")'.dependencies]
libc = "0.2"
winapi = { version = "0.3", features = ["wingdi", "winuser", "winnt", "winbase", "processenv", "namedpipeapi", "ntdef", "minwindef", "handleapi", "debugapi"] }
libc = { workspace = true }
winapi = { workspace = true, features = ["wingdi", "winuser", "winnt", "winbase", "processenv", "namedpipeapi", "ntdef", "minwindef", "handleapi", "debugapi"] }
[build-dependencies]
cbindgen = "0.20"

View file

@ -18,9 +18,9 @@ android_injected_glue = "0.2"
android_logger = "0.10"
gstreamer = "0.15"
jni = "0.18.0"
libc = "0.2"
log = "0.4"
serde_json = "1.0"
libc = { workspace = true }
log = { workspace = true }
serde_json = { workspace = true }
simpleservo = { path = "../api" }
[build-dependencies]

View file

@ -46,27 +46,27 @@ webrender_debugger = ["libservo/webrender_debugger"]
xr-profile = ["libservo/xr-profile"]
[target.'cfg(not(target_os = "android"))'.dependencies]
backtrace = "0.3"
backtrace = { workspace = true }
clipboard = "0.5"
euclid = "0.22"
getopts = "0.2.11"
keyboard-types = "0.6"
lazy_static = "1"
libc = "0.2"
euclid = { workspace = true }
getopts = { workspace = true }
keyboard-types = { workspace = true }
lazy_static = { workspace = true }
libc = { workspace = true }
libservo = { path = "../../components/servo" }
log = "0.4"
log = { workspace = true }
servo-media = { git = "https://github.com/servo/media" }
shellwords = "1.0.0"
surfman = { version = "0.6", features = ["sm-winit", "sm-x11"] }
surfman = { workspace = true, features = ["sm-winit", "sm-x11"] }
tinyfiledialogs = "3.0"
webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", "headless"] }
winit = "0.28.3"
[target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]
image = "0.24"
image = { workspace = true }
[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
sig = "1.0"
[target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3", features = ["wingdi", "winuser", "winnt", "winbase", "processenv", "namedpipeapi", "ntdef", "minwindef", "handleapi", "debugapi"] }
winapi = { workspace = true, features = ["wingdi", "winuser", "winnt", "winbase", "processenv", "namedpipeapi", "ntdef", "minwindef", "handleapi", "debugapi"] }