diff --git a/Cargo.toml b/Cargo.toml index 14d866bab..9c85a2960 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,9 @@ members = [ ] resolver = "2" +[workspace.package] +edition = "2021" + # Don't optimize build scripts and macros. [profile.release.build-override] opt-level = 0 @@ -49,7 +52,6 @@ opt-level = 3 [profile.dev.package.nihav_duck] opt-level = 3 - # TODO: Set rustflags here instead of in web/core/package.json, when that # feature becomes stable. See: https://github.com/rust-lang/cargo/issues/10271 # Until then, these custom profiles let cargo keep the build cache alive diff --git a/core/Cargo.toml b/core/Cargo.toml index 5965d5d98..74ddab6fe 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_core" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] diff --git a/core/build_playerglobal/Cargo.toml b/core/build_playerglobal/Cargo.toml index cdb55f8de..fbefe79d3 100644 --- a/core/build_playerglobal/Cargo.toml +++ b/core/build_playerglobal/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "build_playerglobal" version = "0.1.0" -edition = "2021" +edition.workspace = true [dependencies] convert_case = "0.6.0" @@ -11,4 +11,4 @@ swf = { path = "../../swf" } clap = {version = "4.0.12", features = ["derive"]} serde = {version = "1.0.145", features = ["derive"]} serde-xml-rs = "0.6.0" -colored = "2.0.0" \ No newline at end of file +colored = "2.0.0" diff --git a/core/macros/Cargo.toml b/core/macros/Cargo.toml index 2d4dfcbed..8cff5b7af 100644 --- a/core/macros/Cargo.toml +++ b/core/macros/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_macros" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" +edition.workspace = true [lib] proc-macro = true diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index 50759b61f..adb10b008 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -2,8 +2,7 @@ name = "ruffle_desktop" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" -default-run = "ruffle_desktop" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] @@ -43,4 +42,4 @@ render_debug_labels = ["ruffle_render_wgpu/render_debug_labels"] render_trace = ["ruffle_render_wgpu/render_trace"] # sandboxing -sandbox = [] \ No newline at end of file +sandbox = [] diff --git a/exporter/Cargo.toml b/exporter/Cargo.toml index e4f3a7a83..abe8e5ad7 100644 --- a/exporter/Cargo.toml +++ b/exporter/Cargo.toml @@ -2,7 +2,7 @@ name = "exporter" version = "0.1.0" authors = ["Nathan Adams "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] diff --git a/render/Cargo.toml b/render/Cargo.toml index ca4ff1c2e..910f8f029 100644 --- a/render/Cargo.toml +++ b/render/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_render" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] diff --git a/render/canvas/Cargo.toml b/render/canvas/Cargo.toml index 39a8a1d60..7acd0484c 100644 --- a/render/canvas/Cargo.toml +++ b/render/canvas/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_render_canvas" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] diff --git a/render/webgl/Cargo.toml b/render/webgl/Cargo.toml index 582ca4afe..c690de38e 100644 --- a/render/webgl/Cargo.toml +++ b/render/webgl/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_render_webgl" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] diff --git a/render/wgpu/Cargo.toml b/render/wgpu/Cargo.toml index 898266348..4d24a8fe2 100644 --- a/render/wgpu/Cargo.toml +++ b/render/wgpu/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_render_wgpu" version = "0.1.0" authors = ["Nathan Adams "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] diff --git a/scanner/Cargo.toml b/scanner/Cargo.toml index 4a9c110ca..cfbe42312 100644 --- a/scanner/Cargo.toml +++ b/scanner/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_scanner" version = "0.1.0" authors = ["Nathan Adams "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] diff --git a/swf/Cargo.toml b/swf/Cargo.toml index 8fdc321bc..ced099518 100644 --- a/swf/Cargo.toml +++ b/swf/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "swf" version = "0.2.0" -edition = "2021" +edition.workspace = true authors = ["Ruffle LLC "] repository = "https://github.com/ruffle-rs/ruffle" homepage = "https://github.com/ruffle-rs/ruffle" diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 48c8dcf74..f8a606bdd 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -2,7 +2,7 @@ name = "tests" version = "0.1.0" authors = ["Aaron Hill "] -edition = "2021" +edition.workspace = true [dependencies] futures = "0.3.24" diff --git a/tests/input-format/Cargo.toml b/tests/input-format/Cargo.toml index 0144ec68b..70c6f94fd 100644 --- a/tests/input-format/Cargo.toml +++ b/tests/input-format/Cargo.toml @@ -1,11 +1,9 @@ [package] name = "ruffle_input_format" version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +edition.workspace = true [dependencies] serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.86" -bitflags = "1.3.2" \ No newline at end of file +bitflags = "1.3.2" diff --git a/video/Cargo.toml b/video/Cargo.toml index 07e633a59..0d5b7d57f 100644 --- a/video/Cargo.toml +++ b/video/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_video" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] @@ -12,4 +12,4 @@ generational-arena = "0.2.8" thiserror = "1.0" [features] -default = [] \ No newline at end of file +default = [] diff --git a/video/software/Cargo.toml b/video/software/Cargo.toml index 2c48c6e51..c9ef188fd 100644 --- a/video/software/Cargo.toml +++ b/video/software/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_video_software" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] @@ -24,4 +24,4 @@ nihav_duck = { git = "https://github.com/ruffle-rs/nihav-vp6", rev = "9416fcc9fc default = ["h263", "vp6", "screenvideo"] h263 = ["h263-rs", "h263-rs-yuv"] vp6 = ["nihav_core", "nihav_codec_support", "nihav_duck", "h263-rs-yuv"] -screenvideo = [] \ No newline at end of file +screenvideo = [] diff --git a/web/Cargo.toml b/web/Cargo.toml index 6af72ee8d..a3f21a4dd 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_web" version = "0.1.0" authors = ["Mike Welsh "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" description = "Web (WASM) bindings to the Ruffle flash player" readme = "README.md" diff --git a/web/common/Cargo.toml b/web/common/Cargo.toml index 743be98d0..19ca5f7fb 100644 --- a/web/common/Cargo.toml +++ b/web/common/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_web_common" version = "0.1.0" authors = ["Ruffle LLC "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [dependencies] diff --git a/web/packages/extension/safari/Cargo.toml b/web/packages/extension/safari/Cargo.toml index c333d3f62..53c6e1502 100644 --- a/web/packages/extension/safari/Cargo.toml +++ b/web/packages/extension/safari/Cargo.toml @@ -2,7 +2,7 @@ name = "ruffle_web_safari" version = "0.1.0" authors = ["Mike Welsh "] -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" description = "Native binary for the Safari Web Extension" readme = "README.md" @@ -11,4 +11,4 @@ repository = "https://github.com/ruffle-rs/ruffle/" publish = false # This crate is useless unless packaged into an appex bundle [dependencies] -objc = "0.2.7" \ No newline at end of file +objc = "0.2.7" diff --git a/wstr/Cargo.toml b/wstr/Cargo.toml index 47cd2fdda..914823c79 100644 --- a/wstr/Cargo.toml +++ b/wstr/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ruffle_wstr" version = "0.1.0" -edition = "2021" +edition.workspace = true authors = ["Arthur Heuillard "] license = "MIT OR Apache-2.0"