Skip to content
This repository was archived by the owner on Apr 16, 2022. It is now read-only.

Commit bb9977d

Browse files
authored
Switch to single bevy dep with no default features (#33)
Impossible to use a patched bevy 0.5 version alongside a dep that depends on bevy sub crates (bevy_ecs, bevy_app, etc). Doing so gives: error[E0277]: the trait bound `NetworkingPlugin: bevy::prelude::Plugin` is not satisfied See: https://github.com/bevyengine/bevy/blob/main/docs/plugins_guidelines.md#bevy-features Guidelines from bevy now to use `bevy` without default features in this case. Discord link to start of conversation: https://discord.com/channels/691052431525675048/691052431974465548/860423772979593246
1 parent ab2fcfc commit bb9977d

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

Cargo.toml

+1-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ use-webrtc = [
2727
]
2828

2929
[dependencies]
30-
bevy_app = "0.5"
31-
bevy_core = "0.5"
32-
bevy_ecs = "0.5"
33-
bevy_tasks = "0.5"
30+
bevy = {version = "0.5", default-features = false}
3431
turbulence = "0.3"
3532
naia-client-socket = { version = "0.6", features = ["multithread"] }
3633
bytes = "1.0"

src/channels.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![allow(unused)]
22

3-
use bevy_tasks::{Task, TaskPool};
3+
use bevy::tasks::{Task, TaskPool};
44
use futures::{stream, Stream};
55
use futures_timer::Delay;
66
use std::{

src/lib.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use bevy_app::{AppBuilder, Events, Plugin, CoreStage};
2-
use bevy_ecs::prelude::*;
3-
use bevy_tasks::{IoTaskPool, TaskPool};
4-
use bevy_core::{FixedTimestep};
1+
use bevy::{
2+
app::{AppBuilder, Events, Plugin, CoreStage},
3+
ecs::prelude::*,
4+
tasks::{IoTaskPool, TaskPool, Task},
5+
core::FixedTimestep,
6+
};
57

68
#[cfg(not(target_arch = "wasm32"))]
79
use crossbeam_channel::{unbounded, Receiver, Sender, SendError as CrossbeamSendError};
@@ -120,7 +122,7 @@ pub struct NetworkResource {
120122
#[cfg(not(target_arch = "wasm32"))]
121123
#[allow(dead_code)] // FIXME: remove this struct?
122124
struct ServerListener {
123-
receiver_task: bevy_tasks::Task<()>,
125+
receiver_task: Task<()>,
124126
// needed to keep receiver_task alive
125127
sender: ServerSender,
126128
socket_address: SocketAddr,

src/transport.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[cfg(not(target_arch = "wasm32"))]
2-
use bevy_tasks::Task;
3-
use bevy_tasks::TaskPool;
2+
use bevy::tasks::Task;
3+
use bevy::tasks::TaskPool;
44
use bytes::Bytes;
55
use std::{error::Error, net::SocketAddr, sync::{Arc, RwLock}};
66
use instant::{Instant, Duration};

0 commit comments

Comments
 (0)