From 2b2be8a992f1cac753d58950f2a8d4b844f47d5f Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Thu, 4 Apr 2024 13:56:55 +0200 Subject: [PATCH] chore: Use workspace version for log --- Cargo.toml | 1 + render/canvas/Cargo.toml | 2 +- render/webgl/Cargo.toml | 2 +- scanner/Cargo.toml | 2 +- swf/Cargo.toml | 2 +- video/software/Cargo.toml | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5064b4718..e69c51c09 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,6 +63,7 @@ flate2 = "1.0.28" futures = "0.3.30" image = { version = "0.25.0", default-features = false } js-sys = "0.3.69" +log = "0.4" [workspace.lints.rust] # Clippy nightly often adds new/buggy lints that we want to ignore. diff --git a/render/canvas/Cargo.toml b/render/canvas/Cargo.toml index 754ec5dc0..92fdde19a 100644 --- a/render/canvas/Cargo.toml +++ b/render/canvas/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] js-sys = { workspace = true } -log = "0.4" +log = { workspace = true } ruffle_web_common = { path = "../../web/common" } wasm-bindgen = "=0.2.92" ruffle_render = { path = "..", features = ["web"] } diff --git a/render/webgl/Cargo.toml b/render/webgl/Cargo.toml index 16b1f8505..5d4d116cf 100644 --- a/render/webgl/Cargo.toml +++ b/render/webgl/Cargo.toml @@ -12,7 +12,7 @@ workspace = true [dependencies] js-sys = { workspace = true } -log = "0.4" +log = { workspace = true } ruffle_web_common = { path = "../../web/common" } ruffle_render = { path = "..", features = ["tessellator", "web"] } wasm-bindgen = "=0.2.92" diff --git a/scanner/Cargo.toml b/scanner/Cargo.toml index 93e2d1607..916e4951c 100644 --- a/scanner/Cargo.toml +++ b/scanner/Cargo.toml @@ -13,7 +13,7 @@ workspace = true [dependencies] clap = { workspace = true } ruffle_core = { path = "../core", features = ["deterministic"] } -log = "0.4" +log = { workspace = true } walkdir = "2.5.0" serde = { version = "1.0", features = ["derive"] } csv = "1.3" diff --git a/swf/Cargo.toml b/swf/Cargo.toml index 2bdc04002..2328c99fd 100644 --- a/swf/Cargo.toml +++ b/swf/Cargo.toml @@ -19,7 +19,7 @@ encoding_rs = "0.8.33" num-derive = "0.4" num-traits = "0.2" libflate = {version = "2.0", optional = true} -log = "0.4" +log = { workspace = true } flate2 = { workspace = true, optional = true} lzma-rs = {version = "0.3.0", optional = true } enum-map = { workspace = true } diff --git a/video/software/Cargo.toml b/video/software/Cargo.toml index 4e763eac4..86b8fb137 100644 --- a/video/software/Cargo.toml +++ b/video/software/Cargo.toml @@ -17,7 +17,7 @@ swf = { path = "../../swf" } slotmap = { workspace = true } thiserror = "1.0" flate2 = { workspace = true } -log = "0.4" +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 }