Merge pull request #252 from Jarten0/bevy_main

fixed imports and added bevy_log feature for 0.16.0-rc.2

Author: NiklasEi

README.md

@@ -455,7 +455,7 @@ This is only a change in derive attributes and asset field type. The examples fr
 
 ```rust
 use bevy::prelude::*;
-use bevy::platform_support::collections::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy_asset_loader::asset_collection::AssetCollection;
 
 #[derive(AssetCollection, Resource)]

bevy_asset_loader/Cargo.toml

@@ -22,12 +22,18 @@ standard_dynamic_assets = ["dep:bevy_common_assets", "dep:serde"]
 progress_tracking = ["dep:iyes_progress"]
 
 [dependencies]
-bevy = { version = "0.16.0-rc.4", default-features = false, features = ["bevy_asset", "bevy_state"] }
+bevy = { version = "0.16.0-rc.5", default-features = false, features = [
+    "bevy_asset",
+    "bevy_state",
+    "bevy_log",
+] }
 bevy_asset_loader_derive = { version = "0.23.0-rc.2", path = "../bevy_asset_loader_derive" }
 anyhow = "1"
 path-slash = "0.2"
 
-bevy_common_assets = { version = "0.13.0-rc.1", features = ["ron"], optional = true }
+bevy_common_assets = { version = "0.13.0-rc.1", features = [
+    "ron",
+], optional = true }
 serde = { version = "1", optional = true }
 iyes_progress = { version = "0.14.0-rc.1", optional = true }
 

bevy_asset_loader/examples/asset_maps.rs

@@ -1,6 +1,6 @@
 use bevy::app::AppExit;
 use bevy::asset::AssetPath;
-use bevy::platform_support::collections::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy::prelude::*;
 use bevy_asset_loader::prelude::*;
 

bevy_asset_loader/examples/custom_dynamic_assets.rs

@@ -1,5 +1,5 @@
 use bevy::ecs::system::SystemState;
-use bevy::platform_support::collections::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy::prelude::*;
 use bevy::reflect::TypePath;
 use bevy::render::render_asset::RenderAssetUsages;

bevy_asset_loader/examples/full_collection.rs

@@ -1,7 +1,7 @@
 use bevy::app::AppExit;
 use bevy::asset::UntypedAssetId;
 use bevy::image::{ImageSampler, ImageSamplerDescriptor};
-use bevy::platform_support::collections::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy::prelude::*;
 use bevy_asset_loader::prelude::*;
 

bevy_asset_loader/examples/full_dynamic_collection.rs

@@ -4,7 +4,7 @@
 use bevy::app::AppExit;
 use bevy::asset::UntypedAssetId;
 use bevy::image::{ImageAddressMode, ImageSampler, ImageSamplerDescriptor};
-use bevy::platform_support::collections::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy::prelude::*;
 use bevy_asset_loader::prelude::*;
 

bevy_asset_loader/src/dynamic_asset.rs

@@ -4,7 +4,7 @@ use std::fmt::Debug;
 use bevy::asset::{Asset, AssetServer, UntypedHandle};
 use bevy::ecs::resource::Resource;
 use bevy::ecs::world::World;
-use bevy::platform_support::collections::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy::state::state::FreelyMutableState;
 use std::marker::PhantomData;
 

bevy_asset_loader/src/loading_state.rs

@@ -11,7 +11,7 @@ use bevy::ecs::{
     schedule::{InternedScheduleLabel, ScheduleLabel, SystemSet},
     world::FromWorld,
 };
-use bevy::platform_support::collections::{HashMap, HashSet};
+use bevy::platform::collections::{HashMap, HashSet};
 use bevy::prelude::{
     IntoScheduleConfigs, NextState, OnEnter, State, StateTransition, States, Update, in_state,
 };

bevy_asset_loader/src/loading_state/config.rs

@@ -13,7 +13,7 @@ use crate::loading_state::{
 use bevy::app::App;
 use bevy::asset::Asset;
 use bevy::ecs::schedule::ScheduleConfigs;
-use bevy::platform_support::collections::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy::prelude::{BevyError, FromWorld, IntoScheduleConfigs, Resource, default};
 use bevy::state::state::FreelyMutableState;
 use std::any::TypeId;

bevy_asset_loader/src/standard_dynamic_asset.rs

@@ -5,7 +5,7 @@ use bevy::ecs::change_detection::Res;
 use bevy::ecs::system::SystemState;
 use bevy::ecs::system::command::Command;
 use bevy::ecs::world::World;
-use bevy::platform_support::collections::HashMap;
+use bevy::platform::collections::HashMap;
 use bevy::reflect::TypePath;
 use serde::{Deserialize, Serialize};