From 96bc34a66d5b2a8616967b2079ce64420dae668e Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 23 Nov 2023 15:45:11 +0100 Subject: [PATCH] Use workspace definitions of edition,license,rust-version,version --- Cargo.toml | 7 +++++++ crates/ecolor/Cargo.toml | 8 ++++---- crates/eframe/Cargo.toml | 8 ++++---- crates/egui-wgpu/Cargo.toml | 8 ++++---- crates/egui-winit/Cargo.toml | 8 ++++---- crates/egui/Cargo.toml | 8 ++++---- crates/egui_demo_app/Cargo.toml | 8 ++++---- crates/egui_demo_lib/Cargo.toml | 8 ++++---- crates/egui_extras/Cargo.toml | 8 ++++---- crates/egui_glow/Cargo.toml | 8 ++++---- crates/egui_plot/Cargo.toml | 8 ++++---- crates/emath/Cargo.toml | 8 ++++---- crates/epaint/Cargo.toml | 6 +++--- 13 files changed, 54 insertions(+), 47 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 038a0c2db..a3601a428 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,13 @@ members = [ "examples/*", ] +[workspace.package] +edition = "2021" +license = "MIT OR Apache-2.0" +rust-version = "1.72" +version = "0.23.0" + + [profile.release] # lto = true # VERY slightly smaller wasm # opt-level = 's' # 10-20% smaller wasm compared to `opt-level = 3` diff --git a/crates/ecolor/Cargo.toml b/crates/ecolor/Cargo.toml index 245fbe433..6870d2093 100644 --- a/crates/ecolor/Cargo.toml +++ b/crates/ecolor/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "ecolor" -version = "0.23.0" +version.workspace = true authors = [ "Emil Ernerfeldt ", "Andreas Reich ", ] description = "Color structs and color conversion utilities" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui" categories = ["mathematics", "encoding"] diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index 9176e5765..7c73233db 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "eframe" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] description = "egui framework - write GUI apps that compiles to web and/or natively" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui/tree/master/crates/eframe" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/crates/eframe" categories = ["gui", "game-development"] diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml index e7fd6f879..2762338ce 100644 --- a/crates/egui-wgpu/Cargo.toml +++ b/crates/egui-wgpu/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "egui-wgpu" -version = "0.23.0" +version.workspace = true description = "Bindings for using egui natively using the wgpu library" authors = [ "Nils Hasenbanck ", "embotech ", "Emil Ernerfeldt ", ] -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui/tree/master/crates/egui-wgpu" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/crates/egui-wgpu" categories = ["gui", "game-development"] diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml index 396b8ffd3..4a0da23df 100644 --- a/crates/egui-winit/Cargo.toml +++ b/crates/egui-winit/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "egui-winit" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] description = "Bindings for using egui with winit" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui/tree/master/crates/egui-winit" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/crates/egui-winit" categories = ["gui", "game-development"] diff --git a/crates/egui/Cargo.toml b/crates/egui/Cargo.toml index cb87b5b99..fa1c4a0ea 100644 --- a/crates/egui/Cargo.toml +++ b/crates/egui/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "egui" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] description = "An easy-to-use immediate mode GUI that runs on both web and native" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "../../README.md" repository = "https://github.com/emilk/egui" categories = ["gui", "game-development"] diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index 82b98723d..ffb91b97e 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "egui_demo_app" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] -license = "MIT OR Apache-2.0" -edition = "2021" -rust-version = "1.72" +license.workspace = true +edition.workspace = true +rust-version.workspace = true publish = false default-run = "egui_demo_app" diff --git a/crates/egui_demo_lib/Cargo.toml b/crates/egui_demo_lib/Cargo.toml index abab970ae..3e7674453 100644 --- a/crates/egui_demo_lib/Cargo.toml +++ b/crates/egui_demo_lib/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "egui_demo_lib" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] description = "Example library for egui" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui/tree/master/crates/egui_demo_lib" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/crates/egui_demo_lib" categories = ["gui", "graphics"] diff --git a/crates/egui_extras/Cargo.toml b/crates/egui_extras/Cargo.toml index 3fdf92857..0ed187879 100644 --- a/crates/egui_extras/Cargo.toml +++ b/crates/egui_extras/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "egui_extras" -version = "0.23.0" +version.workspace = true authors = [ "Dominik Rössler ", "Emil Ernerfeldt ", "René Rössler ", ] description = "Extra functionality and widgets for the egui GUI library" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui" categories = ["gui", "game-development"] diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml index 1e21137ab..e44008a32 100644 --- a/crates/egui_glow/Cargo.toml +++ b/crates/egui_glow/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "egui_glow" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] description = "Bindings for using egui natively using the glow library" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui/tree/master/crates/egui_glow" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/crates/egui_glow" categories = ["gui", "game-development"] diff --git a/crates/egui_plot/Cargo.toml b/crates/egui_plot/Cargo.toml index 40c7e0d07..86402cb87 100644 --- a/crates/egui_plot/Cargo.toml +++ b/crates/egui_plot/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "egui_plot" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] description = "Immediate mode plotting for the egui GUI library" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui" categories = ["visualization", "gui"] diff --git a/crates/emath/Cargo.toml b/crates/emath/Cargo.toml index 4b45815ab..3629e0734 100644 --- a/crates/emath/Cargo.toml +++ b/crates/emath/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "emath" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] description = "Minimal 2D math library for GUI work" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui/tree/master/crates/emath" -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/crates/emath" categories = ["mathematics", "gui"] diff --git a/crates/epaint/Cargo.toml b/crates/epaint/Cargo.toml index cfbe32908..63268d34f 100644 --- a/crates/epaint/Cargo.toml +++ b/crates/epaint/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "epaint" -version = "0.23.0" +version.workspace = true authors = ["Emil Ernerfeldt "] description = "Minimal 2D graphics library for GUI work" -edition = "2021" -rust-version = "1.72" +edition.workspace = true +rust-version.workspace = true homepage = "https://github.com/emilk/egui/tree/master/crates/epaint" license = "(MIT OR Apache-2.0) AND OFL-1.1 AND LicenseRef-UFL-1.0" # OFL and UFL used by default_fonts. See https://github.com/emilk/egui/issues/2321 readme = "README.md"