Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workspace inheritance #6089

Closed
wants to merge 15 commits into from
Closed

Workspace inheritance #6089

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f7ed1bb
move workspace to top
dani162 Sep 24, 2022
c1a9f85
use version, edition, homepage, readme and repo form workspace
dani162 Sep 24, 2022
bfd0203
Update Cargo.toml
dani162 Sep 24, 2022
67afac3
undo workspace inheritance for benches, crates/bevy_ecs_compile_fail_…
dani162 Sep 24, 2022
3c9f8a3
replace bevy dependencies with workspace inheritance
dani162 Sep 24, 2022
8507b0e
use newer rust version
dani162 Sep 24, 2022
c6c4271
use newer rust version
dani162 Sep 24, 2022
85074c8
Revert "replace bevy dependencies with workspace inheritance"
dani162 Oct 4, 2022
efd1c40
Merge remote-tracking branch 'origin/HEAD' into workspace-inheritance
dani162 Oct 4, 2022
ac90d37
added licence to workspace inheritances
dani162 Oct 4, 2022
0b9c47a
add line break
dani162 Oct 11, 2022
87f833a
Merge branch 'main' into workspace-inheritance
dani162 Dec 5, 2022
0593593
added workspace inheritance bevy-android-example
dani162 Dec 5, 2022
186c63b
Revert "use newer rust version"
dani162 Dec 5, 2022
003753d
use stable rust toolchain
dani162 Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
dani162 marked this conversation as resolved.
Show resolved Hide resolved
- run: cargo run -p build-example-pages -- check-missing

check-examples-readme-update-needed:
needs: check-missing-examples-in-docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
dani162 marked this conversation as resolved.
Show resolved Hide resolved
- run: cargo run -p build-example-pages -- update
- name: Check for modified files
run: |
Expand Down
32 changes: 19 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
[package]
name = "bevy"
version = "0.9.0-dev"
edition = "2021"
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"
keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "/~https://github.com/bevyengine/bevy"

[workspace]
exclude = ["benches", "crates/bevy_ecs_compile_fail_tests"]
dani162 marked this conversation as resolved.
Show resolved Hide resolved
members = [
Expand All @@ -22,6 +9,25 @@ members = [
"tools/build-wasm-example",
"errors",
]
[workspace.package]
dani162 marked this conversation as resolved.
Show resolved Hide resolved
version = "0.9.0-dev"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version = "0.9.0-dev"
version = "0.10.0-dev"

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if we should bump the version in this pull request, in my opinion we should do this in another pr?
If we do, we also need to update all the dependencies, because the version of the dependencies is not inherited at the moment (see conversation above).
I guess their is an GitHub-Action for that?

edition = "2021"
homepage = "https://bevyengine.org"
repository = "/~https://github.com/bevyengine/bevy"
license = "MIT OR Apache-2.0"

[package]
name = "bevy"
version.workspace = true
edition.workspace = true
categories = ["game-engines", "graphics", "gui", "rendering"]
dani162 marked this conversation as resolved.
Show resolved Hide resolved
description = "A refreshingly simple data-driven game engine and app framework"
exclude = ["assets/", "tools/", ".github/", "crates/", "examples/wasm/assets/"]
dani162 marked this conversation as resolved.
Show resolved Hide resolved
homepage.workspace = true
keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
license.workspace = true
readme = "README.md"
repository.workspace = true

[features]
default = [
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_animation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[dependencies]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[features]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_asset/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[features]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_audio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[dependencies]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]


Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_core_pipeline/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "bevy_core_pipeline"
version = "0.9.0-dev"
edition = "2021"
version.workspace = true
edition.workspace = true
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides a core render pipeline for Bevy Engine."
homepage = "https://bevyengine.org"
repository = "/~https://github.com/bevyengine/bevy"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[features]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[lib]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_diagnostic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]


Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_dylib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[lib]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_dynamic_plugin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_ecs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["ecs", "game", "bevy"]
categories = ["game-engines", "data-structures"]

Expand Down
6 changes: 3 additions & 3 deletions crates/bevy_ecs/macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "bevy_ecs_macros"
version = "0.9.0-dev"
version.workspace = true
description = "Bevy ECS Macros"
edition = "2021"
license = "MIT OR Apache-2.0"
edition.workspace = true
license.workspace = true

[lib]
proc-macro = true
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_encase_derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[lib]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_gilrs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[dependencies]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_gltf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[dependencies]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_hierarchy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[features]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_input/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[features]
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_internal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
categories = ["game-engines", "graphics", "gui", "rendering"]

Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_log/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[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"
license = "MIT OR Apache-2.0"
homepage.workspace = true
repository.workspace = true
license.workspace = true
keywords = ["bevy"]

[features]
Expand Down
Loading