update bevy version to 0.16.rc.2

Author: foxzool

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [Unreleased]
+
+- bump bevy version to 0.16.0
+
+## [0.7.0] - 2024-11-30
+
+- bump bevy version to 0.15.0
+
 ## [0.6.0] - 2024-07-05
 
 - bump bevy version to 0.14.0

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_http_client"
 description = "A simple HTTP client for Bevy"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 readme = "README.md"
 homepage = "https://crates.io/crates/bevy_http_client"
@@ -14,11 +14,11 @@ keywords = ["bevy", "http", "plugin", "wasm"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy_app = "0.15.0"
-bevy_derive = "0.15.0"
-bevy_hierarchy = "0.15.0"
-bevy_ecs = { version = "0.15.0", features = ["multi_threaded"] }
-bevy_tasks = "0.15.0"
+bevy_app = "0.16.0-rc.2"
+bevy_derive = "0.16.0-rc.2"
+#bevy_hierarchy = "0.16.0-rc.2"
+bevy_ecs = { version = "0.16.0-rc.2", features = ["multi_threaded"] }
+bevy_tasks = "0.16.0-rc.2"
 
 crossbeam-channel = "0.5.11"
 ehttp = { version = "0.5.0", features = ["native-async", "json"] }
@@ -29,7 +29,7 @@ serde_json = "1.0"
 doctest = false
 
 [dev-dependencies]
-bevy = { version = "0.15.0", default-features = false, features = [
+bevy = { version = "0.16.0-rc.2", default-features = false, features = [
     "animation",
     "bevy_asset",
     "bevy_gilrs",
@@ -43,6 +43,7 @@ bevy = { version = "0.15.0", default-features = false, features = [
     "bevy_text",
     "bevy_ui",
     "bevy_window",
+    "bevy_log",
     "multi_threaded",
     "png",
     "hdr",

README.md

@@ -1,5 +1,6 @@
 # bevy_http_client
 
+[![CI](https://github.com/foxzool/bevy_http_client/workflows/CI/badge.svg)](https://github.com/foxzool/bevy_http_client/actions)
 [![Crates.io](https://img.shields.io/crates/v/bevy_http_client)](https://crates.io/crates/bevy_http_client)
 [![Downloads](https://img.shields.io/crates/d/bevy_http_client)](https://crates.io/crates/bevy_http_client)
 [![Documentation](https://docs.rs/bevy_http_client/badge.svg)](https://docs.rs/bevy_http_client)
@@ -22,7 +23,7 @@ pub struct IpInfo {
 fn main() {
     let mut app = App::new();
     app.add_plugins((MinimalPlugins, HttpClientPlugin))
-        .add_systems(Update, handle_response)
+        .add_systems(Update, (handle_response, handle_error))
         .add_systems(
             Update,
             send_request.run_if(on_timer(std::time::Duration::from_secs(1))),
@@ -39,17 +40,27 @@ fn send_request(mut ev_request: EventWriter<TypedRequest<IpInfo>>) {
     );
 }
 
-fn handle_response(mut ev_response: EventReader<TypedResponse<IpInfo>>) {
-    for response in ev_response.read() {
-        println!("ip: {}", response.ip);
+/// consume TypedResponse<IpInfo> events
+fn handle_response(mut events: ResMut<Events<TypedResponse<IpInfo>>>) {
+    for response in events.drain() {
+        let response: IpInfo = response.into_inner();
+        println!("ip info: {:?}", response);
     }
 }
+
+fn handle_error(mut ev_error: EventReader<TypedResponseError<IpInfo>>) {
+    for error in ev_error.read() {
+        println!("Error retrieving IP: {}", error.err);
+    }
+}
+
 ```
 
 ## Supported Versions
 
 | bevy | bevy_http_client |
 |------|------------------|
+| 0.16 | 0.8              |
 | 0.15 | 0.7              |
 | 0.14 | 0.6              |
 | 0.13 | 0.4, 0,5         |

examples/ipinfo.rs

@@ -15,7 +15,7 @@ fn main() {
 
 fn send_request(mut ev_request: EventWriter<HttpRequest>) {
     let request = HttpClient::new().get("https://api.ipify.org").build();
-    ev_request.send(request);
+    ev_request.write(request);
 }
 
 fn handle_response(mut ev_resp: EventReader<HttpResponse>) {

examples/typed.rs

@@ -27,12 +27,6 @@ fn send_request(mut ev_request: EventWriter<TypedRequest<IpInfo>>) {
     );
 }
 
-// fn handle_response(mut ev_response: EventReader<TypedResponse<IpInfo>>) {
-//     for response in ev_response.read() {
-//         println!("ip: {}", response.ip);
-//     }
-// }
-
 /// consume TypedResponse<IpInfo> events
 fn handle_response(mut events: ResMut<Events<TypedResponse<IpInfo>>>) {
     for response in events.drain() {

examples/window.rs

@@ -86,10 +86,15 @@ fn send_request(
     mut status_query: Query<&mut Text, (With<ResponseText>, Without<ResponseIP>)>,
     mut ip_query: Query<&mut Text, (With<ResponseIP>, Without<ResponseText>)>,
 ) {
-    status_query.single_mut().0 = "Requesting ".to_string();
-    ip_query.single_mut().0 = "".to_string();
+    if let Ok(mut text) = status_query.single_mut() {
+        text.0 = "Requesting ".to_string();
+    }
+    if let Ok(mut ip) = ip_query.single_mut() {
+        ip.0 = "".to_string();
+    }
+
     let request = HttpClient::new().get("https://api.ipify.org").build();
-    ev_request.send(request);
+    ev_request.write(request);
 }
 
 fn handle_response(
@@ -98,9 +103,12 @@ fn handle_response(
     mut ip_query: Query<&mut Text, (With<ResponseIP>, Without<ResponseText>)>,
 ) {
     for response in ev_resp.read() {
-        let ip = response.text().unwrap_or_default();
-        ip_query.single_mut().0 = ip.to_string();
-        status_query.single_mut().0 = "Got ".to_string();
+        if let Ok(mut text) = status_query.single_mut() {
+            text.0 = "Got ".to_string();
+        }
+        if let Ok(mut ip) = ip_query.single_mut() {
+            ip.0 = response.text().unwrap_or_default().to_string();
+        }
     }
 }
 fn handle_error(mut ev_error: EventReader<HttpResponseError>) {

src/lib.rs

@@ -3,7 +3,6 @@
 use bevy_app::{App, Plugin, Update};
 use bevy_derive::Deref;
 use bevy_ecs::{prelude::*, world::CommandQueue};
-use bevy_hierarchy::DespawnRecursiveExt;
 use bevy_tasks::IoTaskPool;
 use crossbeam_channel::Receiver;
 use ehttp::{Headers, Request, Response};
@@ -532,7 +531,7 @@ fn handle_request(
                         if has_from_entity {
                             world.entity_mut(entity).remove::<RequestTask>();
                         } else {
-                            world.entity_mut(entity).despawn_recursive();
+                            world.entity_mut(entity).despawn();
                         }
                     });
 

src/typed.rs

@@ -1,7 +1,6 @@
 use bevy_app::{App, PreUpdate};
 use bevy_derive::Deref;
 use bevy_ecs::{prelude::*, system::Commands, world::CommandQueue};
-use bevy_hierarchy::DespawnRecursiveExt;
 use bevy_tasks::IoTaskPool;
 use ehttp::{Request, Response};
 use serde::Deserialize;
@@ -207,7 +206,7 @@ fn handle_typed_request<T: for<'a> Deserialize<'a> + Send + Sync + 'static>(
                         if has_from_entity {
                             world.entity_mut(entity).remove::<RequestTask>();
                         } else {
-                            world.entity_mut(entity).despawn_recursive();
+                            world.entity_mut(entity).despawn();
                         }
                     });