update to Bevy 0.16-rc.3 (#24)

Author: mockersf

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "bevy_embedded_assets"
-version = "0.12.0"
+version = "0.13.0-rc.1"
 authors = ["François Mockers <[email protected]>"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 keywords = ["bevy", "assets"]
 readme = "README.md"
@@ -15,17 +15,22 @@ categories = ["game-development"]
 [features]
 default = ["default-source"]
 # Support for replacing the default asset source
-default-source = ["futures-io", "futures-lite"]
-
-[dependencies.bevy]
-version = "0.15.0"
-default-features = false
-features = ["bevy_asset"]
+default-source = ["futures-io", "futures-lite", "log"]
 
 [dependencies]
+bevy_asset = { version = "0.16.0-rc.3", default-features = false }
+bevy_ecs = { version = "0.16.0-rc.3", default-features = false }
+bevy_app = { version = "0.16.0-rc.3", default-features = false }
+
 futures-io = { version = "0.3", optional = true }
-futures-lite = { version = "2.0", optional = true }
-thiserror = "1.0"
+futures-lite = { version = "2.6", optional = true }
+log = { version = "0.4", optional = true }
+thiserror = "2.0"
+
+[dev-dependencies]
+bevy = { version = "0.16.0-rc.3", default-features = false, features = [
+    "bevy_asset",
+] }
 
 [build-dependencies]
 cargo-emit = "0.2.1"

src/asset_reader.rs

@@ -1,21 +1,19 @@
 use std::{
+    collections::HashMap,
     io::Read,
     path::{Path, PathBuf},
     pin::Pin,
     task::Poll,
 };
 
-use bevy::{
-    asset::io::{
-        AssetReader, AssetReaderError, AsyncSeekForward, ErasedAssetReader, PathStream, Reader,
-    },
-    utils::HashMap,
+use bevy_asset::io::{
+    AssetReader, AssetReaderError, AsyncSeekForward, ErasedAssetReader, PathStream, Reader,
 };
 use futures_io::{AsyncRead, AsyncSeek};
 use futures_lite::Stream;
 use thiserror::Error;
 
-use crate::{include_all_assets, EmbeddedRegistry};
+use crate::{EmbeddedRegistry, include_all_assets};
 
 /// Struct which can be used to retrieve embedded assets directly
 /// without the normal Bevy `Handle<T>` approach.  This is useful
@@ -153,13 +151,13 @@ impl Reader for DataReader {
     fn read_to_end<'a>(
         &'a mut self,
         buf: &'a mut Vec<u8>,
-    ) -> bevy::asset::io::StackFuture<
+    ) -> bevy_asset::io::StackFuture<
         'a,
         std::io::Result<usize>,
-        { bevy::asset::io::STACK_FUTURE_SIZE },
+        { bevy_asset::io::STACK_FUTURE_SIZE },
     > {
         let future = futures_lite::AsyncReadExt::read_to_end(self, buf);
-        bevy::asset::io::StackFuture::from(future)
+        bevy_asset::io::StackFuture::from(future)
     }
 }
 
@@ -323,12 +321,16 @@ mod tests {
         embedded.add_asset(Path::new("asset.png"), &[]);
         embedded.add_asset(Path::new("directory/asset.png"), &[]);
         embedded.add_asset(Path::new("directory/asset2.png"), &[]);
-        assert!(embedded
-            .read_directory_sync(&Path::new("asset.png"))
-            .is_err());
-        assert!(embedded
-            .read_directory_sync(&Path::new("directory"))
-            .is_ok());
+        assert!(
+            embedded
+                .read_directory_sync(&Path::new("asset.png"))
+                .is_err()
+        );
+        assert!(
+            embedded
+                .read_directory_sync(&Path::new("directory"))
+                .is_ok()
+        );
         let mut list = embedded
             .read_directory_sync(&Path::new("directory"))
             .unwrap()

src/lib.rs

@@ -15,22 +15,24 @@
 
 use std::path::PathBuf;
 
-use bevy::{
-    asset::io::embedded::EmbeddedAssetRegistry,
-    prelude::{App, AssetPlugin, Plugin, Resource},
-};
+use bevy_app::App;
+use bevy_app::Plugin;
+use bevy_asset::AssetPlugin;
+use bevy_asset::io::embedded::EmbeddedAssetRegistry;
+use bevy_ecs::resource::Resource;
 #[cfg(feature = "default-source")]
-use bevy::{
-    asset::io::{AssetSource, AssetSourceId},
-    prelude::AssetApp,
+use {
+    bevy_asset::{
+        AssetApp,
+        io::{AssetSource, AssetSourceId},
+    },
+    log::error,
 };
 
 #[cfg(feature = "default-source")]
 mod asset_reader;
 #[cfg(feature = "default-source")]
-pub use asset_reader::DataReader;
-#[cfg(feature = "default-source")]
-pub use asset_reader::EmbeddedAssetReader;
+pub use {asset_reader::DataReader, asset_reader::EmbeddedAssetReader};
 
 include!(concat!(env!("OUT_DIR"), "/include_all_assets.rs"));
 
@@ -133,7 +135,7 @@ impl Plugin for EmbeddedAssetPlugin {
             #[cfg(feature = "default-source")]
             PluginMode::ReplaceDefault => {
                 if app.is_plugin_added::<AssetPlugin>() {
-                    bevy::log::error!(
+                    error!(
                         "plugin EmbeddedAssetPlugin must be added before plugin AssetPlugin when replacing the default asset source"
                     );
                 }
@@ -147,8 +149,8 @@ impl Plugin for EmbeddedAssetPlugin {
             #[cfg(feature = "default-source")]
             PluginMode::ReplaceAndFallback { path } => {
                 if app.is_plugin_added::<AssetPlugin>() {
-                    bevy::log::error!(
-                       "plugin EmbeddedAssetPlugin must be added before plugin AssetPlugin when replacing the default asset source"
+                    error!(
+                        "plugin EmbeddedAssetPlugin must be added before plugin AssetPlugin when replacing the default asset source"
                     );
                 }
                 let path = path.clone();

tests/as_default.rs

@@ -3,7 +3,7 @@
 use std::fmt::Display;
 
 use bevy::{
-    asset::{io::Reader, LoadContext},
+    asset::{LoadContext, io::Reader},
     prelude::*,
 };
 use bevy_embedded_assets::{EmbeddedAssetPlugin, PluginMode};

tests/as_default_with_fallback.rs

@@ -3,7 +3,7 @@
 use std::fmt::Display;
 
 use bevy::{
-    asset::{io::Reader, LoadContext},
+    asset::{LoadContext, io::Reader},
     prelude::*,
 };
 use bevy_embedded_assets::{EmbeddedAssetPlugin, PluginMode};

tests/embedded.rs

@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use bevy::{
-    asset::{io::Reader, LoadContext},
+    asset::{LoadContext, io::Reader},
     prelude::*,
 };
 use bevy_embedded_assets::EmbeddedAssetPlugin;