Skip to content

Commit

Permalink
replace bevy dependencies with workspace inheritance
Browse files Browse the repository at this point in the history
  • Loading branch information
@dani162
dani162 committed Sep 24, 2022
1 parent 67afac3 commit 3c9f8a3
Show file tree
Hide file tree
Showing 36 changed files with 267 additions and 229 deletions.
48 changes: 45 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
] }

Expand Down
20 changes: 10 additions & 10 deletions crates/bevy_animation/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions crates/bevy_app/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
16 changes: 8 additions & 8 deletions crates/bevy_asset/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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
10 changes: 5 additions & 5 deletions crates/bevy_audio/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions crates/bevy_core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
14 changes: 7 additions & 7 deletions crates/bevy_core_pipeline/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion crates/bevy_derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
10 changes: 5 additions & 5 deletions crates/bevy_diagnostic/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion crates/bevy_dylib/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
2 changes: 1 addition & 1 deletion crates/bevy_dynamic_plugin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
10 changes: 5 additions & 5 deletions crates/bevy_ecs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_ecs/macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_encase_derive/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions crates/bevy_gilrs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
32 changes: 16 additions & 16 deletions crates/bevy_gltf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
12 changes: 6 additions & 6 deletions crates/bevy_hierarchy/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
10 changes: 5 additions & 5 deletions crates/bevy_input/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Loading

0 comments on commit 3c9f8a3

Please sign in to comment.