diff --git a/Cargo.toml b/Cargo.toml index de4b5a7..74d8d7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,11 +12,11 @@ repository = "https://github.com/johanhelsing/bevy_pkv" [dependencies] thiserror = "1.0" serde = "1.0" -bevy_ecs = "0.10" # we need for deriving Resource in PkvStore +bevy_ecs = { version = "0.10", optional = true } # we need for deriving Resource in PkvStore [features] default = ["bevy"] -bevy = [] +bevy = ["dep:bevy_ecs"] [target.'cfg(target_arch = "wasm32")'.dependencies] web-sys = { version = "0.3", default-features = false, features = ["Storage", "Window"] } @@ -29,12 +29,7 @@ rmp-serde = "1.1" directories = "4.0" [dev-dependencies] -bevy = { version = "0.10", default-features = false, features = [ - "bevy_render", # for Color - "bevy_winit", # without this, basic example will terminate immediately - # "wayland" # wayland is the future for linux (and has less deps => faster ci) - "x11", # ... but github actions public runners don't have libxkbcommon :( -] } +bevy = { version = "0.10", default-features = false } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] console_error_panic_hook = "0.1" diff --git a/examples/basic.rs b/examples/basic.rs index 88afaea..e6db1bb 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -1,4 +1,4 @@ -use bevy::prelude::*; +use bevy::{log::LogPlugin, prelude::*}; use bevy_pkv::PkvStore; use serde::{Deserialize, Serialize}; @@ -38,7 +38,8 @@ fn main() { App::new() .insert_resource(PkvStore::new("BevyPkv", "BasicExample")) - .add_plugins(DefaultPlugins) + .add_plugins(MinimalPlugins) + .add_plugin(LogPlugin::default()) .add_startup_system(setup) .run(); } diff --git a/examples/migration.rs b/examples/migration.rs index ede5c51..e6e0b54 100644 --- a/examples/migration.rs +++ b/examples/migration.rs @@ -4,14 +4,14 @@ //! //! And it's also a test to show that aliases do work -use bevy::prelude::*; +use bevy::{log::LogPlugin, prelude::*}; use bevy_pkv::PkvStore; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize)] struct UserV1 { nick: String, - favorite_color: Color, + favorite_color: String, } #[derive(Serialize, Deserialize)] @@ -45,7 +45,7 @@ fn setup(mut pkv: ResMut) { // Let's pretend someone has registered with the UserV1 definition let user_v1 = UserV1 { nick: "old bob".to_string(), - favorite_color: Color::BEIGE, + favorite_color: "beige".to_string(), }; pkv.set("user", &user_v1) .expect("failed to store User struct"); @@ -64,7 +64,8 @@ fn main() { App::new() .insert_resource(PkvStore::new("BevyPkv", "MigrationExample")) - .add_plugins(DefaultPlugins) + .add_plugins(MinimalPlugins) + .add_plugin(LogPlugin::default()) .add_startup_system(setup) .run(); }