diff --git a/Cargo.toml b/Cargo.toml index 50e25f3074d2..1af50321e538 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,6 +54,23 @@ egui = "0.27.2" clap = { version = "4.5.4", features = ["derive"] } anyhow = "1.0" slotmap = "1.0.7" +async-channel = "2.2.0" +bitflags = "2.5.0" +bytemuck = "1.15.0" +chrono = { version = "0.4.35", default-features = false } +enum-map = "2.7.3" +flate2 = "1.0.28" +futures = "0.3.30" +image = { version = "0.25.0", default-features = false } +js-sys = "0.3.69" +log = "0.4" +num-derive = "0.4.2" +num-traits = "0.2.18" +serde = "1.0.197" +thiserror = "1.0" +url = "2.5.0" +wasm-bindgen = "=0.2.92" +walkdir = "2.5.0" [workspace.lints.rust] # Clippy nightly often adds new/buggy lints that we want to ignore. diff --git a/core/Cargo.toml b/core/Cargo.toml index 379888f8cec9..aa3808f34e5b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -14,7 +14,7 @@ workspace = true linkme = { version = "0.3", optional = true } byteorder = "1.5" bitstream-io = "2.2.0" -flate2 = "1.0.28" +flate2 = { workspace = true } fnv = "1.0.7" gc-arena = { package = "ruffle_gc_arena", path = "../ruffle_gc_arena" } slotmap = { workspace = true } @@ -25,21 +25,21 @@ ruffle_video = { path = "../video" } ruffle_macros = { path = "macros" } ruffle_wstr = { path = "../wstr" } swf = { path = "../swf" } -bitflags = "2.5.0" +bitflags = { workspace = true } smallvec = { version = "1.13.2", features = ["union"] } -num-traits = "0.2" -num-derive = "0.4" +num-traits = { workspace = true } +num-derive = { workspace = true } quick-xml = "0.31.0" downcast-rs = "1.2.0" -url = "2.5.0" +url = { workspace = true } weak-table = "0.3.2" percent-encoding = "2.3.1" -thiserror = "1.0" -chrono = { version = "0.4", default-features = false, features = ["clock"] } +thiserror = { workspace = true } +chrono = { workspace = true, features = ["clock"] } web-time = "0.2.4" encoding_rs = "0.8.33" rand = { version = "0.8.5", features = ["std", "small_rng"], default-features = false } -serde = { version = "1.0.197", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"] } nellymoser-rs = { git = "https://github.com/ruffle-rs/nellymoser", rev = "754b1184037aa9952a907107284fb73897e26adc", optional = true } regress = "0.9" @@ -48,8 +48,8 @@ lzma-rs = {version = "0.3.0", optional = true } dasp = { version = "0.11.0", features = ["interpolate", "interpolate-linear", "signal"], optional = true } symphonia = { version = "0.5.4", default-features = false, features = ["mp3"], optional = true } enumset = "1.1.3" -bytemuck = "1.15.0" -clap = { version = "4.5.4", features = ["derive"], optional=true } +bytemuck = { workspace = true } +clap = { workspace = true, optional=true } realfft = "3.3.0" hashbrown = { version = "0.14.3", features = ["raw"] } scopeguard = "1.2.0" @@ -58,10 +58,10 @@ egui = { workspace = true, optional = true } egui_extras = { version = "0.27.2", optional = true } png = { version = "0.17.13", optional = true } flv-rs = { path = "../flv" } -async-channel = "2.2.0" +async-channel = { workspace = true } jpegxr = { git = "https://github.com/ruffle-rs/jpegxr", branch = "ruffle", optional = true } -image = { version = "0.25.0", default-features = false, features = ["tiff"] } -enum-map = "2.7.3" +image = { workspace = true, features = ["tiff"] } +enum-map = { workspace = true } ttf-parser = "0.20" num-bigint = "0.4" unic-segment = "0.9.0" @@ -69,7 +69,7 @@ id3 = "1.13.1" either = "1.10.0" [target.'cfg(not(target_family = "wasm"))'.dependencies.futures] -version = "0.3.30" +workspace = true [target.'cfg(target_family = "wasm")'.dependencies.wasm-bindgen-futures] version = "0.4.42" diff --git a/core/build_playerglobal/Cargo.toml b/core/build_playerglobal/Cargo.toml index b45b6e34403c..18dfaba840a0 100644 --- a/core/build_playerglobal/Cargo.toml +++ b/core/build_playerglobal/Cargo.toml @@ -15,6 +15,6 @@ convert_case = "0.6.0" proc-macro2 = "1.0.79" quote = "1.0.35" swf = { path = "../../swf" } -clap = {version = "4.5.4", features = ["derive"]} +clap = { workspace = true } regex = "1.10.4" -walkdir = "2.5.0" +walkdir = { workspace = true } diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index 4d2e2403e2b5..6f4a585d0009 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -11,12 +11,12 @@ version.workspace = true workspace = true [dependencies] -clap = { version = "4.5.4", features = ["derive"] } +clap = { workspace = true } cpal = "0.15.3" egui = { workspace = true } egui_extras = { version = "0.27.2", features = ["image"] } egui-wgpu = { version = "0.27.2", features = ["winit"] } -image = { version = "0.25.0", default-features = false, features = ["png"] } +image = { workspace = true, features = ["png"] } egui-winit = "0.27.2" fontdb = "0.16" ruffle_core = { path = "../core", features = ["audio", "clap", "mp3", "nellymoser", "default_compatibility_rules", "egui"] } @@ -30,23 +30,23 @@ tracing-appender = "0.2.3" slotmap = { workspace = true } winit = "0.29.15" webbrowser = "0.8.13" -url = "2.5.0" +url = { workspace = true } dirs = "5.0" isahc = { version = "1.7.2", features = ["cookies"] } rfd = "0.14.1" -anyhow = "1.0" -bytemuck = "1.15.0" +anyhow = { workspace = true } +bytemuck = { workspace = true } os_info = { version = "3", default-features = false } unic-langid = "0.9.4" sys-locale = "0.3.1" wgpu = { workspace = true } -futures = "0.3.30" -chrono = { version = "0.4", default-features = false, features = [] } +futures = { workspace = true } +chrono = { workspace = true } fluent-templates = "0.9.1" futures-lite = "2.3.0" async-io = "2.3.2" async-net = "2.0.0" -async-channel = "2.2.0" +async-channel = { workspace = true } toml_edit = { version = "0.22.9", features = ["parse"] } gilrs = "0.10" urlencoding = "2.1.3" diff --git a/exporter/Cargo.toml b/exporter/Cargo.toml index 09c679074239..8e96c50affba 100644 --- a/exporter/Cargo.toml +++ b/exporter/Cargo.toml @@ -12,11 +12,11 @@ workspace = true [dependencies] clap = { workspace = true } -futures = "0.3" +futures = { workspace = true } ruffle_core = { path = "../core", features = ["deterministic", "default_font"] } ruffle_render_wgpu = { path = "../render/wgpu", features = ["clap"] } -image = { version = "0.25.0", default-features = false, features = ["png"] } -walkdir = "2.5.0" +image = { workspace = true, features = ["png"] } +walkdir = { workspace = true } indicatif = "0.17" rayon = "1.10.0" anyhow = { workspace = true } diff --git a/flv/Cargo.toml b/flv/Cargo.toml index f92370d35d9d..ad4b496878af 100644 --- a/flv/Cargo.toml +++ b/flv/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" license = "MIT OR Apache-2.0" [dependencies] -bitflags = "2.5.0" -thiserror = "1.0" \ No newline at end of file +bitflags = { workspace = true } +thiserror = { workspace = true } \ No newline at end of file diff --git a/frontend-utils/Cargo.toml b/frontend-utils/Cargo.toml index 1034e1f2db7a..15759c8ccd78 100644 --- a/frontend-utils/Cargo.toml +++ b/frontend-utils/Cargo.toml @@ -12,4 +12,4 @@ workspace = true [dependencies] toml_edit = { version = "0.22.9", features = ["parse"] } -url = "2.5.0" +url = { workspace = true } diff --git a/render/Cargo.toml b/render/Cargo.toml index c0850cd98eae..d4a2ffd7bbab 100644 --- a/render/Cargo.toml +++ b/render/Cargo.toml @@ -16,19 +16,19 @@ swf = { path = "../swf"} tracing = { workspace = true } gif = "0.13.1" png = "0.17.13" -flate2 = "1.0.28" +flate2 = { workspace = true } smallvec = { version = "1.13.2", features = ["union"] } downcast-rs = "1.2.0" lyon = { version = "1.0.1", optional = true } lyon_geom = "1.0.5" -thiserror = "1.0" -wasm-bindgen = { version = "=0.2.92", optional = true } -enum-map = "2.7.3" -serde = { version = "1.0.197", features = ["derive"] } -clap = { version = "4.5.4", features = ["derive"], optional = true } +thiserror = { workspace = true } +wasm-bindgen = { workspace = true, optional = true } +enum-map = { workspace = true } +serde = { workspace = true, features = ["derive"] } +clap = { workspace = true, optional = true } h263-rs-yuv = { git = "https://github.com/ruffle-rs/h263-rs", rev = "5c8d9d7d86f62b70ca484df006a75a9c8ff1985c"} -num-traits = "0.2" -num-derive = "0.4" +num-traits = { workspace = true } +num-derive = { workspace = true } byteorder = "1.5" wgpu = { workspace = true, optional = true } indexmap = "2.2.6" diff --git a/render/canvas/Cargo.toml b/render/canvas/Cargo.toml index efc7eff71c6f..15a228225b2d 100644 --- a/render/canvas/Cargo.toml +++ b/render/canvas/Cargo.toml @@ -11,10 +11,10 @@ version.workspace = true workspace = true [dependencies] -js-sys = "0.3.69" -log = "0.4" +js-sys = { workspace = true } +log = { workspace = true } ruffle_web_common = { path = "../../web/common" } -wasm-bindgen = "=0.2.92" +wasm-bindgen = { workspace = true } ruffle_render = { path = "..", features = ["web"] } swf = { path = "../../swf" } diff --git a/render/naga-agal/Cargo.toml b/render/naga-agal/Cargo.toml index 0c40786fb3fc..22381946a293 100644 --- a/render/naga-agal/Cargo.toml +++ b/render/naga-agal/Cargo.toml @@ -11,10 +11,10 @@ version.workspace = true workspace = true [dependencies] -bitflags = "2.5.0" +bitflags = { workspace = true } naga = { workspace = true } -num-derive = "0.4.2" -num-traits = "0.2.18" +num-derive = { workspace = true } +num-traits = { workspace = true } [dev-dependencies] insta = "1.38.0" diff --git a/render/naga-pixelbender/Cargo.toml b/render/naga-pixelbender/Cargo.toml index 951f622b88e0..4ded717da1b0 100644 --- a/render/naga-pixelbender/Cargo.toml +++ b/render/naga-pixelbender/Cargo.toml @@ -14,5 +14,5 @@ workspace = true ruffle_render = { path = "../" } naga = { workspace = true } naga_oil = { workspace = true } -anyhow = "1.0.81" +anyhow = { workspace = true } diff --git a/render/webgl/Cargo.toml b/render/webgl/Cargo.toml index e4d8b76d877d..edc3999074f3 100644 --- a/render/webgl/Cargo.toml +++ b/render/webgl/Cargo.toml @@ -11,14 +11,14 @@ version.workspace = true workspace = true [dependencies] -js-sys = "0.3.69" -log = "0.4" +js-sys = { workspace = true } +log = { workspace = true } ruffle_web_common = { path = "../../web/common" } ruffle_render = { path = "..", features = ["tessellator", "web"] } -wasm-bindgen = "=0.2.92" -bytemuck = { version = "1.15.0", features = ["derive"] } +wasm-bindgen = { workspace = true } +bytemuck = { workspace = true, features = ["derive"] } swf = { path = "../../swf" } -thiserror = "1.0" +thiserror = { workspace = true } [dependencies.web-sys] version = "0.3.69" diff --git a/render/wgpu/Cargo.toml b/render/wgpu/Cargo.toml index a8992b64c9af..767e90d3e1f4 100644 --- a/render/wgpu/Cargo.toml +++ b/render/wgpu/Cargo.toml @@ -14,12 +14,12 @@ workspace = true wgpu = { workspace = true, features = ["naga-ir"] } tracing = { workspace = true } ruffle_render = { path = "..", features = ["tessellator", "wgpu"] } -bytemuck = { version = "1.15.0", features = ["derive"] } -clap = { version = "4.5.4", features = ["derive"], optional = true } -enum-map = "2.7.3" +bytemuck = { workspace = true, features = ["derive"] } +clap = { workspace = true, optional = true } +enum-map = { workspace = true } fnv = "1.0.7" swf = { path = "../../swf" } -image = { version = "0.25.0", default-features = false } +image = { workspace = true } naga_oil = { workspace = true } naga-agal = { path = "../naga-agal" } naga-pixelbender = { path = "../naga-pixelbender" } @@ -30,7 +30,7 @@ indexmap = "2.2.6" # desktop [target.'cfg(not(target_family = "wasm"))'.dependencies.futures] -version = "0.3.30" +workspace = true # wasm [target.'cfg(target_family = "wasm")'.dependencies.web-sys] diff --git a/scanner/Cargo.toml b/scanner/Cargo.toml index b5d09a4567d4..59781ba796b8 100644 --- a/scanner/Cargo.toml +++ b/scanner/Cargo.toml @@ -11,11 +11,11 @@ version.workspace = true workspace = true [dependencies] -clap = { version = "4.5.4", features = ["derive"] } +clap = { workspace = true } ruffle_core = { path = "../core", features = ["deterministic"] } -log = "0.4" -walkdir = "2.5.0" -serde = { version = "1.0", features = ["derive"] } +log = { workspace = true } +walkdir = { workspace = true } +serde = { workspace = true, features = ["derive"] } csv = "1.3" indicatif = "0.17" path-slash = "0.2.1" diff --git a/swf/Cargo.toml b/swf/Cargo.toml index eccdc313a320..b6cd46c55cc8 100644 --- a/swf/Cargo.toml +++ b/swf/Cargo.toml @@ -12,17 +12,17 @@ repository.workspace = true workspace = true [dependencies] -bitflags = "2.5.0" +bitflags = { workspace = true } bitstream-io = "2.2.0" byteorder = "1.5" encoding_rs = "0.8.33" -num-derive = "0.4" -num-traits = "0.2" +num-derive = { workspace = true } +num-traits = { workspace = true } libflate = {version = "2.0", optional = true} -log = "0.4" -flate2 = {version = "1.0", optional = true} +log = { workspace = true } +flate2 = { workspace = true, optional = true} lzma-rs = {version = "0.3.0", optional = true } -enum-map = "2.7.3" +enum-map = { workspace = true } simple_asn1 = "0.6.2" [features] diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 082b7e902227..4f27c64278a9 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -25,10 +25,10 @@ ruffle_render_wgpu = { path = "../render/wgpu", optional = true } ruffle_core = { path = "../core", features = ["deterministic", "timeline_debug", "avm_debug", "audio", "mp3", "default_font"] } ruffle_test_framework = { path = "framework" } libtest-mimic = "0.7.0" -walkdir = "2.5.0" -anyhow = "1.0.81" -image = { version = "0.25.0", default-features = false, features = ["png"] } -futures = "0.3.30" +walkdir = { workspace = true } +anyhow = { workspace = true } +image = { workspace = true, features = ["png"] } +futures = { workspace = true } env_logger = "0.11.3" tracing = { workspace = true } tracing-subscriber = { workspace = true } diff --git a/tests/framework/Cargo.toml b/tests/framework/Cargo.toml index 26a611991f8e..a45650e7c085 100644 --- a/tests/framework/Cargo.toml +++ b/tests/framework/Cargo.toml @@ -16,16 +16,16 @@ ruffle_render = { path = "../../render" } ruffle_input_format = { path = "../input-format" } ruffle_socket_format = { path = "../socket-format" } ruffle_video_software = { path = "../../video/software", optional = true } -image = { version = "0.25.0", default-features = false, features = ["png"] } +image = { workspace = true, features = ["png"] } regex = "1.10.4" -url = "2.5.0" -chrono = "0.4.35" +url = { workspace = true } +chrono = { workspace = true } approx = "0.5.1" pretty_assertions = "1.4.0" -serde = "1.0.197" +serde = { workspace = true } toml = "0.8.12" -anyhow = "1.0.81" -async-channel = "2.2.0" +anyhow = { workspace = true } +async-channel = { workspace = true } vfs = "0.12.0" percent-encoding = "2.3.1" diff --git a/tests/input-format/Cargo.toml b/tests/input-format/Cargo.toml index 1d19b284e933..b49a5b1665cd 100644 --- a/tests/input-format/Cargo.toml +++ b/tests/input-format/Cargo.toml @@ -11,6 +11,6 @@ version.workspace = true workspace = true [dependencies] -serde = { version = "1.0.197", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } serde_json = "1.0.115" -bitflags = "2.5.0" +bitflags = { workspace = true } diff --git a/tests/mocket/Cargo.toml b/tests/mocket/Cargo.toml index 78853acee1b6..7bd9b5b6a9db 100644 --- a/tests/mocket/Cargo.toml +++ b/tests/mocket/Cargo.toml @@ -11,8 +11,8 @@ version.workspace = true workspace = true [dependencies] -anyhow = "1.0.81" -clap = { version = "4.5.4", features = ["derive"] } +anyhow = { workspace = true } +clap = { workspace = true } tracing = { workspace = true} tracing-subscriber = { workspace = true } ruffle_socket_format = { path = "../socket-format" } \ No newline at end of file diff --git a/tests/socket-format/Cargo.toml b/tests/socket-format/Cargo.toml index be3797ed3dd3..09a616f699cf 100644 --- a/tests/socket-format/Cargo.toml +++ b/tests/socket-format/Cargo.toml @@ -11,5 +11,5 @@ version.workspace = true workspace = true [dependencies] -serde = { version = "1.0.197", features = ["derive"] } +serde = { workspace = true, features = ["derive"] } serde_json = "1.0.115" diff --git a/video/Cargo.toml b/video/Cargo.toml index 8020af5c6397..9134a4db8c6c 100644 --- a/video/Cargo.toml +++ b/video/Cargo.toml @@ -14,7 +14,7 @@ workspace = true swf = { path = "../swf" } ruffle_render = { path = "../render" } slotmap = { workspace = true } -thiserror = "1.0" +thiserror = { workspace = true } [features] default = [] diff --git a/video/software/Cargo.toml b/video/software/Cargo.toml index 6a3c9ce9e1b9..02beee0353b3 100644 --- a/video/software/Cargo.toml +++ b/video/software/Cargo.toml @@ -15,9 +15,9 @@ ruffle_render = { path = "../../render" } ruffle_video = { path = ".." } swf = { path = "../../swf" } slotmap = { workspace = true } -thiserror = "1.0" -flate2 = "1.0.28" -log = "0.4" +thiserror = { workspace = true } +flate2 = { workspace = true } +log = { workspace = true } h263-rs = { git = "https://github.com/ruffle-rs/h263-rs", rev = "5c8d9d7d86f62b70ca484df006a75a9c8ff1985c", optional = true } h263-rs-deblock = { git = "https://github.com/ruffle-rs/h263-rs", rev = "5c8d9d7d86f62b70ca484df006a75a9c8ff1985c", optional = true } diff --git a/web/Cargo.toml b/web/Cargo.toml index e87cf0ae8afc..bdbb20a27892 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -33,7 +33,7 @@ profiling = [] [dependencies] console_error_panic_hook = { version = "0.1.7", optional = true } slotmap = { workspace = true } -js-sys = "0.3.69" +js-sys = { workspace = true } tracing = { workspace = true, features = ["log"] } tracing-subscriber = { version = "0.3.18", default-features = false, features = ["registry"] } tracing-log = "0.2.0" @@ -44,21 +44,21 @@ ruffle_render = { path = "../render" } ruffle_render_webgl = { path = "../render/webgl", optional = true } ruffle_render_wgpu = { path = "../render/wgpu", optional = true } ruffle_video_software = { path = "../video/software" } -url = "2.5.0" -wasm-bindgen = "=0.2.92" +url = { workspace = true } +wasm-bindgen = { workspace = true } wasm-bindgen-futures = "0.4.42" serde-wasm-bindgen = "0.6.5" -chrono = { version = "0.4", default-features = false, features = ["wasmbind", "clock"] } +chrono = { workspace = true, features = ["wasmbind", "clock"] } getrandom = { version = "0.2", features = ["js"] } -serde = { version = "1.0.197", features = ["derive"] } -thiserror = "1.0" +serde = { workspace = true, features = ["derive"] } +thiserror = { workspace = true } base64 = "0.22.0" -async-channel = "2.2.0" +async-channel = { workspace = true } futures-util = { version = "0.3.30", features = ["sink"] } gloo-net = { version = "0.5.0", default-features = false, features = ["websocket"] } rfd = { version = "0.14.1", features = ["file-handle-inner"] } wasm-streams = "0.4.0" -futures = "0.3.30" +futures = { workspace = true } [dependencies.ruffle_core] path = "../core" diff --git a/web/common/Cargo.toml b/web/common/Cargo.toml index cf9b03ede4b1..0a1f539b81d5 100644 --- a/web/common/Cargo.toml +++ b/web/common/Cargo.toml @@ -9,9 +9,9 @@ license = "MIT OR Apache-2.0" workspace = true [dependencies] -js-sys = "0.3.69" +js-sys = { workspace = true } tracing = { workspace = true } -wasm-bindgen = "=0.2.92" +wasm-bindgen = { workspace = true } [dependencies.web-sys] version = "0.3.69"