Bump Bevy to 0.15.0-rc.3.

Author: andriyDev

Cargo.toml

@@ -11,7 +11,7 @@ version = "0.8.0"
 rust-version = "1.76.0"
 
 [workspace.dependencies]
-bevy = { version = "0.14", default-features = false }
+bevy = { version = "0.15.0-rc.3", default-features = false }
 serde = "1"
 serde_derive = "1"
 rand_core = { version = "0.6", features = ["std"] }

bevy_prng/src/newtype.rs

@@ -8,11 +8,11 @@ macro_rules! newtype_prng {
         )]
         #[cfg_attr(
             all(feature = "serialize"),
-            reflect_value(Debug, PartialEq, FromReflect, Serialize, Deserialize)
+            reflect(opaque, Debug, PartialEq, FromReflect, Serialize, Deserialize)
         )]
         #[cfg_attr(
             all(not(feature = "serialize")),
-            reflect_value(Debug, PartialEq, FromReflect)
+            reflect(opaque, Debug, PartialEq, FromReflect)
         )]
         #[cfg_attr(docsrs, doc(cfg(feature = $feature)))]
         #[type_path = "bevy_prng"]

src/component.rs

@@ -295,7 +295,7 @@ mod tests {
     fn rng_untyped_serialization() {
         use bevy::reflect::{
             serde::{ReflectDeserializer, ReflectSerializer},
-            TypeRegistry,
+            FromReflect, TypeRegistry,
         };
         use ron::to_string;
         use serde::de::DeserializeSeed;
@@ -323,7 +323,7 @@ mod tests {
 
         let value = de.deserialize(&mut deserializer).unwrap();
 
-        let mut dynamic = value.take::<EntropyComponent<ChaCha8Rng>>().unwrap();
+        let mut dynamic = EntropyComponent::<ChaCha8Rng>::take_from_reflect(value).unwrap();
 
         // The two instances should be the same
         assert_eq!(
@@ -343,7 +343,7 @@ mod tests {
     fn rng_typed_serialization() {
         use bevy::reflect::{
             serde::{TypedReflectDeserializer, TypedReflectSerializer},
-            GetTypeRegistration, TypeRegistry,
+            FromReflect, GetTypeRegistration, TypeRegistry,
         };
         use ron::ser::to_string;
         use serde::de::DeserializeSeed;
@@ -373,7 +373,7 @@ mod tests {
 
         let value = de.deserialize(&mut deserializer).unwrap();
 
-        let mut dynamic = value.take::<EntropyComponent<ChaCha8Rng>>().unwrap();
+        let mut dynamic = EntropyComponent::<ChaCha8Rng>::take_from_reflect(value).unwrap();
 
         // The two instances should be the same
         assert_eq!(

src/plugin.rs

@@ -1,5 +1,8 @@
 use crate::{component::EntropyComponent, resource::GlobalEntropy, seed::RngSeed};
-use bevy::prelude::{App, Plugin};
+use bevy::{
+    prelude::{App, Plugin},
+    reflect::Typed,
+};
 use bevy_prng::{EntropySeed, SeedableEntropySource};
 use rand_core::SeedableRng;
 
@@ -60,9 +63,9 @@ where
     }
 }
 
-impl<R: SeedableEntropySource + 'static> Plugin for EntropyPlugin<R>
+impl<R: SeedableEntropySource + Typed + 'static> Plugin for EntropyPlugin<R>
 where
-    R::Seed: EntropySeed,
+    R::Seed: EntropySeed + Typed,
 {
     fn build(&self, app: &mut App) {
         app.register_type::<GlobalEntropy<R>>()

src/resource.rs

@@ -8,7 +8,10 @@ use crate::{
         ForkableRng, ForkableSeed,
     },
 };
-use bevy::prelude::{Reflect, ReflectFromReflect, ReflectFromWorld, ReflectResource, Resource};
+use bevy::{
+    prelude::{Reflect, ReflectFromReflect, ReflectFromWorld, ReflectResource, Resource},
+    reflect::Typed,
+};
 use bevy_prng::SeedableEntropySource;
 use rand_core::{RngCore, SeedableRng};
 
@@ -62,8 +65,8 @@ use serde::{Deserialize, Serialize};
     feature = "serialize",
     serde(bound(deserialize = "R: for<'a> Deserialize<'a>, R::Seed: for<'a> Deserialize<'a>"))
 )]
-#[cfg_attr(feature = "serialize", reflect(where R::Seed: PartialEq + Debug + Sync + Send + Clone + Serialize + for<'a> Deserialize<'a>))]
-#[cfg_attr(not(feature = "serialize"), reflect(where R::Seed: PartialEq + Debug + Sync + Send + Clone))]
+#[cfg_attr(feature = "serialize", reflect(where R::Seed: PartialEq + Debug + Sync + Send + Clone + Serialize + Typed + for<'a> Deserialize<'a>))]
+#[cfg_attr(not(feature = "serialize"), reflect(where R::Seed: PartialEq + Debug + Sync + Send + Clone + Typed))]
 pub struct GlobalEntropy<R: SeedableEntropySource + 'static> {
     seed: R::Seed,
     rng: R,
@@ -273,7 +276,7 @@ mod tests {
     fn rng_untyped_serialization() {
         use bevy::reflect::{
             serde::{ReflectDeserializer, ReflectSerializer},
-            TypeRegistry,
+            FromReflect, TypeRegistry,
         };
         use ron::ser::to_string;
         use serde::de::DeserializeSeed;
@@ -301,7 +304,7 @@ mod tests {
 
         let value = de.deserialize(&mut deserializer).unwrap();
 
-        let mut dynamic = value.take::<GlobalEntropy<ChaCha8Rng>>().unwrap();
+        let mut dynamic = GlobalEntropy::<ChaCha8Rng>::take_from_reflect(value).unwrap();
 
         // The two instances should be the same
         assert_eq!(
@@ -321,7 +324,7 @@ mod tests {
     fn rng_typed_serialization() {
         use bevy::reflect::{
             serde::{TypedReflectDeserializer, TypedReflectSerializer},
-            GetTypeRegistration, TypeRegistry,
+            FromReflect, GetTypeRegistration, TypeRegistry,
         };
         use ron::to_string;
         use serde::de::DeserializeSeed;
@@ -351,7 +354,7 @@ mod tests {
 
         let value = de.deserialize(&mut deserializer).unwrap();
 
-        let mut dynamic = value.take::<GlobalEntropy<ChaCha8Rng>>().unwrap();
+        let mut dynamic = GlobalEntropy::<ChaCha8Rng>::take_from_reflect(value).unwrap();
 
         // The two instances should be the same
         assert_eq!(

src/seed.rs

@@ -103,9 +103,9 @@ mod tests {
 
         assert!(value.is_dynamic());
         assert!(value.represents::<RngSeed<WyRand>>());
-        assert!(!value.is::<RngSeed<WyRand>>());
+        assert!(!value.try_downcast_ref::<RngSeed<WyRand>>().is_some());
 
-        let recreated = RngSeed::<WyRand>::from_reflect(value.as_reflect()).unwrap();
+        let recreated = RngSeed::<WyRand>::from_reflect(value.as_ref()).unwrap();
 
         assert_eq!(val.clone_seed(), recreated.clone_seed());
     }

tests/integration/reseeding.rs

@@ -199,7 +199,7 @@ fn observer_global_reseeding() {
                 .zip(seeds.map(u64::from_ne_bytes))
                 .for_each(|(expected, actual)| assert_ne!(expected, actual));
         })
-        .observe(reseed);
+        .add_observer(reseed);
 
     app.run();
 }
@@ -278,7 +278,7 @@ fn observer_children_reseeding() {
 
                 let mut source = commands.spawn(seed);
 
-                source.add(|mut entity: EntityWorldMut| {
+                source.queue(|mut entity: EntityWorldMut| {
                     // FORK! Quicker than allocating a new Vec of components to spawn.
                     let mut rng = entity
                         .get_mut::<EntropyComponent<WyRand>>()
@@ -361,8 +361,8 @@ fn observer_children_reseeding() {
                 assert_eq!(children.iter().size_hint().0, 5);
             },
         )
-        .observe(reseed)
-        .observe(reseed_children);
+        .add_observer(reseed)
+        .add_observer(reseed_children);
 
     app.run();
 }