chore: Move rfd dependency to workspace

This makes sure there's only one version of rfd
used and fixes Flatpak compilation issues.
This commit is contained in:
Kamil Jarosz 2024-08-22 11:30:16 +02:00 committed by TÖRÖK Attila
parent a10b31b118
commit 9f8b89168c
4 changed files with 5 additions and 47 deletions

47
Cargo.lock generated
View File

@ -3408,17 +3408,6 @@ dependencies = [
"malloc_buf",
]
[[package]]
name = "objc-foundation"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
dependencies = [
"block",
"objc",
"objc_id",
]
[[package]]
name = "objc-sys"
version = "0.3.5"
@ -3535,15 +3524,6 @@ dependencies = [
"objc2-metal",
]
[[package]]
name = "objc_id"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
dependencies = [
"objc",
]
[[package]]
name = "object"
version = "0.35.0"
@ -4181,29 +4161,6 @@ dependencies = [
"windows-registry",
]
[[package]]
name = "rfd"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251"
dependencies = [
"ashpd",
"block",
"dispatch",
"js-sys",
"log",
"objc",
"objc-foundation",
"objc_id",
"pollster",
"raw-window-handle",
"urlencoding",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
"windows-sys 0.48.0",
]
[[package]]
name = "rfd"
version = "0.14.1"
@ -4334,7 +4291,7 @@ dependencies = [
"image",
"os_info",
"rand",
"rfd 0.14.1 (git+https://github.com/PolyMeilex/rfd.git?rev=42dcc7d61fc5e278b4ed76bb9720ba4d89266f01)",
"rfd",
"ruffle_core",
"ruffle_frontend_utils",
"ruffle_render",
@ -4596,7 +4553,7 @@ dependencies = [
"getrandom",
"gloo-net",
"js-sys",
"rfd 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rfd",
"ruffle_core",
"ruffle_render",
"ruffle_render_canvas",

View File

@ -73,6 +73,7 @@ url = "2.5.2"
wasm-bindgen = "=0.2.93"
walkdir = "2.5.0"
tokio = { version = "1.39.3" }
rfd = { git = "https://github.com/PolyMeilex/rfd.git", rev = "42dcc7d61fc5e278b4ed76bb9720ba4d89266f01" }
[workspace.lints.rust]
# Clippy nightly often adds new/buggy lints that we want to ignore.

View File

@ -32,7 +32,7 @@ winit = "0.29.15"
webbrowser = "1.0.1"
url = { workspace = true }
dirs = "5.0"
rfd = { git = "https://github.com/PolyMeilex/rfd.git", rev = "42dcc7d61fc5e278b4ed76bb9720ba4d89266f01" }
rfd = { workspace = true }
anyhow = { workspace = true }
bytemuck = { workspace = true }
os_info = { version = "3", default-features = false }

View File

@ -56,7 +56,7 @@ base64 = "0.22.0"
async-channel = { workspace = true }
futures-util = { version = "0.3.30", features = ["sink"] }
gloo-net = { version = "0.6.0", default-features = false, features = ["websocket"] }
rfd = { version = "0.14.1", features = ["file-handle-inner"] }
rfd = { workspace = true, features = ["file-handle-inner"] }
wasm-streams = "0.4.0"
futures = { workspace = true }
zip = { version = "2.1.6", default-features = false}