Skip to content

Commit 71cb076

Browse files
redjack96redjack96
committed
Reorganized crates to have all versions in one place (the root workspace Cargo.toml).
Added default feature for demo_bevy
1 parent dec83df commit 71cb076

File tree

11 files changed

+67
-52
lines changed

11 files changed

+67
-52
lines changed

‎Cargo.toml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,21 @@ members = [
1010
"renet_netcode",
1111
]
1212
resolver = "2"
13+
14+
[workspace.dependencies]
15+
bevy = { version = "^0.17" , default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11", "tonemapping_luts", "ktx2", "bevy_window", "zstd_rust"] }
16+
bevy_app = "^0.17"
17+
bevy_ecs = "^0.17"
18+
bevy_time = "^0.17"
19+
bevy_egui = "^0.38"
20+
eframe = "^0.33"
21+
egui = "^0.33"
22+
serde = "^1"
23+
bincode = "^1.3"
24+
fastrand = "^2.3"
25+
steamworks = "^0.12"
26+
env_logger = "^0.11"
27+
log = "^0.4"
28+
bytes = "^1"
29+
octets = "^0.3"
30+
chacha20poly1305 = "^0.10"

‎bevy_renet/Cargo.toml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ name = "simple"
2020
required-features = ["netcode"]
2121

2222
[dependencies]
23-
bevy_app = "0.17"
24-
bevy_ecs = "0.17"
25-
bevy_time = "0.17"
26-
renet = { path="../renet", version = "1.2.0", features = ["bevy"] }
27-
renet_netcode = { path="../renet_netcode", version = "1.2.0", features = ["bevy"], optional = true }
28-
renet_steam = { path="../renet_steam", version = "2.1.0", features = ["bevy"], optional = true }
23+
bevy_app.workspace = true
24+
bevy_ecs.workspace = true
25+
bevy_time.workspace = true
26+
renet = { path="../renet", features = ["bevy"] }
27+
renet_netcode = { path="../renet_netcode", features = ["bevy"], optional = true }
28+
renet_steam = { path="../renet_steam", features = ["bevy"], optional = true }
2929

3030
[dev-dependencies]
31-
bevy = {version = "0.17", default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11", "tonemapping_luts", "ktx2", "zstd_rust", "bevy_window"]}
32-
bincode = "1.3"
33-
env_logger = "0.11"
34-
serde = {version = "1.0", features = ["derive"]}
31+
bevy = {workspace = true, default-features = false, features = ["bevy_core_pipeline", "bevy_render", "bevy_asset", "bevy_pbr", "x11", "tonemapping_luts", "ktx2", "bevy_window", "zstd_rust"]}
32+
bincode.workspace = true
33+
serde = {workspace = true, features = ["derive"]}

‎demo_bevy/Cargo.toml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ name = "server"
1111
path = "src/bin/server.rs"
1212

1313
[features]
14+
default = ["netcode"]
1415
netcode = ["bevy_renet/netcode"]
1516
steam = ["bevy_renet/steam", "steamworks"]
1617

1718
[dependencies]
18-
bevy = { version = "0.17", default-features = false, features = [
19+
bevy = { workspace = true, default-features = false, features = [
1920
"bevy_core_pipeline",
2021
"bevy_render",
2122
"bevy_asset",
@@ -29,9 +30,9 @@ bevy = { version = "0.17", default-features = false, features = [
2930
]}
3031

3132
bevy_renet = { path = "../bevy_renet", default-features = false }
32-
serde = { version = "1.0", features = ["derive"] }
33-
bincode = "1.3"
34-
bevy_egui = "0.37"
3533
renet_visualizer = { path = "../renet_visualizer", features = ["bevy"] }
36-
fastrand = "2.0"
37-
steamworks = { version = "0.12.2", optional = true }
34+
serde = { workspace = true, features = ["derive"] }
35+
bevy_egui.workspace = true
36+
bincode.workspace = true
37+
fastrand.workspace = true
38+
steamworks = { workspace = true, optional = true }

‎demo_bevy/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Simple bevy application to demonstrates how you could replicate entities and sen
66

77
## How to run
88

9-
Running using the netcode transport:
9+
Running using the netcode transport (default):
1010

11-
- server: `cargo run --bin server --features netcode`
12-
- client: `cargo run --bin client --features netcode`
11+
- server: `cargo run --bin server`
12+
- client: `cargo run --bin client`
1313

1414
Running using the steam transport:
1515

‎demo_bevy/src/bin/client.rs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,8 @@ use bevy::{
77
prelude::*,
88
};
99
use bevy_egui::{EguiContexts, EguiPlugin, EguiPrimaryContextPass};
10-
use bevy_renet::{
11-
client_connected,
12-
renet::{ClientId, RenetClient},
13-
RenetClientPlugin,
14-
};
15-
use demo_bevy::{
16-
connection_config, setup_level, ClientChannel, NetworkedEntities, PlayerCommand, PlayerInput, ServerChannel, ServerMessages,
17-
};
10+
use bevy_renet::{renet::{ClientId, RenetClient}, RenetClientPlugin};
11+
use demo_bevy::{setup_level, ClientChannel, NetworkedEntities, PlayerCommand, PlayerInput, ServerChannel, ServerMessages};
1812
use renet_visualizer::{RenetClientVisualizer, RenetVisualizerStyle};
1913

2014
#[derive(Component)]
@@ -43,7 +37,8 @@ struct Connected;
4337
#[cfg(feature = "netcode")]
4438
fn add_netcode_network(app: &mut App) {
4539
use bevy_renet::netcode::{ClientAuthentication, NetcodeClientPlugin, NetcodeClientTransport, NetcodeTransportError};
46-
use demo_bevy::PROTOCOL_ID;
40+
use bevy_renet::client_connected;
41+
use demo_bevy::{connection_config, PROTOCOL_ID};
4742
use std::{net::UdpSocket, time::SystemTime};
4843

4944
app.add_plugins(NetcodeClientPlugin);
@@ -83,6 +78,8 @@ fn add_netcode_network(app: &mut App) {
8378
#[cfg(feature = "steam")]
8479
fn add_steam_network(app: &mut App) {
8580
use bevy_renet::steam::{SteamClientPlugin, SteamClientTransport, SteamTransportError};
81+
use bevy_renet::client_connected;
82+
use demo_bevy::connection_config;
8683
use steamworks::SteamId;
8784

8885
let steam_client = steamworks::Client::init_app(480).unwrap();

‎demo_chat/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ edition = "2021"
1111
renet = { path = "../renet" }
1212
renet_netcode = { path = "../renet_netcode" }
1313
renet_visualizer = { path = "../renet_visualizer" }
14-
eframe = "0.32"
15-
serde = { version = "1.0", features = ["derive"] }
16-
bincode = "1.3"
17-
log = "0.4.22"
18-
env_logger = "0.11"
14+
eframe.workspace = true
15+
serde = { workspace = true, features = ["derive"] }
16+
bincode.workspace = true
17+
log.workspace = true
18+
env_logger.workspace = true

‎renet/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ version = "1.2.0"
1313
bevy = ["dep:bevy_ecs"]
1414

1515
[dependencies]
16-
bevy_ecs = { version = "0.17", optional = true }
17-
bytes = "1.1"
18-
log = "0.4.22"
19-
octets = "0.3"
16+
bevy_ecs = { workspace = true, optional = true }
17+
bytes.workspace = true
18+
log.workspace = true
19+
octets.workspace = true
2020

2121
[dev-dependencies]
22-
env_logger = "0.11"
22+
env_logger.workspace = true
2323
renet_netcode = { path = "../renet_netcode" }

‎renet_netcode/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
1111
bevy = ["dep:bevy_ecs"]
1212

1313
[dependencies]
14-
renet = { version = "1.2.0", path = "../renet" }
15-
renetcode = { path = "../renetcode", version = "1.0.0" }
16-
bevy_ecs = { version = "0.17", optional = true }
17-
log = "0.4.22"
14+
renet = { path = "../renet" }
15+
renetcode = { path = "../renetcode" }
16+
bevy_ecs = { workspace = true, optional = true }
17+
log.workspace = true

‎renet_steam/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ edition = "2021"
1414
bevy = ["dep:bevy_ecs"]
1515

1616
[dependencies]
17-
renet = { version = "1.2.0", path = "../renet" }
18-
steamworks = "0.12.2"
19-
log = "0.4.22"
20-
bevy_ecs = { version = "0.17", optional = true }
17+
renet = { path = "../renet" }
18+
steamworks.workspace = true
19+
log.workspace = true
20+
bevy_ecs = { workspace = true, optional = true }
2121

2222
[dev-dependencies]
23-
env_logger = "0.11"
23+
env_logger.workspace = true

‎renet_visualizer/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ edition = "2021"
1313
bevy = ["dep:bevy_ecs"]
1414

1515
[dependencies]
16-
renet = { path = "../renet", version = "1.2.0" }
17-
egui = "0.32"
18-
bevy_ecs = { version = "0.17", optional = true }
16+
renet = { path = "../renet" }
17+
egui.workspace = true
18+
bevy_ecs = { workspace = true, optional = true }

0 commit comments

Comments
 (0)