From 0dea47e90fe0753b0d0148365a0b0f0b817e2592 Mon Sep 17 00:00:00 2001 From: Brett Striker Date: Mon, 11 Nov 2024 17:50:56 -0500 Subject: [PATCH] Fix not being able to run bevy_ui tests (#16358) # Objective Fixes #16316 ## Solution Tweaked a few crates cargo files until I was able to build and test `bevy_ui` via `cargo test --package bevy_ui` ## Testing - ran `cargo test --package bevy_ui` successfully - CI should catch anything amiss (Hopefully?) --- crates/bevy_dev_tools/Cargo.toml | 4 +--- crates/bevy_internal/Cargo.toml | 2 +- crates/bevy_ui/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/crates/bevy_dev_tools/Cargo.toml b/crates/bevy_dev_tools/Cargo.toml index 0120ab9184..322c924f81 100644 --- a/crates/bevy_dev_tools/Cargo.toml +++ b/crates/bevy_dev_tools/Cargo.toml @@ -33,9 +33,7 @@ bevy_render = { path = "../bevy_render", version = "0.15.0-dev" } bevy_time = { path = "../bevy_time", version = "0.15.0-dev" } bevy_transform = { path = "../bevy_transform", version = "0.15.0-dev" } bevy_text = { path = "../bevy_text", version = "0.15.0-dev" } -bevy_ui = { path = "../bevy_ui", version = "0.15.0-dev", features = [ - "bevy_text", -] } +bevy_ui = { path = "../bevy_ui", version = "0.15.0-dev" } bevy_utils = { path = "../bevy_utils", version = "0.15.0-dev" } bevy_window = { path = "../bevy_window", version = "0.15.0-dev" } bevy_state = { path = "../bevy_state", version = "0.15.0-dev" } diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml index 74267a4797..4033c6b5ba 100644 --- a/crates/bevy_internal/Cargo.toml +++ b/crates/bevy_internal/Cargo.toml @@ -173,7 +173,7 @@ android_shared_stdcxx = ["bevy_audio/android_shared_stdcxx"] # screen readers and forks.) accesskit_unix = ["bevy_winit/accesskit_unix"] -bevy_text = ["dep:bevy_text", "bevy_ui?/bevy_text"] +bevy_text = ["dep:bevy_text"] bevy_render = [ "dep:bevy_render", diff --git a/crates/bevy_ui/Cargo.toml b/crates/bevy_ui/Cargo.toml index 1184b94b09..d3f456d63f 100644 --- a/crates/bevy_ui/Cargo.toml +++ b/crates/bevy_ui/Cargo.toml @@ -27,7 +27,7 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.15.0-dev", features = [ bevy_render = { path = "../bevy_render", version = "0.15.0-dev" } bevy_animation = { path = "../bevy_animation", version = "0.15.0-dev" } bevy_sprite = { path = "../bevy_sprite", version = "0.15.0-dev" } -bevy_text = { path = "../bevy_text", version = "0.15.0-dev", optional = true } +bevy_text = { path = "../bevy_text", version = "0.15.0-dev" } bevy_picking = { path = "../bevy_picking", version = "0.15.0-dev", optional = true } bevy_transform = { path = "../bevy_transform", version = "0.15.0-dev" } bevy_window = { path = "../bevy_window", version = "0.15.0-dev" }