Depend on the same loopless version in iyes_progress (resolves #72)

NiklasEi · Jul 22, 2022 · c3a60ee · c3a60ee
1 parent 31f31c9
commit c3a60ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
@@ -28,13 +28,13 @@ anyhow = "1"
 
 bevy_common_assets = { version = "0.2", features = ["ron"], optional = true }
 serde = { version = "1", optional = true }
-iyes_progress = { version = "0.3", optional = true }
+iyes_progress = { git = "https://github.com/NiklasEi/iyes_progress", branch = "loopless-schedule-ext-trait", optional = true }
 iyes_loopless = { git = "https://github.com/NiklasEi/iyes_loopless", branch = "loopless-schedule-ext-trait", optional = true }
 
 [dev-dependencies]
 bevy = { version = "0.7", features = ["vorbis"] }
 anyhow = "1"
-iyes_progress = { version = "0.3" }
+iyes_progress = { git = "https://github.com/NiklasEi/iyes_progress", branch = "loopless-schedule-ext-trait" }
 iyes_loopless = { git = "https://github.com/NiklasEi/iyes_loopless", branch = "loopless-schedule-ext-trait" }
 bevy_common_assets = { version = "0.2", features = ["ron"] }
 serde = { version = "1" }

diff --git a/bevy_asset_loader/src/loading_state.rs b/bevy_asset_loader/src/loading_state.rs
@@ -61,9 +61,9 @@ use iyes_progress::ProgressSystemLabel;
 use iyes_loopless::prelude::{AppLooplessStateExt, ConditionSet};
 
 #[cfg(feature = "stageless")]
-use iyes_loopless::state::schedule::{ScheduleLooplessStateExt, StateTransitionStageLabel};
+use iyes_loopless::state::schedule::ScheduleLooplessStateExt;
 #[cfg(feature = "stageless")]
-use iyes_loopless::state::StateTransitionStage;
+use iyes_loopless::state::{StateTransitionStage, StateTransitionStageLabel};
 
 use crate::dynamic_asset::{DynamicAsset, DynamicAssets};