Migrate to bevy 0.13

Signed-off-by: Michael X. Grey <[email protected]>

Author: mxgrey

Cargo.toml

@@ -1,23 +1,23 @@
 [package]
 name = "bevy_impulse"
-version = "0.0.1"
+version = "0.1.0"
 edition = "2021"
 authors = ["Grey <[email protected]>"]
 
 [dependencies]
 bevy_impulse_derive = { path = "macros" }
-bevy_ecs = "0.12"
-bevy_utils = "0.12"
-bevy_hierarchy = "0.12"
-bevy_derive = "0.12"
-bevy_app = "0.12"
+bevy_ecs = "0.13"
+bevy_utils = "0.13"
+bevy_hierarchy = "0.13"
+bevy_derive = "0.13"
+bevy_app = "0.13"
 
 async-task = { version = "4.7.1", optional = true }
 
 # TODO(@mxgrey) We could probably remove bevy_tasks when the single_threaded_async
 # feature is active, but we'd have to refactor some internal usage of
 # bevy_tasks::Task, so we're leaving it as a mandatory dependency for now.
-bevy_tasks = { version = "0.12", features = ["multi-threaded"] }
+bevy_tasks = { version = "0.13", features = ["multi-threaded"] }
 
 arrayvec = "*"
 itertools = "*"
@@ -33,8 +33,8 @@ thiserror = "*"
 # the testing module for doctests, and doctests can only
 # make use of default features, so we're a bit stuck with
 # these for now.
-bevy_core = "0.12"
-bevy_time = "0.12"
+bevy_core = "0.13"
+bevy_time = "0.13"
 
 [features]
 single_threaded_async = ["dep:async-task"]

src/service/discovery.rs

@@ -17,7 +17,7 @@
 
 use bevy_ecs::{
     prelude::{Entity, Query, With},
-    query::{QueryEntityError, QueryIter, ReadOnlyWorldQuery},
+    query::{QueryEntityError, QueryIter, QueryFilter},
     system::SystemParam,
 };
 
@@ -36,7 +36,7 @@ where
     Request: 'static + Send + Sync,
     Response: 'static + Send + Sync,
     Streams: StreamFilter + 'static,
-    Filter: ReadOnlyWorldQuery + 'static,
+    Filter: QueryFilter + 'static,
 {
     query: Query<
         'w,
@@ -56,7 +56,7 @@ where
     Request: 'static + Send + Sync,
     Response: 'static + Send + Sync,
     Streams: StreamFilter,
-    Filter: ReadOnlyWorldQuery + 'static,
+    Filter: QueryFilter + 'static,
 {
     pub fn iter(&self) -> IterServiceDiscovery<'_, 's, Request, Response, Streams, Filter> {
         IterServiceDiscovery {
@@ -78,7 +78,7 @@ where
     Request: 'static + Send + Sync,
     Response: 'static + Send + Sync,
     Streams: StreamFilter,
-    Filter: ReadOnlyWorldQuery + 'static,
+    Filter: QueryFilter + 'static,
 {
     inner: QueryIter<
         'w,
@@ -98,7 +98,7 @@ where
     Request: 'static + Send + Sync,
     Response: 'static + Send + Sync,
     Streams: StreamFilter,
-    Filter: ReadOnlyWorldQuery + 'static,
+    Filter: QueryFilter + 'static,
 {
     type Item = Service<Request, Response, Streams::Pack>;
 

src/stream.rs

@@ -18,7 +18,7 @@
 use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{
     prelude::{Bundle, Commands, Component, Entity, With, World},
-    query::{ReadOnlyWorldQuery, WorldQuery},
+    query::{QueryFilter, WorldQuery, ReadOnlyQueryData},
     system::Command,
 };
 use bevy_hierarchy::BuildChildren;
@@ -346,15 +346,15 @@ impl StreamTargetMap {
 /// streams to be packed together as one generic argument.
 pub trait StreamPack: 'static + Send + Sync {
     type StreamAvailableBundle: Bundle + Default;
-    type StreamFilter: ReadOnlyWorldQuery;
+    type StreamFilter: QueryFilter;
     type StreamStorageBundle: Bundle + Clone;
     type StreamInputPack;
     type StreamOutputPack;
     type Receiver: Send + Sync;
     type Channel: Send;
     type Forward: Future<Output = ()> + Send;
     type Buffer: Clone;
-    type TargetIndexQuery: ReadOnlyWorldQuery;
+    type TargetIndexQuery: ReadOnlyQueryData;
 
     fn spawn_scope_streams(
         in_scope: Entity,
@@ -936,7 +936,7 @@ impl<S: Stream> Command for SendStreams<S> {
 /// }
 /// ```
 pub trait StreamFilter {
-    type Filter: ReadOnlyWorldQuery;
+    type Filter: QueryFilter;
     type Pack: StreamPack;
 }