From c3a60ee1fc45593118ad65ca35c4b51ed428c444 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Fri, 22 Jul 2022 09:23:07 +0200
Subject: [PATCH] Depend on the same loopless version in iyes_progress
 (resolves #72)

---
 bevy_asset_loader/Cargo.toml           | 4 ++--
 bevy_asset_loader/src/loading_state.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
index 36a4484..0e7e8a5 100644
--- 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
index f99dc86..0872876 100644
--- 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};