From f7ed1bb0066a49d734df35d5f8a9b9d082ff67c4 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Sat, 24 Sep 2022 18:09:57 +0200 Subject: [PATCH 01/13] move workspace to top --- Cargo.toml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9d84500fd8d53..bdd5b41695130 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,15 @@ +[workspace] +exclude = ["benches", "crates/bevy_ecs_compile_fail_tests"] +members = [ + "crates/*", + "examples/ios", + "tools/ci", + "tools/spancmp", + "tools/build-example-pages", + "tools/build-wasm-example", + "errors", +] + [package] name = "bevy" version = "0.9.0-dev" @@ -11,18 +23,6 @@ license = "MIT OR Apache-2.0" readme = "README.md" repository = "/~https://github.com/bevyengine/bevy" -[workspace] -exclude = ["benches", "crates/bevy_ecs_compile_fail_tests"] -members = [ - "crates/*", - "examples/ios", - "tools/ci", - "tools/spancmp", - "tools/build-example-pages", - "tools/build-wasm-example", - "errors", -] - [features] default = [ "animation", From c1a9f8520af998f6bb509873b5bd01f0a2cb757a Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Sat, 24 Sep 2022 20:30:17 +0200 Subject: [PATCH 02/13] use version, edition, homepage, readme and repo form workspace --- Cargo.toml | 13 +++++++++---- benches/Cargo.toml | 2 +- crates/bevy_animation/Cargo.toml | 8 ++++---- crates/bevy_app/Cargo.toml | 8 ++++---- crates/bevy_asset/Cargo.toml | 8 ++++---- crates/bevy_audio/Cargo.toml | 8 ++++---- crates/bevy_core/Cargo.toml | 8 ++++---- crates/bevy_core_pipeline/Cargo.toml | 8 ++++---- crates/bevy_derive/Cargo.toml | 8 ++++---- crates/bevy_diagnostic/Cargo.toml | 8 ++++---- crates/bevy_dylib/Cargo.toml | 8 ++++---- crates/bevy_dynamic_plugin/Cargo.toml | 8 ++++---- crates/bevy_ecs/Cargo.toml | 8 ++++---- crates/bevy_ecs/macros/Cargo.toml | 4 ++-- crates/bevy_ecs_compile_fail_tests/Cargo.toml | 6 +++--- crates/bevy_encase_derive/Cargo.toml | 8 ++++---- crates/bevy_gilrs/Cargo.toml | 8 ++++---- crates/bevy_gltf/Cargo.toml | 8 ++++---- crates/bevy_hierarchy/Cargo.toml | 8 ++++---- crates/bevy_input/Cargo.toml | 8 ++++---- crates/bevy_internal/Cargo.toml | 8 ++++---- crates/bevy_log/Cargo.toml | 8 ++++---- crates/bevy_macro_utils/Cargo.toml | 8 ++++---- crates/bevy_math/Cargo.toml | 8 ++++---- crates/bevy_mikktspace/Cargo.toml | 8 ++++---- crates/bevy_pbr/Cargo.toml | 8 ++++---- crates/bevy_ptr/Cargo.toml | 8 ++++---- crates/bevy_reflect/Cargo.toml | 8 ++++---- crates/bevy_reflect/bevy_reflect_derive/Cargo.toml | 8 ++++---- crates/bevy_render/Cargo.toml | 8 ++++---- crates/bevy_render/macros/Cargo.toml | 8 ++++---- crates/bevy_scene/Cargo.toml | 8 ++++---- crates/bevy_sprite/Cargo.toml | 8 ++++---- crates/bevy_tasks/Cargo.toml | 8 ++++---- crates/bevy_text/Cargo.toml | 8 ++++---- crates/bevy_time/Cargo.toml | 8 ++++---- crates/bevy_transform/Cargo.toml | 8 ++++---- crates/bevy_ui/Cargo.toml | 8 ++++---- crates/bevy_utils/Cargo.toml | 8 ++++---- crates/bevy_window/Cargo.toml | 8 ++++---- crates/bevy_winit/Cargo.toml | 8 ++++---- errors/Cargo.toml | 2 +- examples/ios/Cargo.toml | 2 +- tools/build-example-pages/Cargo.toml | 4 ++-- tools/build-wasm-example/Cargo.toml | 2 +- tools/ci/Cargo.toml | 2 +- tools/spancmp/Cargo.toml | 2 +- 47 files changed, 170 insertions(+), 165 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bdd5b41695130..37340e417374b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,19 +9,24 @@ members = [ "tools/build-wasm-example", "errors", ] +[workspace.package] +version = "0.9.0-dev" +edition = "2021" +homepage = "https://bevyengine.org2" +repository = "/~https://github.com/bevyengine/bevy" [package] name = "bevy" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true categories = ["game-engines", "graphics", "gui", "rendering"] description = "A refreshingly simple data-driven game engine and app framework" exclude = ["assets/", "tools/", ".github/", "crates/", "examples/wasm/assets/"] -homepage = "https://bevyengine.org" +homepage.workspace = true keywords = ["game", "engine", "gamedev", "graphics", "bevy"] license = "MIT OR Apache-2.0" readme = "README.md" -repository = "/~https://github.com/bevyengine/bevy" +repository.workspace = true [features] default = [ diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 165fbce1cb25e..506f7366db46c 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "benches" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "Benchmarks for Bevy engine" publish = false license = "MIT OR Apache-2.0" diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml index 1cf3668b094a4..31daaf5839135 100644 --- a/crates/bevy_animation/Cargo.toml +++ b/crates/bevy_animation/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_animation" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides animation functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml index d8ce9e91d0298..aac26d12aa75c 100644 --- a/crates/bevy_app/Cargo.toml +++ b/crates/bevy_app/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_app" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides core App functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml index bd6874d683f83..dcd3bcc1a248f 100644 --- a/crates/bevy_asset/Cargo.toml +++ b/crates/bevy_asset/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_asset" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides asset functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml index 495091215275c..4ad26f6ba73fa 100644 --- a/crates/bevy_audio/Cargo.toml +++ b/crates/bevy_audio/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_audio" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides audio functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_core/Cargo.toml b/crates/bevy_core/Cargo.toml index 08bd7987c36f7..d66035c4250de 100644 --- a/crates/bevy_core/Cargo.toml +++ b/crates/bevy_core/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_core" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides core functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_core_pipeline/Cargo.toml b/crates/bevy_core_pipeline/Cargo.toml index 42612f77bf0c3..7dbfff7e79324 100644 --- a/crates/bevy_core_pipeline/Cargo.toml +++ b/crates/bevy_core_pipeline/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "bevy_core_pipeline" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true authors = [ "Bevy Contributors ", "Carter Anderson ", ] description = "Provides a core render pipeline for Bevy Engine." -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_derive/Cargo.toml b/crates/bevy_derive/Cargo.toml index 267da668f6700..7b9f7f69fbe8d 100644 --- a/crates/bevy_derive/Cargo.toml +++ b/crates/bevy_derive/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_derive" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides derive implementations for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_diagnostic/Cargo.toml b/crates/bevy_diagnostic/Cargo.toml index 295a969f32e14..64047af92fe2f 100644 --- a/crates/bevy_diagnostic/Cargo.toml +++ b/crates/bevy_diagnostic/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_diagnostic" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides diagnostic functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_dylib/Cargo.toml b/crates/bevy_dylib/Cargo.toml index df62cc4b031f7..2d2a505cac0a5 100644 --- a/crates/bevy_dylib/Cargo.toml +++ b/crates/bevy_dylib/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_dylib" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Force the Bevy Engine to be dynamically linked for faster linking" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_dynamic_plugin/Cargo.toml b/crates/bevy_dynamic_plugin/Cargo.toml index 1d906d8f2f0e1..a88b3cb0b244e 100644 --- a/crates/bevy_dynamic_plugin/Cargo.toml +++ b/crates/bevy_dynamic_plugin/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_dynamic_plugin" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides dynamic plugin loading capabilities for non-wasm platforms" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml index f08c82658b473..457aab11a8862 100644 --- a/crates/bevy_ecs/Cargo.toml +++ b/crates/bevy_ecs/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_ecs" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Bevy Engine's entity component system" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["ecs", "game", "bevy"] categories = ["game-engines", "data-structures"] diff --git a/crates/bevy_ecs/macros/Cargo.toml b/crates/bevy_ecs/macros/Cargo.toml index d3c6e89ee24c5..8743e57ce4298 100644 --- a/crates/bevy_ecs/macros/Cargo.toml +++ b/crates/bevy_ecs/macros/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "bevy_ecs_macros" -version = "0.9.0-dev" +version.workspace = true description = "Bevy ECS Macros" -edition = "2021" +edition.workspace = true license = "MIT OR Apache-2.0" [lib] diff --git a/crates/bevy_ecs_compile_fail_tests/Cargo.toml b/crates/bevy_ecs_compile_fail_tests/Cargo.toml index e48c4c03e3954..7dba5e74b39f7 100644 --- a/crates/bevy_ecs_compile_fail_tests/Cargo.toml +++ b/crates/bevy_ecs_compile_fail_tests/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_ecs_compile_fail_tests" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "Compile fail tests for Bevy Engine's entity component system" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" publish = false diff --git a/crates/bevy_encase_derive/Cargo.toml b/crates/bevy_encase_derive/Cargo.toml index 9457f154da632..58b2cee604606 100644 --- a/crates/bevy_encase_derive/Cargo.toml +++ b/crates/bevy_encase_derive/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_encase_derive" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Bevy derive macro for encase" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml index ed9597cdb0c3f..9f22fd3cd950a 100644 --- a/crates/bevy_gilrs/Cargo.toml +++ b/crates/bevy_gilrs/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_gilrs" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Gamepad system made using Gilrs for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml index 80752651bd864..163ed8748cb25 100644 --- a/crates/bevy_gltf/Cargo.toml +++ b/crates/bevy_gltf/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_gltf" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Bevy Engine GLTF loading" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_hierarchy/Cargo.toml b/crates/bevy_hierarchy/Cargo.toml index 471e19a3c604d..61c677049c5e6 100644 --- a/crates/bevy_hierarchy/Cargo.toml +++ b/crates/bevy_hierarchy/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_hierarchy" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides hierarchy functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml index e3f500db46e09..c4b899bbbe2fb 100644 --- a/crates/bevy_input/Cargo.toml +++ b/crates/bevy_input/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_input" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides input functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml index f38c60c203f9a..ada568029f671 100644 --- a/crates/bevy_internal/Cargo.toml +++ b/crates/bevy_internal/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_internal" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "An internal Bevy crate used to facilitate optional dynamic linking via the 'dynamic' feature" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["game", "engine", "gamedev", "graphics", "bevy"] categories = ["game-engines", "graphics", "gui", "rendering"] diff --git a/crates/bevy_log/Cargo.toml b/crates/bevy_log/Cargo.toml index 75b6ea7510e33..c39d1bbebcb68 100644 --- a/crates/bevy_log/Cargo.toml +++ b/crates/bevy_log/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_log" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides logging for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_macro_utils/Cargo.toml b/crates/bevy_macro_utils/Cargo.toml index 4eb7aaec77381..631662a47ade1 100644 --- a/crates/bevy_macro_utils/Cargo.toml +++ b/crates/bevy_macro_utils/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_macro_utils" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "A collection of utils for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_math/Cargo.toml b/crates/bevy_math/Cargo.toml index c519bf85e1690..7dec72ee3f264 100644 --- a/crates/bevy_math/Cargo.toml +++ b/crates/bevy_math/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_math" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides math functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_mikktspace/Cargo.toml b/crates/bevy_mikktspace/Cargo.toml index b56e1797d8c34..2aa8554fccf68 100644 --- a/crates/bevy_mikktspace/Cargo.toml +++ b/crates/bevy_mikktspace/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "bevy_mikktspace" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true authors = ["Benjamin Wasty ", "David Harvey-Macaulay ", "Layl Bongers "] description = "Mikkelsen tangent space algorithm" documentation = "https://docs.rs/bevy" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "Zlib AND (MIT OR Apache-2.0)" keywords = ["bevy", "3D", "graphics", "algorithm", "tangent"] diff --git a/crates/bevy_pbr/Cargo.toml b/crates/bevy_pbr/Cargo.toml index f5db34d983865..6e27bc506d85a 100644 --- a/crates/bevy_pbr/Cargo.toml +++ b/crates/bevy_pbr/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_pbr" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Adds PBR rendering to Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_ptr/Cargo.toml b/crates/bevy_ptr/Cargo.toml index 04b7e30fc9b5b..85a9d3f1c91c5 100644 --- a/crates/bevy_ptr/Cargo.toml +++ b/crates/bevy_ptr/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_ptr" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Utilities for working with untyped pointers in a more safe way" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy", "no_std"] diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml index 2495e45b5180b..5337b1130231f 100644 --- a/crates/bevy_reflect/Cargo.toml +++ b/crates/bevy_reflect/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_reflect" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Dynamically interact with rust types" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] readme = "README.md" diff --git a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml index c7c947537fec7..45209ab846f80 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml +++ b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_reflect_derive" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Derive implementations for bevy_reflect" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 2bd7342aec3f3..26cbf4c98e54b 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_render" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides rendering functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_render/macros/Cargo.toml b/crates/bevy_render/macros/Cargo.toml index c57084557c830..4be2ddb6477ba 100644 --- a/crates/bevy_render/macros/Cargo.toml +++ b/crates/bevy_render/macros/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_render_macros" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Derive implementations for bevy_render" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml index ded4ad5fd1e96..0b7ef42b296d0 100644 --- a/crates/bevy_scene/Cargo.toml +++ b/crates/bevy_scene/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_scene" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides scene functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml index ff1ff15c478ab..ab81a010c0b58 100644 --- a/crates/bevy_sprite/Cargo.toml +++ b/crates/bevy_sprite/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_sprite" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides sprite functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_tasks/Cargo.toml b/crates/bevy_tasks/Cargo.toml index 91f1e8e5e334c..f9452673ebdce 100644 --- a/crates/bevy_tasks/Cargo.toml +++ b/crates/bevy_tasks/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_tasks" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "A task executor for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_text/Cargo.toml b/crates/bevy_text/Cargo.toml index 4f33419da6b97..033237d5ca7a3 100644 --- a/crates/bevy_text/Cargo.toml +++ b/crates/bevy_text/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_text" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides text functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_time/Cargo.toml b/crates/bevy_time/Cargo.toml index 7ce9db0ff042b..ec97270f1c9ed 100644 --- a/crates/bevy_time/Cargo.toml +++ b/crates/bevy_time/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_time" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides time functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml index d1fe39cc64bb2..e048469600ef9 100644 --- a/crates/bevy_transform/Cargo.toml +++ b/crates/bevy_transform/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_transform" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides transform functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml index 24c4305251d95..225d1a5e5b35d 100644 --- a/crates/bevy_ui/Cargo.toml +++ b/crates/bevy_ui/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_ui" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "A custom ECS-driven UI framework built specifically for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_utils/Cargo.toml b/crates/bevy_utils/Cargo.toml index 49c67fc021f5c..a42da29398784 100644 --- a/crates/bevy_utils/Cargo.toml +++ b/crates/bevy_utils/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_utils" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "A collection of utils for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_window/Cargo.toml b/crates/bevy_window/Cargo.toml index f1402447072de..4459a90ab3367 100644 --- a/crates/bevy_window/Cargo.toml +++ b/crates/bevy_window/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_window" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "Provides windowing functionality for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml index 5c7014ecbfa8a..55ed18fcc08d6 100644 --- a/crates/bevy_winit/Cargo.toml +++ b/crates/bevy_winit/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_winit" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "A winit window and input backend for Bevy Engine" -homepage = "https://bevyengine.org" -repository = "/~https://github.com/bevyengine/bevy" +homepage.workspace = true +repository.workspace = true license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/errors/Cargo.toml b/errors/Cargo.toml index 07ad946b1a864..cad938a653f93 100644 --- a/errors/Cargo.toml +++ b/errors/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "errors" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "Bevy's error codes" publish = false license = "MIT OR Apache-2.0" diff --git a/examples/ios/Cargo.toml b/examples/ios/Cargo.toml index 0e77864a9b737..ae0f6ba0bb068 100644 --- a/examples/ios/Cargo.toml +++ b/examples/ios/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bevy-ios-example" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "Example for building an iOS app with Bevy" publish = false license = "MIT OR Apache-2.0" diff --git a/tools/build-example-pages/Cargo.toml b/tools/build-example-pages/Cargo.toml index ab97d1468965f..ff154ae7337a7 100644 --- a/tools/build-example-pages/Cargo.toml +++ b/tools/build-example-pages/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "build-example-pages" -version = "0.9.0-dev" -edition = "2021" +version.workspace = true +edition.workspace = true description = "handle examples in Bevy" publish = false license = "MIT OR Apache-2.0" diff --git a/tools/build-wasm-example/Cargo.toml b/tools/build-wasm-example/Cargo.toml index b0bf1bcffd293..8bb42928434f5 100644 --- a/tools/build-wasm-example/Cargo.toml +++ b/tools/build-wasm-example/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "build-wasm-example" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "Build an example for wasm" publish = false license = "MIT OR Apache-2.0" diff --git a/tools/ci/Cargo.toml b/tools/ci/Cargo.toml index 941bca58efc5d..6fba484be40bc 100644 --- a/tools/ci/Cargo.toml +++ b/tools/ci/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ci" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "CI script for Bevy" publish = false license = "MIT OR Apache-2.0" diff --git a/tools/spancmp/Cargo.toml b/tools/spancmp/Cargo.toml index 613d786780d9a..0c7d530436841 100644 --- a/tools/spancmp/Cargo.toml +++ b/tools/spancmp/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "spancmp" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "compare spans for Bevy" publish = false license = "MIT OR Apache-2.0" From bfd0203e40e910cab062faaa007da9fd8ca24c8f Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Sat, 24 Sep 2022 23:09:14 +0200 Subject: [PATCH 03/13] Update Cargo.toml Co-authored-by: Tristan Guichaoua <33934311+tguichaoua@users.noreply.github.com> --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 37340e417374b..33e2483cd5ae2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ members = [ [workspace.package] version = "0.9.0-dev" edition = "2021" -homepage = "https://bevyengine.org2" +homepage = "https://bevyengine.org" repository = "/~https://github.com/bevyengine/bevy" [package] From 67afac342426439e1cd0a0a17d2c93db91994155 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Sat, 24 Sep 2022 23:17:56 +0200 Subject: [PATCH 04/13] undo workspace inheritance for benches, crates/bevy_ecs_compile_fail_tests --- benches/Cargo.toml | 2 +- crates/bevy_ecs_compile_fail_tests/Cargo.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 506f7366db46c..165fbce1cb25e 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "benches" version = "0.1.0" -edition.workspace = true +edition = "2021" description = "Benchmarks for Bevy engine" publish = false license = "MIT OR Apache-2.0" diff --git a/crates/bevy_ecs_compile_fail_tests/Cargo.toml b/crates/bevy_ecs_compile_fail_tests/Cargo.toml index 7dba5e74b39f7..e48c4c03e3954 100644 --- a/crates/bevy_ecs_compile_fail_tests/Cargo.toml +++ b/crates/bevy_ecs_compile_fail_tests/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy_ecs_compile_fail_tests" version = "0.1.0" -edition.workspace = true +edition = "2021" description = "Compile fail tests for Bevy Engine's entity component system" -homepage.workspace = true -repository.workspace = true +homepage = "https://bevyengine.org" +repository = "/~https://github.com/bevyengine/bevy" license = "MIT OR Apache-2.0" publish = false From 3c9f8a3b8a547462e28af869f417cdad944ce086 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Sun, 25 Sep 2022 00:54:04 +0200 Subject: [PATCH 05/13] replace bevy dependencies with workspace inheritance --- Cargo.toml | 48 ++++++++++++++- crates/bevy_animation/Cargo.toml | 20 +++---- crates/bevy_app/Cargo.toml | 8 +-- crates/bevy_asset/Cargo.toml | 16 ++--- crates/bevy_audio/Cargo.toml | 10 ++-- crates/bevy_core/Cargo.toml | 12 ++-- crates/bevy_core_pipeline/Cargo.toml | 14 ++--- crates/bevy_derive/Cargo.toml | 2 +- crates/bevy_diagnostic/Cargo.toml | 10 ++-- crates/bevy_dylib/Cargo.toml | 2 +- crates/bevy_dynamic_plugin/Cargo.toml | 2 +- crates/bevy_ecs/Cargo.toml | 10 ++-- crates/bevy_ecs/macros/Cargo.toml | 2 +- crates/bevy_encase_derive/Cargo.toml | 2 +- crates/bevy_gilrs/Cargo.toml | 8 +-- crates/bevy_gltf/Cargo.toml | 32 +++++----- crates/bevy_hierarchy/Cargo.toml | 12 ++-- crates/bevy_input/Cargo.toml | 10 ++-- crates/bevy_internal/Cargo.toml | 60 +++++++++---------- crates/bevy_log/Cargo.toml | 6 +- crates/bevy_pbr/Cargo.toml | 22 +++---- crates/bevy_reflect/Cargo.toml | 8 +-- .../bevy_reflect_derive/Cargo.toml | 2 +- crates/bevy_render/Cargo.toml | 32 +++++----- crates/bevy_render/macros/Cargo.toml | 2 +- crates/bevy_scene/Cargo.toml | 18 +++--- crates/bevy_sprite/Cargo.toml | 24 ++++---- crates/bevy_text/Cargo.toml | 20 +++---- crates/bevy_time/Cargo.toml | 8 +-- crates/bevy_transform/Cargo.toml | 10 ++-- crates/bevy_ui/Cargo.toml | 34 +++++------ crates/bevy_window/Cargo.toml | 12 ++-- crates/bevy_winit/Cargo.toml | 12 ++-- errors/Cargo.toml | 2 +- examples/ios/Cargo.toml | 2 +- tools/spancmp/Cargo.toml | 2 +- 36 files changed, 267 insertions(+), 229 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 33e2483cd5ae2..99dd4896fca23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,12 +9,54 @@ members = [ "tools/build-wasm-example", "errors", ] + [workspace.package] version = "0.9.0-dev" edition = "2021" homepage = "https://bevyengine.org" repository = "/~https://github.com/bevyengine/bevy" +[workspace.dependencies] +bevy = { path = ".", version = "0.9.0-dev"} +bevy_animation = { path = "crates/bevy_animation", version = "0.9.0-dev" } +bevy_app = { path = "crates/bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "crates/bevy_asset", version = "0.9.0-dev" } +bevy_audio = { path = "crates/bevy_audio", version = "0.9.0-dev" } +bevy_core = { path = "crates/bevy_core", version = "0.9.0-dev" } +bevy_core_pipeline = { path = "crates/bevy_core_pipeline", version = "0.9.0-dev" } +bevy_derive = { path = "crates/bevy_derive", version = "0.9.0-dev" } +bevy_diagnostic = { path = "crates/bevy_diagnostic", version = "0.9.0-dev" } +bevy_dylib = { path = "crates/bevy_dylib", version = "0.9.0-dev" } +bevy_dynamic_plugin = { path = "crates/bevy_dynamic_plugin", version = "0.9.0-dev" } +bevy_ecs = { path = "crates/bevy_ecs", version = "0.9.0-dev" } +bevy_ecs_macros = { path = "crates/bevy_ecs/macros", version = "0.9.0-dev" } +bevy_encase_derive = { path = "crates/bevy_encase_derive", version = "0.9.0-dev" } +bevy_gilrs = { path = "crates/bevy_gilrs", version = "0.9.0-dev" } +bevy_gltf = { path = "crates/bevy_gltf", version = "0.9.0-dev" } +bevy_hierarchy = { path = "crates/bevy_hierarchy", version = "0.9.0-dev" } +bevy_input = { path = "crates/bevy_input", version = "0.9.0-dev" } +bevy_internal = { path = "crates/bevy_internal", version = "0.9.0-dev" } +bevy_log = { path = "crates/bevy_log", version = "0.9.0-dev" } +bevy_macro_utils = { path = "crates/bevy_macro_utils", version = "0.9.0-dev" } +bevy_math = { path = "crates/bevy_math", version = "0.9.0-dev" } +bevy_mikktspace = { path = "crates/bevy_mikktspace", version = "0.9.0-dev" } +bevy_pbr = { path = "crates/bevy_pbr", version = "0.9.0-dev" } +bevy_ptr = { path = "crates/bevy_ptr", version = "0.9.0-dev" } +bevy_reflect = { path = "crates/bevy_reflect", version = "0.9.0-dev" } +bevy_reflect_derive = { path = "crates/bevy_reflect/bevy_reflect_derive", version = "0.9.0-dev" } +bevy_render = { path = "crates/bevy_render", version = "0.9.0-dev" } +bevy_render_macros = { path = "crates/bevy_render/macros", version = "0.9.0-dev" } +bevy_scene = { path = "crates/bevy_scene", version = "0.9.0-dev" } +bevy_sprite = { path = "crates/bevy_sprite", version = "0.9.0-dev" } +bevy_tasks = { path = "crates/bevy_tasks", version = "0.9.0-dev" } +bevy_text = { path = "crates/bevy_text", version = "0.9.0-dev" } +bevy_time = { path = "crates/bevy_time", version = "0.9.0-dev" } +bevy_transform = { path = "crates/bevy_transform", version = "0.9.0-dev" } +bevy_ui = { path = "crates/bevy_ui", version = "0.9.0-dev" } +bevy_utils = { path = "crates/bevy_utils", version = "0.9.0-dev" } +bevy_window = { path = "crates/bevy_window", version = "0.9.0-dev" } +bevy_winit = { path = "crates/bevy_winit", version = "0.9.0-dev" } + [package] name = "bevy" version.workspace = true @@ -121,11 +163,11 @@ debug_asset_server = ["bevy_internal/debug_asset_server"] animation = ["bevy_internal/animation"] [dependencies] -bevy_dylib = { path = "crates/bevy_dylib", version = "0.9.0-dev", default-features = false, optional = true } -bevy_internal = { path = "crates/bevy_internal", version = "0.9.0-dev", default-features = false } +bevy_dylib = { workspace = true, default-features = false, optional = true } +bevy_internal = { workspace = true, default-features = false } [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy_internal = { path = "crates/bevy_internal", version = "0.9.0-dev", default-features = false, features = [ +bevy_internal = { workspace = true, default-features = false, features = [ "webgl", ] } diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml index 31daaf5839135..eb0595bea2309 100644 --- a/crates/bevy_animation/Cargo.toml +++ b/crates/bevy_animation/Cargo.toml @@ -10,13 +10,13 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_time = { path = "../bevy_time", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_core.workspace = true +bevy_math.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_time.workspace = true +bevy_utils.workspace = true +bevy_ecs.workspace = true +bevy_transform.workspace = true +bevy_hierarchy.workspace = true diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml index aac26d12aa75c..1329197372014 100644 --- a/crates/bevy_app/Cargo.toml +++ b/crates/bevy_app/Cargo.toml @@ -16,10 +16,10 @@ bevy_reflect = ["dep:bevy_reflect", "bevy_ecs/bevy_reflect"] [dependencies] # bevy -bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", default-features = false } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", optional = true } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_derive.workspace = true +bevy_ecs = { workspace = true, default-features = false } +bevy_reflect = { workspace = true, optional = true } +bevy_utils.workspace = true # other serde = { version = "1.0", features = ["derive"], optional = true } diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml index dcd3bcc1a248f..129594c729c85 100644 --- a/crates/bevy_asset/Cargo.toml +++ b/crates/bevy_asset/Cargo.toml @@ -15,13 +15,13 @@ debug_asset_server = ["filesystem_watcher"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_diagnostic.workspace = true +bevy_ecs.workspace = true +bevy_log.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_tasks.workspace = true +bevy_utils.workspace = true # other serde = { version = "1", features = ["derive"] } @@ -45,4 +45,4 @@ ndk-glue = { version = "0.5" } [dev-dependencies] futures-lite = "1.4.0" tempfile = "3.2.0" -bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } +bevy_core.workspace = true diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml index 4ad26f6ba73fa..218d13477b30e 100644 --- a/crates/bevy_audio/Cargo.toml +++ b/crates/bevy_audio/Cargo.toml @@ -10,11 +10,11 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_ecs.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_utils.workspace = true # other anyhow = "1.0.4" diff --git a/crates/bevy_core/Cargo.toml b/crates/bevy_core/Cargo.toml index d66035c4250de..db9b4e06ab356 100644 --- a/crates/bevy_core/Cargo.toml +++ b/crates/bevy_core/Cargo.toml @@ -11,12 +11,12 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev", features = ["bevy_reflect"] } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_reflect"] } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app = { workspace = true, features = ["bevy_reflect"] } +bevy_ecs = { workspace = true, features = ["bevy_reflect"] } +bevy_math.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_tasks.workspace = true +bevy_utils.workspace = true # other bytemuck = "1.5" diff --git a/crates/bevy_core_pipeline/Cargo.toml b/crates/bevy_core_pipeline/Cargo.toml index 7dbfff7e79324..08de414aeff61 100644 --- a/crates/bevy_core_pipeline/Cargo.toml +++ b/crates/bevy_core_pipeline/Cargo.toml @@ -18,13 +18,13 @@ webgl = [] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev" } -bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_derive.workspace = true +bevy_ecs.workspace = true +bevy_reflect.workspace = true +bevy_render.workspace = true +bevy_transform.workspace = true +bevy_utils.workspace = true serde = { version = "1", features = ["derive"] } radsort = "0.1" diff --git a/crates/bevy_derive/Cargo.toml b/crates/bevy_derive/Cargo.toml index 7b9f7f69fbe8d..42616ea0f69bc 100644 --- a/crates/bevy_derive/Cargo.toml +++ b/crates/bevy_derive/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["bevy"] proc-macro = true [dependencies] -bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.9.0-dev" } +bevy_macro_utils.workspace = true quote = "1.0" syn = { version = "1.0", features = ["full"] } diff --git a/crates/bevy_diagnostic/Cargo.toml b/crates/bevy_diagnostic/Cargo.toml index 64047af92fe2f..c057d168a63e6 100644 --- a/crates/bevy_diagnostic/Cargo.toml +++ b/crates/bevy_diagnostic/Cargo.toml @@ -11,8 +11,8 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } -bevy_time = { path = "../bevy_time", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_ecs.workspace = true +bevy_log.workspace = true +bevy_time.workspace = true +bevy_utils.workspace = true diff --git a/crates/bevy_dylib/Cargo.toml b/crates/bevy_dylib/Cargo.toml index 2d2a505cac0a5..bb1773250a886 100644 --- a/crates/bevy_dylib/Cargo.toml +++ b/crates/bevy_dylib/Cargo.toml @@ -12,4 +12,4 @@ keywords = ["bevy"] crate-type = ["dylib"] [dependencies] -bevy_internal = { path = "../bevy_internal", version = "0.9.0-dev", default-features = false } +bevy_internal = { workspace = true, default-features = false } diff --git a/crates/bevy_dynamic_plugin/Cargo.toml b/crates/bevy_dynamic_plugin/Cargo.toml index a88b3cb0b244e..a6d782a5b23dc 100644 --- a/crates/bevy_dynamic_plugin/Cargo.toml +++ b/crates/bevy_dynamic_plugin/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_app.workspace = true # other libloading = { version = "0.7" } diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml index 457aab11a8862..829f059bf54f0 100644 --- a/crates/bevy_ecs/Cargo.toml +++ b/crates/bevy_ecs/Cargo.toml @@ -14,11 +14,11 @@ trace = [] default = ["bevy_reflect"] [dependencies] -bevy_ptr = { path = "../bevy_ptr", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", optional = true } -bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_ecs_macros = { path = "macros", version = "0.9.0-dev" } +bevy_ptr.workspace = true +bevy_reflect = { workspace = true, optional = true } +bevy_tasks.workspace = true +bevy_utils.workspace = true +bevy_ecs_macros.workspace = true async-channel = "1.4" event-listener = "2.5" diff --git a/crates/bevy_ecs/macros/Cargo.toml b/crates/bevy_ecs/macros/Cargo.toml index 8743e57ce4298..0d08bb40cb4d9 100644 --- a/crates/bevy_ecs/macros/Cargo.toml +++ b/crates/bevy_ecs/macros/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" proc-macro = true [dependencies] -bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.9.0-dev" } +bevy_macro_utils.workspace = true syn = "1.0" quote = "1.0" diff --git a/crates/bevy_encase_derive/Cargo.toml b/crates/bevy_encase_derive/Cargo.toml index 58b2cee604606..125cb313afbc0 100644 --- a/crates/bevy_encase_derive/Cargo.toml +++ b/crates/bevy_encase_derive/Cargo.toml @@ -12,5 +12,5 @@ keywords = ["bevy"] proc-macro = true [dependencies] -bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.9.0-dev" } +bevy_macro_utils.workspace = true encase_derive_impl = "0.3.0" diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml index 9f22fd3cd950a..18ff534e794df 100644 --- a/crates/bevy_gilrs/Cargo.toml +++ b/crates/bevy_gilrs/Cargo.toml @@ -10,10 +10,10 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_ecs.workspace = true +bevy_input.workspace = true +bevy_utils.workspace = true # other gilrs = "0.9.0" diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml index 163ed8748cb25..60d57124bbd7f 100644 --- a/crates/bevy_gltf/Cargo.toml +++ b/crates/bevy_gltf/Cargo.toml @@ -10,22 +10,22 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_animation = { path = "../bevy_animation", version = "0.9.0-dev", optional = true } -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } -bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } -bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_pbr = { path = "../bevy_pbr", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } -bevy_scene = { path = "../bevy_scene", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_animation = { workspace = true, optional = true } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_core.workspace = true +bevy_core_pipeline.workspace = true +bevy_ecs.workspace = true +bevy_hierarchy.workspace = true +bevy_log.workspace = true +bevy_math.workspace = true +bevy_pbr.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_render.workspace = true +bevy_scene.workspace = true +bevy_transform.workspace = true +bevy_tasks.workspace = true +bevy_utils.workspace = true # other gltf = { version = "1.0.0", default-features = false, features = [ diff --git a/crates/bevy_hierarchy/Cargo.toml b/crates/bevy_hierarchy/Cargo.toml index 61c677049c5e6..3aa8e9176b573 100644 --- a/crates/bevy_hierarchy/Cargo.toml +++ b/crates/bevy_hierarchy/Cargo.toml @@ -13,12 +13,12 @@ trace = [] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_reflect"] } -bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_core.workspace = true +bevy_ecs = { workspace = true, features = ["bevy_reflect"] } +bevy_log.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_utils.workspace = true # other smallvec = { version = "1.6", features = ["serde", "union", "const_generics"] } diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml index c4b899bbbe2fb..68d4e2cc4860c 100644 --- a/crates/bevy_input/Cargo.toml +++ b/crates/bevy_input/Cargo.toml @@ -14,11 +14,11 @@ serialize = ["serde"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_ecs.workspace = true +bevy_math.workspace = true +bevy_utils.workspace = true +bevy_reflect.workspace = true # other serde = { version = "1", features = ["derive"], optional = true } diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml index ada568029f671..523b1b8fcece0 100644 --- a/crates/bevy_internal/Cargo.toml +++ b/crates/bevy_internal/Cargo.toml @@ -65,37 +65,37 @@ animation = ["bevy_animation", "bevy_gltf?/bevy_animation"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } -bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } -bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } -bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } -bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_ptr = { path = "../bevy_ptr", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_time = { path = "../bevy_time", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } -bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_core.workspace = true +bevy_derive.workspace = true +bevy_diagnostic.workspace = true +bevy_ecs.workspace = true +bevy_hierarchy.workspace = true +bevy_input.workspace = true +bevy_log.workspace = true +bevy_math.workspace = true +bevy_ptr.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_time.workspace = true +bevy_transform.workspace = true +bevy_utils.workspace = true +bevy_window.workspace = true +bevy_tasks.workspace = true # bevy (optional) -bevy_animation = { path = "../bevy_animation", optional = true, version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", optional = true, version = "0.9.0-dev" } -bevy_audio = { path = "../bevy_audio", optional = true, version = "0.9.0-dev" } -bevy_core_pipeline = { path = "../bevy_core_pipeline", optional = true, version = "0.9.0-dev" } -bevy_gltf = { path = "../bevy_gltf", optional = true, version = "0.9.0-dev" } -bevy_pbr = { path = "../bevy_pbr", optional = true, version = "0.9.0-dev" } -bevy_render = { path = "../bevy_render", optional = true, version = "0.9.0-dev" } -bevy_dynamic_plugin = { path = "../bevy_dynamic_plugin", optional = true, version = "0.9.0-dev" } -bevy_scene = { path = "../bevy_scene", optional = true, version = "0.9.0-dev" } -bevy_sprite = { path = "../bevy_sprite", optional = true, version = "0.9.0-dev" } -bevy_text = { path = "../bevy_text", optional = true, version = "0.9.0-dev" } -bevy_ui = { path = "../bevy_ui", optional = true, version = "0.9.0-dev" } -bevy_winit = { path = "../bevy_winit", optional = true, version = "0.9.0-dev" } -bevy_gilrs = { path = "../bevy_gilrs", optional = true, version = "0.9.0-dev" } +bevy_animation = { workspace = true, optional = true } +bevy_asset = { workspace = true, optional = true } +bevy_audio = { workspace = true, optional = true } +bevy_core_pipeline = { workspace = true, optional = true } +bevy_gltf = { workspace = true, optional = true } +bevy_pbr = { workspace = true, optional = true } +bevy_render = { workspace = true, optional = true } +bevy_dynamic_plugin = { workspace = true, optional = true } +bevy_scene = { workspace = true, optional = true } +bevy_sprite = { workspace = true, optional = true } +bevy_text = { workspace = true, optional = true } +bevy_ui = { workspace = true, optional = true } +bevy_winit = { workspace = true, optional = true } +bevy_gilrs = { workspace = true, optional = true } [target.'cfg(target_os = "android")'.dependencies] # This version *must* be the same as the version used by winit, diff --git a/crates/bevy_log/Cargo.toml b/crates/bevy_log/Cargo.toml index c39d1bbebcb68..85981733f2bbc 100644 --- a/crates/bevy_log/Cargo.toml +++ b/crates/bevy_log/Cargo.toml @@ -12,9 +12,9 @@ keywords = ["bevy"] trace = [ "tracing-error" ] [dependencies] -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_utils.workspace = true +bevy_ecs.workspace = true tracing-subscriber = {version = "0.3.1", features = ["registry", "env-filter"]} tracing-chrome = { version = "0.4.0", optional = true } diff --git a/crates/bevy_pbr/Cargo.toml b/crates/bevy_pbr/Cargo.toml index 6e27bc506d85a..4926f5f56c1b9 100644 --- a/crates/bevy_pbr/Cargo.toml +++ b/crates/bevy_pbr/Cargo.toml @@ -13,17 +13,17 @@ webgl = [] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } -bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_core_pipeline.workspace = true +bevy_ecs.workspace = true +bevy_math.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_render.workspace = true +bevy_transform.workspace = true +bevy_utils.workspace = true +bevy_window.workspace = true +bevy_derive.workspace = true # other bitflags = "1.2" diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml index 5337b1130231f..b05bff981dd63 100644 --- a/crates/bevy_reflect/Cargo.toml +++ b/crates/bevy_reflect/Cargo.toml @@ -14,10 +14,10 @@ bevy = ["glam", "smallvec", "bevy_math"] [dependencies] # bevy -bevy_math = { path = "../bevy_math", version = "0.9.0-dev", optional = true } -bevy_reflect_derive = { path = "bevy_reflect_derive", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_ptr = { path = "../bevy_ptr", version = "0.9.0-dev" } +bevy_math = { workspace = true, optional = true } +bevy_reflect_derive.workspace = true +bevy_utils.workspace = true +bevy_ptr.workspace = true # other erased-serde = "0.3" diff --git a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml index 45209ab846f80..cdf5b04eec55f 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml +++ b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["bevy"] proc-macro = true [dependencies] -bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.9.0-dev" } +bevy_macro_utils.workspace = true syn = { version = "1.0", features = ["full"] } proc-macro2 = "1.0" diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 26cbf4c98e54b..422bbed24178c 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -28,22 +28,22 @@ webgl = ["wgpu/webgl"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } -bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_encase_derive = { path = "../bevy_encase_derive", version = "0.9.0-dev" } -bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } -bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_render_macros = { path = "macros", version = "0.9.0-dev" } -bevy_time = { path = "../bevy_time", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_core.workspace = true +bevy_derive.workspace = true +bevy_ecs.workspace = true +bevy_encase_derive.workspace = true +bevy_hierarchy.workspace = true +bevy_log.workspace = true +bevy_math.workspace = true +bevy_mikktspace.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_render_macros.workspace = true +bevy_time.workspace = true +bevy_transform.workspace = true +bevy_window.workspace = true +bevy_utils.workspace = true # rendering image = { version = "0.24", default-features = false } diff --git a/crates/bevy_render/macros/Cargo.toml b/crates/bevy_render/macros/Cargo.toml index 4be2ddb6477ba..0fd033dad1a8f 100644 --- a/crates/bevy_render/macros/Cargo.toml +++ b/crates/bevy_render/macros/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["bevy"] proc-macro = true [dependencies] -bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.9.0-dev" } +bevy_macro_utils.workspace = true syn = "1.0" proc-macro2 = "1.0" diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml index 0b7ef42b296d0..5bb6aa8d8e94e 100644 --- a/crates/bevy_scene/Cargo.toml +++ b/crates/bevy_scene/Cargo.toml @@ -10,15 +10,15 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_derive.workspace = true +bevy_ecs.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_hierarchy.workspace = true +bevy_transform.workspace = true +bevy_utils.workspace = true +bevy_render.workspace = true # other serde = { version = "1.0", features = ["derive"] } diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml index ab81a010c0b58..4fa95818a4e15 100644 --- a/crates/bevy_sprite/Cargo.toml +++ b/crates/bevy_sprite/Cargo.toml @@ -10,19 +10,17 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = [ - "bevy", -] } -bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } -bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_core_pipeline.workspace = true +bevy_ecs.workspace = true +bevy_log.workspace = true +bevy_math.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_render.workspace = true +bevy_transform.workspace = true +bevy_utils.workspace = true +bevy_derive.workspace = true # other bytemuck = { version = "1.5", features = ["derive"] } diff --git a/crates/bevy_text/Cargo.toml b/crates/bevy_text/Cargo.toml index 033237d5ca7a3..d96f94042a227 100644 --- a/crates/bevy_text/Cargo.toml +++ b/crates/bevy_text/Cargo.toml @@ -13,16 +13,16 @@ subpixel_glyph_atlas = [] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } -bevy_sprite = { path = "../bevy_sprite", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_ecs.workspace = true +bevy_math.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_render.workspace = true +bevy_sprite.workspace = true +bevy_transform.workspace = true +bevy_window.workspace = true +bevy_utils.workspace = true # other anyhow = "1.0.4" diff --git a/crates/bevy_time/Cargo.toml b/crates/bevy_time/Cargo.toml index ec97270f1c9ed..866dcb36b0e7e 100644 --- a/crates/bevy_time/Cargo.toml +++ b/crates/bevy_time/Cargo.toml @@ -11,10 +11,10 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_reflect"] } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_ecs = { workspace = true, features = ["bevy_reflect"] } +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_utils.workspace = true # other crossbeam-channel = "0.5.0" diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml index e048469600ef9..341ea522c8b37 100644 --- a/crates/bevy_transform/Cargo.toml +++ b/crates/bevy_transform/Cargo.toml @@ -10,8 +10,8 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_reflect"] } -bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_app.workspace = true +bevy_ecs = { workspace = true, features = ["bevy_reflect"] } +bevy_hierarchy.workspace = true +bevy_math.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml index 225d1a5e5b35d..735a14ab3f030 100644 --- a/crates/bevy_ui/Cargo.toml +++ b/crates/bevy_ui/Cargo.toml @@ -10,24 +10,22 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } -bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0-dev" } -bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } -bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } -bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = [ - "bevy", -] } -bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } -bevy_sprite = { path = "../bevy_sprite", version = "0.9.0-dev" } -bevy_text = { path = "../bevy_text", version = "0.9.0-dev" } -bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } -bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_asset.workspace = true +bevy_core_pipeline.workspace = true +bevy_derive.workspace = true +bevy_ecs.workspace = true +bevy_hierarchy.workspace = true +bevy_input.workspace = true +bevy_log.workspace = true +bevy_math.workspace = true +bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_render.workspace = true +bevy_sprite.workspace = true +bevy_text.workspace = true +bevy_transform.workspace = true +bevy_window.workspace = true +bevy_utils.workspace = true # other taffy = "0.1.0" diff --git a/crates/bevy_window/Cargo.toml b/crates/bevy_window/Cargo.toml index 4459a90ab3367..f1fc5d8c34db9 100644 --- a/crates/bevy_window/Cargo.toml +++ b/crates/bevy_window/Cargo.toml @@ -14,13 +14,13 @@ serialize = ["serde"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_ecs.workspace = true +bevy_math.workspace = true +bevy_reflect.workspace = true +bevy_utils.workspace = true # Used for close_on_esc -bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } +bevy_input.workspace = true raw-window-handle = "0.4.2" # other diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml index 55ed18fcc08d6..2e00bb8062bd8 100644 --- a/crates/bevy_winit/Cargo.toml +++ b/crates/bevy_winit/Cargo.toml @@ -14,12 +14,12 @@ x11 = ["winit/x11"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } -bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } -bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } -bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } -bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } -bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_app.workspace = true +bevy_ecs.workspace = true +bevy_input.workspace = true +bevy_math.workspace = true +bevy_window.workspace = true +bevy_utils.workspace = true # other winit = { version = "0.26.0", default-features = false } diff --git a/errors/Cargo.toml b/errors/Cargo.toml index cad938a653f93..b8db5d6af06b8 100644 --- a/errors/Cargo.toml +++ b/errors/Cargo.toml @@ -7,4 +7,4 @@ publish = false license = "MIT OR Apache-2.0" [dependencies] -bevy = { path = ".." } +bevy.workspace = true diff --git a/examples/ios/Cargo.toml b/examples/ios/Cargo.toml index ae0f6ba0bb068..6ffab6d0801c1 100644 --- a/examples/ios/Cargo.toml +++ b/examples/ios/Cargo.toml @@ -11,7 +11,7 @@ name = "bevy_ios_example" crate-type = ["staticlib"] [dependencies] -bevy = { path = "../../", features = [ +bevy = { workspace = true, features = [ "bevy_audio", "bevy_winit", "render", diff --git a/tools/spancmp/Cargo.toml b/tools/spancmp/Cargo.toml index 0c7d530436841..f3ef6841b4ada 100644 --- a/tools/spancmp/Cargo.toml +++ b/tools/spancmp/Cargo.toml @@ -12,5 +12,5 @@ serde = { version = "1.0", features = ["derive"] } clap = { version = "3.2", features = ["derive"] } regex = "1.5" termcolor = "1.1" -bevy_utils = { path = "../../crates/bevy_utils", version = "0.9.0-dev" } +bevy_utils.workspace = true lazy_static = "1.4" From 8507b0edb0b12c31b27247a398623a7eecb08ed6 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Sun, 25 Sep 2022 00:56:45 +0200 Subject: [PATCH 06/13] use newer rust version --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41184438f9616..471afaa8014c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -253,6 +253,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true - run: cargo run -p build-example-pages -- check-missing check-examples-readme-update-needed: From c6c42719b09ecff976e30b018a66ed2222d97890 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Sun, 25 Sep 2022 01:04:05 +0200 Subject: [PATCH 07/13] use newer rust version --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 471afaa8014c6..47ae6197d883d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -264,6 +264,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true - run: cargo run -p build-example-pages -- update - name: Check for modified files run: | From 85074c8cbac96527b7084c5a0b489d87c67814e4 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Tue, 4 Oct 2022 16:59:04 +0200 Subject: [PATCH 08/13] Revert "replace bevy dependencies with workspace inheritance" This reverts commit 3c9f8a3b8a547462e28af869f417cdad944ce086. --- Cargo.toml | 48 +-------------- crates/bevy_animation/Cargo.toml | 20 +++---- crates/bevy_app/Cargo.toml | 8 +-- crates/bevy_asset/Cargo.toml | 16 ++--- crates/bevy_audio/Cargo.toml | 10 ++-- crates/bevy_core/Cargo.toml | 12 ++-- crates/bevy_core_pipeline/Cargo.toml | 14 ++--- crates/bevy_derive/Cargo.toml | 2 +- crates/bevy_diagnostic/Cargo.toml | 10 ++-- crates/bevy_dylib/Cargo.toml | 2 +- crates/bevy_dynamic_plugin/Cargo.toml | 2 +- crates/bevy_ecs/Cargo.toml | 10 ++-- crates/bevy_ecs/macros/Cargo.toml | 2 +- crates/bevy_encase_derive/Cargo.toml | 2 +- crates/bevy_gilrs/Cargo.toml | 8 +-- crates/bevy_gltf/Cargo.toml | 32 +++++----- crates/bevy_hierarchy/Cargo.toml | 12 ++-- crates/bevy_input/Cargo.toml | 10 ++-- crates/bevy_internal/Cargo.toml | 60 +++++++++---------- crates/bevy_log/Cargo.toml | 6 +- crates/bevy_pbr/Cargo.toml | 22 +++---- crates/bevy_reflect/Cargo.toml | 8 +-- .../bevy_reflect_derive/Cargo.toml | 2 +- crates/bevy_render/Cargo.toml | 32 +++++----- crates/bevy_render/macros/Cargo.toml | 2 +- crates/bevy_scene/Cargo.toml | 18 +++--- crates/bevy_sprite/Cargo.toml | 24 ++++---- crates/bevy_text/Cargo.toml | 20 +++---- crates/bevy_time/Cargo.toml | 8 +-- crates/bevy_transform/Cargo.toml | 10 ++-- crates/bevy_ui/Cargo.toml | 34 ++++++----- crates/bevy_window/Cargo.toml | 12 ++-- crates/bevy_winit/Cargo.toml | 12 ++-- errors/Cargo.toml | 2 +- examples/ios/Cargo.toml | 2 +- tools/spancmp/Cargo.toml | 2 +- 36 files changed, 229 insertions(+), 267 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 99dd4896fca23..33e2483cd5ae2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,54 +9,12 @@ members = [ "tools/build-wasm-example", "errors", ] - [workspace.package] version = "0.9.0-dev" edition = "2021" homepage = "https://bevyengine.org" repository = "/~https://github.com/bevyengine/bevy" -[workspace.dependencies] -bevy = { path = ".", version = "0.9.0-dev"} -bevy_animation = { path = "crates/bevy_animation", version = "0.9.0-dev" } -bevy_app = { path = "crates/bevy_app", version = "0.9.0-dev" } -bevy_asset = { path = "crates/bevy_asset", version = "0.9.0-dev" } -bevy_audio = { path = "crates/bevy_audio", version = "0.9.0-dev" } -bevy_core = { path = "crates/bevy_core", version = "0.9.0-dev" } -bevy_core_pipeline = { path = "crates/bevy_core_pipeline", version = "0.9.0-dev" } -bevy_derive = { path = "crates/bevy_derive", version = "0.9.0-dev" } -bevy_diagnostic = { path = "crates/bevy_diagnostic", version = "0.9.0-dev" } -bevy_dylib = { path = "crates/bevy_dylib", version = "0.9.0-dev" } -bevy_dynamic_plugin = { path = "crates/bevy_dynamic_plugin", version = "0.9.0-dev" } -bevy_ecs = { path = "crates/bevy_ecs", version = "0.9.0-dev" } -bevy_ecs_macros = { path = "crates/bevy_ecs/macros", version = "0.9.0-dev" } -bevy_encase_derive = { path = "crates/bevy_encase_derive", version = "0.9.0-dev" } -bevy_gilrs = { path = "crates/bevy_gilrs", version = "0.9.0-dev" } -bevy_gltf = { path = "crates/bevy_gltf", version = "0.9.0-dev" } -bevy_hierarchy = { path = "crates/bevy_hierarchy", version = "0.9.0-dev" } -bevy_input = { path = "crates/bevy_input", version = "0.9.0-dev" } -bevy_internal = { path = "crates/bevy_internal", version = "0.9.0-dev" } -bevy_log = { path = "crates/bevy_log", version = "0.9.0-dev" } -bevy_macro_utils = { path = "crates/bevy_macro_utils", version = "0.9.0-dev" } -bevy_math = { path = "crates/bevy_math", version = "0.9.0-dev" } -bevy_mikktspace = { path = "crates/bevy_mikktspace", version = "0.9.0-dev" } -bevy_pbr = { path = "crates/bevy_pbr", version = "0.9.0-dev" } -bevy_ptr = { path = "crates/bevy_ptr", version = "0.9.0-dev" } -bevy_reflect = { path = "crates/bevy_reflect", version = "0.9.0-dev" } -bevy_reflect_derive = { path = "crates/bevy_reflect/bevy_reflect_derive", version = "0.9.0-dev" } -bevy_render = { path = "crates/bevy_render", version = "0.9.0-dev" } -bevy_render_macros = { path = "crates/bevy_render/macros", version = "0.9.0-dev" } -bevy_scene = { path = "crates/bevy_scene", version = "0.9.0-dev" } -bevy_sprite = { path = "crates/bevy_sprite", version = "0.9.0-dev" } -bevy_tasks = { path = "crates/bevy_tasks", version = "0.9.0-dev" } -bevy_text = { path = "crates/bevy_text", version = "0.9.0-dev" } -bevy_time = { path = "crates/bevy_time", version = "0.9.0-dev" } -bevy_transform = { path = "crates/bevy_transform", version = "0.9.0-dev" } -bevy_ui = { path = "crates/bevy_ui", version = "0.9.0-dev" } -bevy_utils = { path = "crates/bevy_utils", version = "0.9.0-dev" } -bevy_window = { path = "crates/bevy_window", version = "0.9.0-dev" } -bevy_winit = { path = "crates/bevy_winit", version = "0.9.0-dev" } - [package] name = "bevy" version.workspace = true @@ -163,11 +121,11 @@ debug_asset_server = ["bevy_internal/debug_asset_server"] animation = ["bevy_internal/animation"] [dependencies] -bevy_dylib = { workspace = true, default-features = false, optional = true } -bevy_internal = { workspace = true, default-features = false } +bevy_dylib = { path = "crates/bevy_dylib", version = "0.9.0-dev", default-features = false, optional = true } +bevy_internal = { path = "crates/bevy_internal", version = "0.9.0-dev", default-features = false } [target.'cfg(target_arch = "wasm32")'.dependencies] -bevy_internal = { workspace = true, default-features = false, features = [ +bevy_internal = { path = "crates/bevy_internal", version = "0.9.0-dev", default-features = false, features = [ "webgl", ] } diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml index eb0595bea2309..31daaf5839135 100644 --- a/crates/bevy_animation/Cargo.toml +++ b/crates/bevy_animation/Cargo.toml @@ -10,13 +10,13 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_core.workspace = true -bevy_math.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_time.workspace = true -bevy_utils.workspace = true -bevy_ecs.workspace = true -bevy_transform.workspace = true -bevy_hierarchy.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_time = { path = "../bevy_time", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml index 1329197372014..aac26d12aa75c 100644 --- a/crates/bevy_app/Cargo.toml +++ b/crates/bevy_app/Cargo.toml @@ -16,10 +16,10 @@ bevy_reflect = ["dep:bevy_reflect", "bevy_ecs/bevy_reflect"] [dependencies] # bevy -bevy_derive.workspace = true -bevy_ecs = { workspace = true, default-features = false } -bevy_reflect = { workspace = true, optional = true } -bevy_utils.workspace = true +bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", default-features = false } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", optional = true } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other serde = { version = "1.0", features = ["derive"], optional = true } diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml index 129594c729c85..dcd3bcc1a248f 100644 --- a/crates/bevy_asset/Cargo.toml +++ b/crates/bevy_asset/Cargo.toml @@ -15,13 +15,13 @@ debug_asset_server = ["filesystem_watcher"] [dependencies] # bevy -bevy_app.workspace = true -bevy_diagnostic.workspace = true -bevy_ecs.workspace = true -bevy_log.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_tasks.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other serde = { version = "1", features = ["derive"] } @@ -45,4 +45,4 @@ ndk-glue = { version = "0.5" } [dev-dependencies] futures-lite = "1.4.0" tempfile = "3.2.0" -bevy_core.workspace = true +bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml index 218d13477b30e..4ad26f6ba73fa 100644 --- a/crates/bevy_audio/Cargo.toml +++ b/crates/bevy_audio/Cargo.toml @@ -10,11 +10,11 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_ecs.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other anyhow = "1.0.4" diff --git a/crates/bevy_core/Cargo.toml b/crates/bevy_core/Cargo.toml index db9b4e06ab356..d66035c4250de 100644 --- a/crates/bevy_core/Cargo.toml +++ b/crates/bevy_core/Cargo.toml @@ -11,12 +11,12 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { workspace = true, features = ["bevy_reflect"] } -bevy_ecs = { workspace = true, features = ["bevy_reflect"] } -bevy_math.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_tasks.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev", features = ["bevy_reflect"] } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_reflect"] } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other bytemuck = "1.5" diff --git a/crates/bevy_core_pipeline/Cargo.toml b/crates/bevy_core_pipeline/Cargo.toml index 08de414aeff61..7dbfff7e79324 100644 --- a/crates/bevy_core_pipeline/Cargo.toml +++ b/crates/bevy_core_pipeline/Cargo.toml @@ -18,13 +18,13 @@ webgl = [] [dependencies] # bevy -bevy_app.workspace = true -bevy_derive.workspace = true -bevy_ecs.workspace = true -bevy_reflect.workspace = true -bevy_render.workspace = true -bevy_transform.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev" } +bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } serde = { version = "1", features = ["derive"] } radsort = "0.1" diff --git a/crates/bevy_derive/Cargo.toml b/crates/bevy_derive/Cargo.toml index 42616ea0f69bc..7b9f7f69fbe8d 100644 --- a/crates/bevy_derive/Cargo.toml +++ b/crates/bevy_derive/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["bevy"] proc-macro = true [dependencies] -bevy_macro_utils.workspace = true +bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.9.0-dev" } quote = "1.0" syn = { version = "1.0", features = ["full"] } diff --git a/crates/bevy_diagnostic/Cargo.toml b/crates/bevy_diagnostic/Cargo.toml index c057d168a63e6..64047af92fe2f 100644 --- a/crates/bevy_diagnostic/Cargo.toml +++ b/crates/bevy_diagnostic/Cargo.toml @@ -11,8 +11,8 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_ecs.workspace = true -bevy_log.workspace = true -bevy_time.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } +bevy_time = { path = "../bevy_time", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } diff --git a/crates/bevy_dylib/Cargo.toml b/crates/bevy_dylib/Cargo.toml index bb1773250a886..2d2a505cac0a5 100644 --- a/crates/bevy_dylib/Cargo.toml +++ b/crates/bevy_dylib/Cargo.toml @@ -12,4 +12,4 @@ keywords = ["bevy"] crate-type = ["dylib"] [dependencies] -bevy_internal = { workspace = true, default-features = false } +bevy_internal = { path = "../bevy_internal", version = "0.9.0-dev", default-features = false } diff --git a/crates/bevy_dynamic_plugin/Cargo.toml b/crates/bevy_dynamic_plugin/Cargo.toml index a6d782a5b23dc..a88b3cb0b244e 100644 --- a/crates/bevy_dynamic_plugin/Cargo.toml +++ b/crates/bevy_dynamic_plugin/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } # other libloading = { version = "0.7" } diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml index 829f059bf54f0..457aab11a8862 100644 --- a/crates/bevy_ecs/Cargo.toml +++ b/crates/bevy_ecs/Cargo.toml @@ -14,11 +14,11 @@ trace = [] default = ["bevy_reflect"] [dependencies] -bevy_ptr.workspace = true -bevy_reflect = { workspace = true, optional = true } -bevy_tasks.workspace = true -bevy_utils.workspace = true -bevy_ecs_macros.workspace = true +bevy_ptr = { path = "../bevy_ptr", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", optional = true } +bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_ecs_macros = { path = "macros", version = "0.9.0-dev" } async-channel = "1.4" event-listener = "2.5" diff --git a/crates/bevy_ecs/macros/Cargo.toml b/crates/bevy_ecs/macros/Cargo.toml index 0d08bb40cb4d9..8743e57ce4298 100644 --- a/crates/bevy_ecs/macros/Cargo.toml +++ b/crates/bevy_ecs/macros/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0" proc-macro = true [dependencies] -bevy_macro_utils.workspace = true +bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.9.0-dev" } syn = "1.0" quote = "1.0" diff --git a/crates/bevy_encase_derive/Cargo.toml b/crates/bevy_encase_derive/Cargo.toml index 125cb313afbc0..58b2cee604606 100644 --- a/crates/bevy_encase_derive/Cargo.toml +++ b/crates/bevy_encase_derive/Cargo.toml @@ -12,5 +12,5 @@ keywords = ["bevy"] proc-macro = true [dependencies] -bevy_macro_utils.workspace = true +bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.9.0-dev" } encase_derive_impl = "0.3.0" diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml index 18ff534e794df..9f22fd3cd950a 100644 --- a/crates/bevy_gilrs/Cargo.toml +++ b/crates/bevy_gilrs/Cargo.toml @@ -10,10 +10,10 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_ecs.workspace = true -bevy_input.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other gilrs = "0.9.0" diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml index 60d57124bbd7f..163ed8748cb25 100644 --- a/crates/bevy_gltf/Cargo.toml +++ b/crates/bevy_gltf/Cargo.toml @@ -10,22 +10,22 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_animation = { workspace = true, optional = true } -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_core.workspace = true -bevy_core_pipeline.workspace = true -bevy_ecs.workspace = true -bevy_hierarchy.workspace = true -bevy_log.workspace = true -bevy_math.workspace = true -bevy_pbr.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_render.workspace = true -bevy_scene.workspace = true -bevy_transform.workspace = true -bevy_tasks.workspace = true -bevy_utils.workspace = true +bevy_animation = { path = "../bevy_animation", version = "0.9.0-dev", optional = true } +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } +bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } +bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_pbr = { path = "../bevy_pbr", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } +bevy_scene = { path = "../bevy_scene", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other gltf = { version = "1.0.0", default-features = false, features = [ diff --git a/crates/bevy_hierarchy/Cargo.toml b/crates/bevy_hierarchy/Cargo.toml index 3aa8e9176b573..61c677049c5e6 100644 --- a/crates/bevy_hierarchy/Cargo.toml +++ b/crates/bevy_hierarchy/Cargo.toml @@ -13,12 +13,12 @@ trace = [] [dependencies] # bevy -bevy_app.workspace = true -bevy_core.workspace = true -bevy_ecs = { workspace = true, features = ["bevy_reflect"] } -bevy_log.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_reflect"] } +bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other smallvec = { version = "1.6", features = ["serde", "union", "const_generics"] } diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml index 68d4e2cc4860c..c4b899bbbe2fb 100644 --- a/crates/bevy_input/Cargo.toml +++ b/crates/bevy_input/Cargo.toml @@ -14,11 +14,11 @@ serialize = ["serde"] [dependencies] # bevy -bevy_app.workspace = true -bevy_ecs.workspace = true -bevy_math.workspace = true -bevy_utils.workspace = true -bevy_reflect.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev" } # other serde = { version = "1", features = ["derive"], optional = true } diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml index 523b1b8fcece0..ada568029f671 100644 --- a/crates/bevy_internal/Cargo.toml +++ b/crates/bevy_internal/Cargo.toml @@ -65,37 +65,37 @@ animation = ["bevy_animation", "bevy_gltf?/bevy_animation"] [dependencies] # bevy -bevy_app.workspace = true -bevy_core.workspace = true -bevy_derive.workspace = true -bevy_diagnostic.workspace = true -bevy_ecs.workspace = true -bevy_hierarchy.workspace = true -bevy_input.workspace = true -bevy_log.workspace = true -bevy_math.workspace = true -bevy_ptr.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_time.workspace = true -bevy_transform.workspace = true -bevy_utils.workspace = true -bevy_window.workspace = true -bevy_tasks.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } +bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } +bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } +bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } +bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_ptr = { path = "../bevy_ptr", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_time = { path = "../bevy_time", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } +bevy_tasks = { path = "../bevy_tasks", version = "0.9.0-dev" } # bevy (optional) -bevy_animation = { workspace = true, optional = true } -bevy_asset = { workspace = true, optional = true } -bevy_audio = { workspace = true, optional = true } -bevy_core_pipeline = { workspace = true, optional = true } -bevy_gltf = { workspace = true, optional = true } -bevy_pbr = { workspace = true, optional = true } -bevy_render = { workspace = true, optional = true } -bevy_dynamic_plugin = { workspace = true, optional = true } -bevy_scene = { workspace = true, optional = true } -bevy_sprite = { workspace = true, optional = true } -bevy_text = { workspace = true, optional = true } -bevy_ui = { workspace = true, optional = true } -bevy_winit = { workspace = true, optional = true } -bevy_gilrs = { workspace = true, optional = true } +bevy_animation = { path = "../bevy_animation", optional = true, version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", optional = true, version = "0.9.0-dev" } +bevy_audio = { path = "../bevy_audio", optional = true, version = "0.9.0-dev" } +bevy_core_pipeline = { path = "../bevy_core_pipeline", optional = true, version = "0.9.0-dev" } +bevy_gltf = { path = "../bevy_gltf", optional = true, version = "0.9.0-dev" } +bevy_pbr = { path = "../bevy_pbr", optional = true, version = "0.9.0-dev" } +bevy_render = { path = "../bevy_render", optional = true, version = "0.9.0-dev" } +bevy_dynamic_plugin = { path = "../bevy_dynamic_plugin", optional = true, version = "0.9.0-dev" } +bevy_scene = { path = "../bevy_scene", optional = true, version = "0.9.0-dev" } +bevy_sprite = { path = "../bevy_sprite", optional = true, version = "0.9.0-dev" } +bevy_text = { path = "../bevy_text", optional = true, version = "0.9.0-dev" } +bevy_ui = { path = "../bevy_ui", optional = true, version = "0.9.0-dev" } +bevy_winit = { path = "../bevy_winit", optional = true, version = "0.9.0-dev" } +bevy_gilrs = { path = "../bevy_gilrs", optional = true, version = "0.9.0-dev" } [target.'cfg(target_os = "android")'.dependencies] # This version *must* be the same as the version used by winit, diff --git a/crates/bevy_log/Cargo.toml b/crates/bevy_log/Cargo.toml index 85981733f2bbc..c39d1bbebcb68 100644 --- a/crates/bevy_log/Cargo.toml +++ b/crates/bevy_log/Cargo.toml @@ -12,9 +12,9 @@ keywords = ["bevy"] trace = [ "tracing-error" ] [dependencies] -bevy_app.workspace = true -bevy_utils.workspace = true -bevy_ecs.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } tracing-subscriber = {version = "0.3.1", features = ["registry", "env-filter"]} tracing-chrome = { version = "0.4.0", optional = true } diff --git a/crates/bevy_pbr/Cargo.toml b/crates/bevy_pbr/Cargo.toml index 4926f5f56c1b9..6e27bc506d85a 100644 --- a/crates/bevy_pbr/Cargo.toml +++ b/crates/bevy_pbr/Cargo.toml @@ -13,17 +13,17 @@ webgl = [] [dependencies] # bevy -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_core_pipeline.workspace = true -bevy_ecs.workspace = true -bevy_math.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_render.workspace = true -bevy_transform.workspace = true -bevy_utils.workspace = true -bevy_window.workspace = true -bevy_derive.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } +bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } # other bitflags = "1.2" diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml index b05bff981dd63..5337b1130231f 100644 --- a/crates/bevy_reflect/Cargo.toml +++ b/crates/bevy_reflect/Cargo.toml @@ -14,10 +14,10 @@ bevy = ["glam", "smallvec", "bevy_math"] [dependencies] # bevy -bevy_math = { workspace = true, optional = true } -bevy_reflect_derive.workspace = true -bevy_utils.workspace = true -bevy_ptr.workspace = true +bevy_math = { path = "../bevy_math", version = "0.9.0-dev", optional = true } +bevy_reflect_derive = { path = "bevy_reflect_derive", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_ptr = { path = "../bevy_ptr", version = "0.9.0-dev" } # other erased-serde = "0.3" diff --git a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml index cdf5b04eec55f..45209ab846f80 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml +++ b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["bevy"] proc-macro = true [dependencies] -bevy_macro_utils.workspace = true +bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.9.0-dev" } syn = { version = "1.0", features = ["full"] } proc-macro2 = "1.0" diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 422bbed24178c..26cbf4c98e54b 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -28,22 +28,22 @@ webgl = ["wgpu/webgl"] [dependencies] # bevy -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_core.workspace = true -bevy_derive.workspace = true -bevy_ecs.workspace = true -bevy_encase_derive.workspace = true -bevy_hierarchy.workspace = true -bevy_log.workspace = true -bevy_math.workspace = true -bevy_mikktspace.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_render_macros.workspace = true -bevy_time.workspace = true -bevy_transform.workspace = true -bevy_window.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_core = { path = "../bevy_core", version = "0.9.0-dev" } +bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_encase_derive = { path = "../bevy_encase_derive", version = "0.9.0-dev" } +bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } +bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_render_macros = { path = "macros", version = "0.9.0-dev" } +bevy_time = { path = "../bevy_time", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # rendering image = { version = "0.24", default-features = false } diff --git a/crates/bevy_render/macros/Cargo.toml b/crates/bevy_render/macros/Cargo.toml index 0fd033dad1a8f..4be2ddb6477ba 100644 --- a/crates/bevy_render/macros/Cargo.toml +++ b/crates/bevy_render/macros/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["bevy"] proc-macro = true [dependencies] -bevy_macro_utils.workspace = true +bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.9.0-dev" } syn = "1.0" proc-macro2 = "1.0" diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml index 5bb6aa8d8e94e..0b7ef42b296d0 100644 --- a/crates/bevy_scene/Cargo.toml +++ b/crates/bevy_scene/Cargo.toml @@ -10,15 +10,15 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_derive.workspace = true -bevy_ecs.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_hierarchy.workspace = true -bevy_transform.workspace = true -bevy_utils.workspace = true -bevy_render.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } # other serde = { version = "1.0", features = ["derive"] } diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml index 4fa95818a4e15..ab81a010c0b58 100644 --- a/crates/bevy_sprite/Cargo.toml +++ b/crates/bevy_sprite/Cargo.toml @@ -10,17 +10,19 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_core_pipeline.workspace = true -bevy_ecs.workspace = true -bevy_log.workspace = true -bevy_math.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_render.workspace = true -bevy_transform.workspace = true -bevy_utils.workspace = true -bevy_derive.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = [ + "bevy", +] } +bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } +bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } # other bytemuck = { version = "1.5", features = ["derive"] } diff --git a/crates/bevy_text/Cargo.toml b/crates/bevy_text/Cargo.toml index d96f94042a227..033237d5ca7a3 100644 --- a/crates/bevy_text/Cargo.toml +++ b/crates/bevy_text/Cargo.toml @@ -13,16 +13,16 @@ subpixel_glyph_atlas = [] [dependencies] # bevy -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_ecs.workspace = true -bevy_math.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_render.workspace = true -bevy_sprite.workspace = true -bevy_transform.workspace = true -bevy_window.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } +bevy_sprite = { path = "../bevy_sprite", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other anyhow = "1.0.4" diff --git a/crates/bevy_time/Cargo.toml b/crates/bevy_time/Cargo.toml index 866dcb36b0e7e..ec97270f1c9ed 100644 --- a/crates/bevy_time/Cargo.toml +++ b/crates/bevy_time/Cargo.toml @@ -11,10 +11,10 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_ecs = { workspace = true, features = ["bevy_reflect"] } -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_reflect"] } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other crossbeam-channel = "0.5.0" diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml index 341ea522c8b37..e048469600ef9 100644 --- a/crates/bevy_transform/Cargo.toml +++ b/crates/bevy_transform/Cargo.toml @@ -10,8 +10,8 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_ecs = { workspace = true, features = ["bevy_reflect"] } -bevy_hierarchy.workspace = true -bevy_math.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev", features = ["bevy_reflect"] } +bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = ["bevy"] } diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml index 735a14ab3f030..225d1a5e5b35d 100644 --- a/crates/bevy_ui/Cargo.toml +++ b/crates/bevy_ui/Cargo.toml @@ -10,22 +10,24 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app.workspace = true -bevy_asset.workspace = true -bevy_core_pipeline.workspace = true -bevy_derive.workspace = true -bevy_ecs.workspace = true -bevy_hierarchy.workspace = true -bevy_input.workspace = true -bevy_log.workspace = true -bevy_math.workspace = true -bevy_reflect = { workspace = true, features = ["bevy"] } -bevy_render.workspace = true -bevy_sprite.workspace = true -bevy_text.workspace = true -bevy_transform.workspace = true -bevy_window.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_asset = { path = "../bevy_asset", version = "0.9.0-dev" } +bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.9.0-dev" } +bevy_derive = { path = "../bevy_derive", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.9.0-dev" } +bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } +bevy_log = { path = "../bevy_log", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev", features = [ + "bevy", +] } +bevy_render = { path = "../bevy_render", version = "0.9.0-dev" } +bevy_sprite = { path = "../bevy_sprite", version = "0.9.0-dev" } +bevy_text = { path = "../bevy_text", version = "0.9.0-dev" } +bevy_transform = { path = "../bevy_transform", version = "0.9.0-dev" } +bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other taffy = "0.1.0" diff --git a/crates/bevy_window/Cargo.toml b/crates/bevy_window/Cargo.toml index f1fc5d8c34db9..4459a90ab3367 100644 --- a/crates/bevy_window/Cargo.toml +++ b/crates/bevy_window/Cargo.toml @@ -14,13 +14,13 @@ serialize = ["serde"] [dependencies] # bevy -bevy_app.workspace = true -bevy_ecs.workspace = true -bevy_math.workspace = true -bevy_reflect.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_reflect = { path = "../bevy_reflect", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # Used for close_on_esc -bevy_input.workspace = true +bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } raw-window-handle = "0.4.2" # other diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml index 2e00bb8062bd8..55ed18fcc08d6 100644 --- a/crates/bevy_winit/Cargo.toml +++ b/crates/bevy_winit/Cargo.toml @@ -14,12 +14,12 @@ x11 = ["winit/x11"] [dependencies] # bevy -bevy_app.workspace = true -bevy_ecs.workspace = true -bevy_input.workspace = true -bevy_math.workspace = true -bevy_window.workspace = true -bevy_utils.workspace = true +bevy_app = { path = "../bevy_app", version = "0.9.0-dev" } +bevy_ecs = { path = "../bevy_ecs", version = "0.9.0-dev" } +bevy_input = { path = "../bevy_input", version = "0.9.0-dev" } +bevy_math = { path = "../bevy_math", version = "0.9.0-dev" } +bevy_window = { path = "../bevy_window", version = "0.9.0-dev" } +bevy_utils = { path = "../bevy_utils", version = "0.9.0-dev" } # other winit = { version = "0.26.0", default-features = false } diff --git a/errors/Cargo.toml b/errors/Cargo.toml index b8db5d6af06b8..cad938a653f93 100644 --- a/errors/Cargo.toml +++ b/errors/Cargo.toml @@ -7,4 +7,4 @@ publish = false license = "MIT OR Apache-2.0" [dependencies] -bevy.workspace = true +bevy = { path = ".." } diff --git a/examples/ios/Cargo.toml b/examples/ios/Cargo.toml index 6ffab6d0801c1..ae0f6ba0bb068 100644 --- a/examples/ios/Cargo.toml +++ b/examples/ios/Cargo.toml @@ -11,7 +11,7 @@ name = "bevy_ios_example" crate-type = ["staticlib"] [dependencies] -bevy = { workspace = true, features = [ +bevy = { path = "../../", features = [ "bevy_audio", "bevy_winit", "render", diff --git a/tools/spancmp/Cargo.toml b/tools/spancmp/Cargo.toml index f3ef6841b4ada..0c7d530436841 100644 --- a/tools/spancmp/Cargo.toml +++ b/tools/spancmp/Cargo.toml @@ -12,5 +12,5 @@ serde = { version = "1.0", features = ["derive"] } clap = { version = "3.2", features = ["derive"] } regex = "1.5" termcolor = "1.1" -bevy_utils.workspace = true +bevy_utils = { path = "../../crates/bevy_utils", version = "0.9.0-dev" } lazy_static = "1.4" From ac90d37822b41673c65910cfc9b42d25f8da5171 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Tue, 4 Oct 2022 19:10:10 +0200 Subject: [PATCH 09/13] added licence to workspace inheritances --- Cargo.toml | 3 ++- crates/bevy_animation/Cargo.toml | 2 +- crates/bevy_app/Cargo.toml | 2 +- crates/bevy_asset/Cargo.toml | 2 +- crates/bevy_audio/Cargo.toml | 2 +- crates/bevy_core/Cargo.toml | 2 +- crates/bevy_core_pipeline/Cargo.toml | 2 +- crates/bevy_derive/Cargo.toml | 2 +- crates/bevy_diagnostic/Cargo.toml | 2 +- crates/bevy_dylib/Cargo.toml | 2 +- crates/bevy_dynamic_plugin/Cargo.toml | 2 +- crates/bevy_ecs/Cargo.toml | 2 +- crates/bevy_ecs/macros/Cargo.toml | 2 +- crates/bevy_encase_derive/Cargo.toml | 2 +- crates/bevy_gilrs/Cargo.toml | 2 +- crates/bevy_gltf/Cargo.toml | 2 +- crates/bevy_hierarchy/Cargo.toml | 2 +- crates/bevy_input/Cargo.toml | 2 +- crates/bevy_internal/Cargo.toml | 2 +- crates/bevy_log/Cargo.toml | 2 +- crates/bevy_macro_utils/Cargo.toml | 2 +- crates/bevy_math/Cargo.toml | 2 +- crates/bevy_pbr/Cargo.toml | 2 +- crates/bevy_ptr/Cargo.toml | 2 +- crates/bevy_reflect/Cargo.toml | 2 +- crates/bevy_reflect/bevy_reflect_derive/Cargo.toml | 2 +- crates/bevy_render/Cargo.toml | 2 +- crates/bevy_render/macros/Cargo.toml | 2 +- crates/bevy_scene/Cargo.toml | 2 +- crates/bevy_sprite/Cargo.toml | 2 +- crates/bevy_tasks/Cargo.toml | 2 +- crates/bevy_text/Cargo.toml | 2 +- crates/bevy_time/Cargo.toml | 2 +- crates/bevy_transform/Cargo.toml | 2 +- crates/bevy_ui/Cargo.toml | 2 +- crates/bevy_utils/Cargo.toml | 2 +- crates/bevy_window/Cargo.toml | 2 +- crates/bevy_winit/Cargo.toml | 2 +- errors/Cargo.toml | 2 +- examples/ios/Cargo.toml | 2 +- tools/build-example-pages/Cargo.toml | 2 +- tools/build-wasm-example/Cargo.toml | 2 +- tools/ci/Cargo.toml | 2 +- tools/spancmp/Cargo.toml | 2 +- 44 files changed, 45 insertions(+), 44 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1c6c44573ce77..ee8a20abb662e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ version = "0.9.0-dev" edition = "2021" homepage = "https://bevyengine.org" repository = "/~https://github.com/bevyengine/bevy" +license = "MIT OR Apache-2.0" [package] name = "bevy" @@ -24,7 +25,7 @@ description = "A refreshingly simple data-driven game engine and app framework" exclude = ["assets/", "tools/", ".github/", "crates/", "examples/wasm/assets/"] homepage.workspace = true keywords = ["game", "engine", "gamedev", "graphics", "bevy"] -license = "MIT OR Apache-2.0" +license.workspace = true readme = "README.md" repository.workspace = true diff --git a/crates/bevy_animation/Cargo.toml b/crates/bevy_animation/Cargo.toml index 31daaf5839135..23f7d3f5c4aae 100644 --- a/crates/bevy_animation/Cargo.toml +++ b/crates/bevy_animation/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides animation functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml index aac26d12aa75c..3d67f6251962e 100644 --- a/crates/bevy_app/Cargo.toml +++ b/crates/bevy_app/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides core App functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml index dcd3bcc1a248f..b5137bc1d22e4 100644 --- a/crates/bevy_asset/Cargo.toml +++ b/crates/bevy_asset/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides asset functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml index 4ad26f6ba73fa..bb4cd0e2c3b55 100644 --- a/crates/bevy_audio/Cargo.toml +++ b/crates/bevy_audio/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides audio functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_core/Cargo.toml b/crates/bevy_core/Cargo.toml index d66035c4250de..08c0f7d6919df 100644 --- a/crates/bevy_core/Cargo.toml +++ b/crates/bevy_core/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides core functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] diff --git a/crates/bevy_core_pipeline/Cargo.toml b/crates/bevy_core_pipeline/Cargo.toml index 7dbfff7e79324..40efd063862c4 100644 --- a/crates/bevy_core_pipeline/Cargo.toml +++ b/crates/bevy_core_pipeline/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Provides a core render pipeline for Bevy Engine." homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_derive/Cargo.toml b/crates/bevy_derive/Cargo.toml index 7b9f7f69fbe8d..d3ff5bc6a23b7 100644 --- a/crates/bevy_derive/Cargo.toml +++ b/crates/bevy_derive/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides derive implementations for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [lib] diff --git a/crates/bevy_diagnostic/Cargo.toml b/crates/bevy_diagnostic/Cargo.toml index 041f2910d1863..23fdc31bed028 100644 --- a/crates/bevy_diagnostic/Cargo.toml +++ b/crates/bevy_diagnostic/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides diagnostic functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] diff --git a/crates/bevy_dylib/Cargo.toml b/crates/bevy_dylib/Cargo.toml index 2d2a505cac0a5..d1e9149eb4e52 100644 --- a/crates/bevy_dylib/Cargo.toml +++ b/crates/bevy_dylib/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Force the Bevy Engine to be dynamically linked for faster linking" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [lib] diff --git a/crates/bevy_dynamic_plugin/Cargo.toml b/crates/bevy_dynamic_plugin/Cargo.toml index a88b3cb0b244e..744c3291aedb2 100644 --- a/crates/bevy_dynamic_plugin/Cargo.toml +++ b/crates/bevy_dynamic_plugin/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides dynamic plugin loading capabilities for non-wasm platforms" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml index 457aab11a8862..32481f6f5f0bd 100644 --- a/crates/bevy_ecs/Cargo.toml +++ b/crates/bevy_ecs/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Bevy Engine's entity component system" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["ecs", "game", "bevy"] categories = ["game-engines", "data-structures"] diff --git a/crates/bevy_ecs/macros/Cargo.toml b/crates/bevy_ecs/macros/Cargo.toml index 8743e57ce4298..4ee0751174a14 100644 --- a/crates/bevy_ecs/macros/Cargo.toml +++ b/crates/bevy_ecs/macros/Cargo.toml @@ -3,7 +3,7 @@ name = "bevy_ecs_macros" version.workspace = true description = "Bevy ECS Macros" edition.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true [lib] proc-macro = true diff --git a/crates/bevy_encase_derive/Cargo.toml b/crates/bevy_encase_derive/Cargo.toml index 58b2cee604606..1b02204054b8f 100644 --- a/crates/bevy_encase_derive/Cargo.toml +++ b/crates/bevy_encase_derive/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Bevy derive macro for encase" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [lib] diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml index 9f22fd3cd950a..8a381a840c9d4 100644 --- a/crates/bevy_gilrs/Cargo.toml +++ b/crates/bevy_gilrs/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Gamepad system made using Gilrs for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_gltf/Cargo.toml b/crates/bevy_gltf/Cargo.toml index 163ed8748cb25..69d23a79f9f1e 100644 --- a/crates/bevy_gltf/Cargo.toml +++ b/crates/bevy_gltf/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Bevy Engine GLTF loading" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_hierarchy/Cargo.toml b/crates/bevy_hierarchy/Cargo.toml index 61c677049c5e6..c7c6916794bfb 100644 --- a/crates/bevy_hierarchy/Cargo.toml +++ b/crates/bevy_hierarchy/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides hierarchy functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_input/Cargo.toml b/crates/bevy_input/Cargo.toml index c4b899bbbe2fb..cf13448f9dab7 100644 --- a/crates/bevy_input/Cargo.toml +++ b/crates/bevy_input/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides input functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml index ada568029f671..9c969dfe98157 100644 --- a/crates/bevy_internal/Cargo.toml +++ b/crates/bevy_internal/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "An internal Bevy crate used to facilitate optional dynamic linking via the 'dynamic' feature" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["game", "engine", "gamedev", "graphics", "bevy"] categories = ["game-engines", "graphics", "gui", "rendering"] diff --git a/crates/bevy_log/Cargo.toml b/crates/bevy_log/Cargo.toml index c39d1bbebcb68..ae14fbd0c5ca1 100644 --- a/crates/bevy_log/Cargo.toml +++ b/crates/bevy_log/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides logging for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_macro_utils/Cargo.toml b/crates/bevy_macro_utils/Cargo.toml index 631662a47ade1..5bb08d1476f19 100644 --- a/crates/bevy_macro_utils/Cargo.toml +++ b/crates/bevy_macro_utils/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "A collection of utils for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_math/Cargo.toml b/crates/bevy_math/Cargo.toml index 7dec72ee3f264..1587425087b5f 100644 --- a/crates/bevy_math/Cargo.toml +++ b/crates/bevy_math/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides math functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_pbr/Cargo.toml b/crates/bevy_pbr/Cargo.toml index 6e27bc506d85a..56048cd50faa3 100644 --- a/crates/bevy_pbr/Cargo.toml +++ b/crates/bevy_pbr/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Adds PBR rendering to Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_ptr/Cargo.toml b/crates/bevy_ptr/Cargo.toml index 85a9d3f1c91c5..8b5cf53815bc1 100644 --- a/crates/bevy_ptr/Cargo.toml +++ b/crates/bevy_ptr/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Utilities for working with untyped pointers in a more safe way" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy", "no_std"] [dependencies] diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml index 5337b1130231f..f794d612b05a9 100644 --- a/crates/bevy_reflect/Cargo.toml +++ b/crates/bevy_reflect/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Dynamically interact with rust types" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] readme = "README.md" diff --git a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml index 45209ab846f80..b7e8ee9f11579 100644 --- a/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml +++ b/crates/bevy_reflect/bevy_reflect_derive/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Derive implementations for bevy_reflect" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [lib] diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 55ea862361738..cae9776c9f1d1 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides rendering functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_render/macros/Cargo.toml b/crates/bevy_render/macros/Cargo.toml index 4be2ddb6477ba..567679d34d82d 100644 --- a/crates/bevy_render/macros/Cargo.toml +++ b/crates/bevy_render/macros/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Derive implementations for bevy_render" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [lib] diff --git a/crates/bevy_scene/Cargo.toml b/crates/bevy_scene/Cargo.toml index 0b7ef42b296d0..e48d68edbeaad 100644 --- a/crates/bevy_scene/Cargo.toml +++ b/crates/bevy_scene/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides scene functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_sprite/Cargo.toml b/crates/bevy_sprite/Cargo.toml index 50eb00806e5b7..d85fce1691992 100644 --- a/crates/bevy_sprite/Cargo.toml +++ b/crates/bevy_sprite/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides sprite functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_tasks/Cargo.toml b/crates/bevy_tasks/Cargo.toml index 7578e88359610..e1281e1b7d533 100644 --- a/crates/bevy_tasks/Cargo.toml +++ b/crates/bevy_tasks/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "A task executor for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_text/Cargo.toml b/crates/bevy_text/Cargo.toml index 033237d5ca7a3..3d850b41965d3 100644 --- a/crates/bevy_text/Cargo.toml +++ b/crates/bevy_text/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides text functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_time/Cargo.toml b/crates/bevy_time/Cargo.toml index ec97270f1c9ed..d867c622ab48e 100644 --- a/crates/bevy_time/Cargo.toml +++ b/crates/bevy_time/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides time functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml index e048469600ef9..33b2f84622550 100644 --- a/crates/bevy_transform/Cargo.toml +++ b/crates/bevy_transform/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides transform functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml index 225d1a5e5b35d..5639839e9b6ca 100644 --- a/crates/bevy_ui/Cargo.toml +++ b/crates/bevy_ui/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "A custom ECS-driven UI framework built specifically for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_utils/Cargo.toml b/crates/bevy_utils/Cargo.toml index a42da29398784..b4b6a0d310428 100644 --- a/crates/bevy_utils/Cargo.toml +++ b/crates/bevy_utils/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "A collection of utils for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_window/Cargo.toml b/crates/bevy_window/Cargo.toml index 4459a90ab3367..f35561c67f572 100644 --- a/crates/bevy_window/Cargo.toml +++ b/crates/bevy_window/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "Provides windowing functionality for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml index 55ed18fcc08d6..3858b10003c1c 100644 --- a/crates/bevy_winit/Cargo.toml +++ b/crates/bevy_winit/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true description = "A winit window and input backend for Bevy Engine" homepage.workspace = true repository.workspace = true -license = "MIT OR Apache-2.0" +license.workspace = true keywords = ["bevy"] [features] diff --git a/errors/Cargo.toml b/errors/Cargo.toml index cad938a653f93..ddd136f1fc09c 100644 --- a/errors/Cargo.toml +++ b/errors/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition.workspace = true description = "Bevy's error codes" publish = false -license = "MIT OR Apache-2.0" +license.workspace = true [dependencies] bevy = { path = ".." } diff --git a/examples/ios/Cargo.toml b/examples/ios/Cargo.toml index ae0f6ba0bb068..0ae222dc17e3d 100644 --- a/examples/ios/Cargo.toml +++ b/examples/ios/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition.workspace = true description = "Example for building an iOS app with Bevy" publish = false -license = "MIT OR Apache-2.0" +license.workspace = true [lib] name = "bevy_ios_example" diff --git a/tools/build-example-pages/Cargo.toml b/tools/build-example-pages/Cargo.toml index ff154ae7337a7..d320cd9f92e45 100644 --- a/tools/build-example-pages/Cargo.toml +++ b/tools/build-example-pages/Cargo.toml @@ -4,7 +4,7 @@ version.workspace = true edition.workspace = true description = "handle examples in Bevy" publish = false -license = "MIT OR Apache-2.0" +license.workspace = true [dependencies] toml = "0.5" diff --git a/tools/build-wasm-example/Cargo.toml b/tools/build-wasm-example/Cargo.toml index 8bb42928434f5..012c32bb881de 100644 --- a/tools/build-wasm-example/Cargo.toml +++ b/tools/build-wasm-example/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition.workspace = true description = "Build an example for wasm" publish = false -license = "MIT OR Apache-2.0" +license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/tools/ci/Cargo.toml b/tools/ci/Cargo.toml index 6fba484be40bc..efc9a8a69b257 100644 --- a/tools/ci/Cargo.toml +++ b/tools/ci/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition.workspace = true description = "CI script for Bevy" publish = false -license = "MIT OR Apache-2.0" +license.workspace = true [dependencies] xshell = "0.2" diff --git a/tools/spancmp/Cargo.toml b/tools/spancmp/Cargo.toml index 0c7d530436841..e0d1a090377e4 100644 --- a/tools/spancmp/Cargo.toml +++ b/tools/spancmp/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition.workspace = true description = "compare spans for Bevy" publish = false -license = "MIT OR Apache-2.0" +license.workspace = true [dependencies] serde_json = "1.0" From 0b9c47a430d53db526ac732ca7f9d563b66f496e Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Tue, 11 Oct 2022 15:05:54 +0200 Subject: [PATCH 10/13] add line break Co-authored-by: bjorn3 <17426603+bjorn3@users.noreply.github.com> --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index ee8a20abb662e..2406c581cb9bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,7 @@ members = [ "tools/build-wasm-example", "errors", ] + [workspace.package] version = "0.9.0-dev" edition = "2021" From 0593593dbf5e98e0eda2a4da9b44615ebc8e47ae Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:38:39 +0100 Subject: [PATCH 11/13] added workspace inheritance bevy-android-example --- examples/android/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/android/Cargo.toml b/examples/android/Cargo.toml index 6f8cd0074a7bf..88fcc004e229e 100644 --- a/examples/android/Cargo.toml +++ b/examples/android/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "bevy-android-example" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "Example for building an Android app with Bevy" publish = false -license = "MIT OR Apache-2.0" +license.workspace = true [lib] name = "bevy_android_example" From 186c63b131ef072eda35778d2d462b0f81545891 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:03:07 +0100 Subject: [PATCH 12/13] Revert "use newer rust version" This reverts commit 8507b0edb0b12c31b27247a398623a7eecb08ed6. This reverts commit c6c42719b09ecff976e30b018a66ed2222d97890. --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fba1a8cd3266..f28aca435c222 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -238,10 +238,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - run: cargo run -p build-example-pages -- check-missing check-examples-readme-update-needed: @@ -249,10 +245,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - run: cargo run -p build-example-pages -- update - name: Check for modified files run: | From 003753d22e1eff8fed854b97090e63df022f1606 Mon Sep 17 00:00:00 2001 From: dani162 <34603476+dani162@users.noreply.github.com> Date: Mon, 5 Dec 2022 12:06:00 +0100 Subject: [PATCH 13/13] use stable rust toolchain --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f28aca435c222..7e92821a79e85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -238,6 +238,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable - run: cargo run -p build-example-pages -- check-missing check-examples-readme-update-needed: @@ -245,6 +246,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@stable - run: cargo run -p build-example-pages -- update - name: Check for modified files run: |