Skip to content

Commit a3ed353

Browse files
nelson137nelson137
authored
feat: upgrade packages (#355)
## Changes - Update `deny.toml` -- remove deprecated keys & opt-in to new behavior (see [relevant cargo-deny change](EmbarkStudios/cargo-deny#611)) - Add `MPL-2.0` to allowed licenses - Upgrade packages: - `async-channel`: 1.7, 1.8, 1.9 to 2.2 - `async-io`: 1.9 to 2.3 - `bevy`: 0.11 to 0.12 - `bevy_egui`: 0.22 to 0.24 - `bevy_prototype_lyon`: 0.9 to 0.10 - `egui`, `egui_plot`: 0.23 to 0.24 - `event-listener`: 3.1 to 4.0 - `futures-lite`: 1.12, 1.13 to 2.3 - `ggrs`: 0.9.4 to 0.10.1 - `mdns-sd`: 0.7 to 0.10 - `mio`: 0.8.10 to 0.8.11 - `noise`: 0.8 to 0.9 - `rcgen`: 0.10, 0.11 to 0.12 - `shlex`: 1.2 to 1.3 I avoided making the same upgrade as #334 but these PRs cause a merge conflict in `Cargo.lock`. Whichever is merged second should delete the lock file and rebuild.
1 parent 5596867 commit a3ed353

File tree

21 files changed

+558
-456
lines changed

21 files changed

+558
-456
lines changed

‎Cargo.lock‎

Lines changed: 426 additions & 327 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deny.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
# More documentation for the licenses section can be found here:
33
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
44
[licenses]
5-
unlicensed = "deny"
5+
version = 2
66
allow = [
7-
"MIT",
8-
"Apache-2.0",
9-
"Unlicense",
10-
"Zlib",
117
"Apache-2.0 WITH LLVM-exception",
12-
"Unicode-DFS-2016",
13-
"Unicode-3.0",
8+
"Apache-2.0",
9+
"BSD-2-Clause",
10+
"BSD-2-Clause-Patent",
1411
"BSD-3-Clause",
1512
"BSL-1.0",
16-
"MIT-0",
17-
"OFL-1.1",
18-
"LicenseRef-UFL-1.0",
1913
"CC0-1.0",
2014
"ISC",
21-
"BSD-2-Clause",
22-
"BSD-2-Clause-Patent",
15+
"LicenseRef-UFL-1.0",
16+
"MIT",
17+
"MIT-0",
18+
"MPL-2.0",
19+
"OFL-1.1",
2320
"OpenSSL",
21+
"Unicode-3.0",
22+
"Unicode-DFS-2016",
23+
"Unlicense",
24+
"Zlib",
2425
]
25-
default = "deny"
2626

2727
[sources.allow-org]
2828
github = ["fishfolk"]

‎framework_crates/bones_asset/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ bs58 = "0.5"
2323
anyhow = "1.0"
2424
serde_yaml = "0.9"
2525
serde_json = "1.0"
26-
erased-serde = "0.3"
26+
erased-serde = "0.4"
2727
paste = "1.0"
2828
ulid = { version = "1.0" }
2929
semver = { version = "1.0", features = ["serde"] }
30-
async-channel = "1.8"
30+
async-channel = "1.9"
3131
once_cell = "1.18"
3232
path-absolutize = { version = "3.1", features = ["use_unix_paths_on_wasm"] }
3333
ehttp = "0.3"
3434
tracing = "0.1"
35-
bevy_tasks = "0.11"
35+
bevy_tasks = "0.12"
3636
dashmap = "5.5"
37-
event-listener = "3.0"
37+
event-listener = "4.0"
3838
elsa = "1.9"
3939
append-only-vec = "0.1.3"
4040

@@ -47,4 +47,4 @@ web-sys = { version = "0.3", features = ["console"] }
4747
[dev-dependencies]
4848
bones_schema = { version = "0.3", path = "../bones_schema", features = ["glam"] }
4949
glam = "0.24"
50-
bevy_tasks = "0.11"
50+
bevy_tasks = "0.12"

‎framework_crates/bones_asset/examples/tutorial.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ fn main() -> anyhow::Result<()> {
149149

150150
// Load assets
151151
let s = asset_server.clone();
152-
IoTaskPool::init(TaskPool::default);
152+
IoTaskPool::get_or_init(TaskPool::default);
153153
println!("Loading Assets...");
154154

155155
// Spawn a task to load the assets

‎framework_crates/bones_bevy_renderer/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ webgl2 = ["bevy/webgl2"]
1717
[dependencies]
1818
bones_framework = { version = "0.3", path = "../bones_framework" }
1919

20-
bevy_egui = "0.22"
20+
bevy_egui = "0.24"
2121
glam = { version = "0.24", features = ["serde"] }
22-
bevy_prototype_lyon = "0.9"
22+
bevy_prototype_lyon = "0.10"
2323
serde_yaml = "0.9"
2424
serde = "1.0.188"
2525
anyhow = "1.0"
2626

2727
[dependencies.bevy]
2828
default-features = false
2929
features = ["bevy_render", "bevy_core_pipeline", "bevy_sprite", "x11", "bevy_gilrs"]
30-
version = "0.11"
30+
version = "0.12"
3131

3232
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
3333
directories = "5.0"

‎framework_crates/bones_bevy_renderer/src/lib.rs‎

Lines changed: 57 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ fn setup_egui(world: &mut World) {
661661
// Insert the bones egui textures
662662
ctx.data_mut(|map| {
663663
map.insert_temp(
664-
bevy_egui::egui::Id::null(),
664+
bevy_egui::egui::Id::NULL,
665665
bones_data.bones_egui_textures.clone(),
666666
);
667667
});
@@ -695,19 +695,19 @@ fn get_bones_input(
695695
(
696696
bones::MouseInputs {
697697
movement: mouse_motion_events
698-
.iter()
698+
.read()
699699
.last()
700700
.map(|x| x.delta)
701701
.unwrap_or_default(),
702702
wheel_events: mouse_wheel_events
703-
.iter()
703+
.read()
704704
.map(|event| bones::MouseScrollEvent {
705705
unit: event.unit.into_bones(),
706706
movement: Vec2::new(event.x, event.y),
707707
})
708708
.collect(),
709709
button_events: mouse_button_input_events
710-
.iter()
710+
.read()
711711
.map(|event| bones::MouseButtonEvent {
712712
button: event.button.into_bones(),
713713
state: event.state.into_bones(),
@@ -716,7 +716,7 @@ fn get_bones_input(
716716
},
717717
bones::KeyboardInputs {
718718
key_events: keyboard_events
719-
.iter()
719+
.read()
720720
.map(|event| bones::KeyboardEvent {
721721
scan_code: event.scan_code,
722722
key_code: event.key_code.map(|x| x.into_bones()).into(),
@@ -726,7 +726,7 @@ fn get_bones_input(
726726
},
727727
bones::GamepadInputs {
728728
gamepad_events: gamepad_events
729-
.iter()
729+
.read()
730730
.map(|event| match event {
731731
GamepadEvent::Connection(c) => {
732732
bones::GamepadEvent::Connection(bones::GamepadConnectionEvent {
@@ -805,7 +805,7 @@ fn step_bones_game(world: &mut World) {
805805

806806
let BonesData { game, .. } = &mut data;
807807

808-
let bevy_time = world.resource::<Time>();
808+
let bevy_time = world.resource::<Time<Real>>();
809809

810810
// Reload assets if necessary
811811
if let Some(mut asset_server) = game.shared_resource_mut::<bones::AssetServer>() {
@@ -1023,23 +1023,26 @@ fn extract_bones_sprites(
10231023
please open an issue."
10241024
);
10251025
};
1026-
extracted_sprites.sprites.push(ExtractedSprite {
1027-
entity: bones_renderable_entity.0,
1028-
transform: {
1029-
let mut t: Transform = transform.into_bevy();
1030-
// Add tiny z offset to enforce a consistent z-sort
1031-
t.translation.z += z_offset;
1032-
z_offset += 0.00001;
1033-
t.into()
1026+
extracted_sprites.sprites.insert(
1027+
bones_renderable_entity.0,
1028+
ExtractedSprite {
1029+
original_entity: Some(bones_renderable_entity.0),
1030+
transform: {
1031+
let mut t: Transform = transform.into_bevy();
1032+
// Add tiny z offset to enforce a consistent z-sort
1033+
t.translation.z += z_offset;
1034+
z_offset += 0.00001;
1035+
t.into()
1036+
},
1037+
color: sprite.color.into_bevy(),
1038+
rect: None,
1039+
custom_size: None,
1040+
image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
1041+
flip_x: sprite.flip_x,
1042+
flip_y: sprite.flip_y,
1043+
anchor: Anchor::Center.as_vec(),
10341044
},
1035-
color: sprite.color.into_bevy(),
1036-
rect: None,
1037-
custom_size: None,
1038-
image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
1039-
flip_x: sprite.flip_x,
1040-
flip_y: sprite.flip_y,
1041-
anchor: Anchor::Center.as_vec(),
1042-
})
1045+
);
10431046
}
10441047

10451048
// Extract atlas sprites
@@ -1065,17 +1068,20 @@ fn extract_bones_sprites(
10651068
min,
10661069
max: min + atlas.tile_size,
10671070
};
1068-
extracted_sprites.sprites.push(ExtractedSprite {
1069-
entity: bones_renderable_entity.0,
1070-
transform: transform.into_bevy().into(),
1071-
color: atlas_sprite.color.into_bevy(),
1072-
rect: Some(rect),
1073-
custom_size: None,
1074-
image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
1075-
flip_x: atlas_sprite.flip_x,
1076-
flip_y: atlas_sprite.flip_y,
1077-
anchor: Anchor::Center.as_vec(),
1078-
})
1071+
extracted_sprites.sprites.insert(
1072+
bones_renderable_entity.0,
1073+
ExtractedSprite {
1074+
original_entity: Some(bones_renderable_entity.0),
1075+
transform: transform.into_bevy().into(),
1076+
color: atlas_sprite.color.into_bevy(),
1077+
rect: Some(rect),
1078+
custom_size: None,
1079+
image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
1080+
flip_x: atlas_sprite.flip_x,
1081+
flip_y: atlas_sprite.flip_y,
1082+
anchor: Anchor::Center.as_vec(),
1083+
},
1084+
);
10791085
}
10801086
}
10811087
}
@@ -1167,17 +1173,20 @@ fn extract_bones_tilemaps(
11671173
// create a proper tile renderer. That can render multiple tiles on one quad instead
11681174
// of using a separate quad for each tile.
11691175
transform.scale += Vec3::new(0.01, 0.01, 0.0);
1170-
extracted_sprites.sprites.push(ExtractedSprite {
1171-
entity: bones_renderable_entity.0,
1172-
transform: transform.into(),
1173-
color: Color::WHITE,
1174-
rect: Some(rect),
1175-
custom_size: None,
1176-
image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
1177-
flip_x: tile.flip_x,
1178-
flip_y: tile.flip_y,
1179-
anchor: Anchor::BottomLeft.as_vec(),
1180-
})
1176+
extracted_sprites.sprites.insert(
1177+
bones_renderable_entity.0,
1178+
ExtractedSprite {
1179+
original_entity: Some(bones_renderable_entity.0),
1180+
transform: transform.into(),
1181+
color: Color::WHITE,
1182+
rect: Some(rect),
1183+
custom_size: None,
1184+
image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
1185+
flip_x: tile.flip_x,
1186+
flip_y: tile.flip_y,
1187+
anchor: Anchor::BottomLeft.as_vec(),
1188+
},
1189+
);
11811190
}
11821191
}
11831192
}
@@ -1213,7 +1222,7 @@ fn sync_bones_path2ds(
12131222
new_components = Some((
12141223
bundle.path,
12151224
lyon::Stroke::new(Color::default(), 1.0),
1216-
bundle.transform,
1225+
Transform::default(),
12171226
));
12181227
let (path, stroke, transform) = new_components.as_mut().unwrap();
12191228
(path, stroke, transform)
@@ -1244,11 +1253,8 @@ fn sync_bones_path2ds(
12441253
// Spawn the shape if it doesn't already exist
12451254
if let Some((path, stroke, transform)) = new_components {
12461255
commands
1247-
.spawn(lyon::ShapeBundle {
1248-
path,
1249-
transform,
1250-
..default()
1251-
})
1256+
.spawn(lyon::ShapeBundle { path, ..default() })
1257+
.insert(transform)
12521258
.insert(stroke)
12531259
.insert(BevyBonesEntity);
12541260
}

‎framework_crates/bones_framework/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ bones_scripting = { version = "0.3", path = "../bones_scripting", optional = tru
7474

7575
# Other
7676
anyhow = "1.0"
77-
async-channel = "1.7"
78-
bevy_tasks = { version = "0.11" }
77+
async-channel = "1.9"
78+
bevy_tasks = { version = "0.12" }
7979
bytemuck = "1.12"
8080
either = "1.8"
81-
futures-lite = "1.12"
81+
futures-lite = "2.3"
8282
glam = "0.24"
8383
hex = "0.4"
8484
instant = { version = "0.1", features = ["wasm-bindgen"] }
85-
noise = "0.8"
85+
noise = "0.9"
8686
once_cell = "1.17"
8787
thiserror = "1.0"
8888
tracing = "0.1"
@@ -98,8 +98,8 @@ serde = { version = "1.0", features = ["derive"] }
9898
image = { version = "0.24", default-features = false }
9999

100100
# Gui
101-
egui = { version = "0.23", optional = true }
102-
egui_plot = "0.23"
101+
egui = { version = "0.24", optional = true }
102+
egui_plot = "0.24"
103103
ttf-parser = { version = "0.20", default-features = false, optional = true }
104104

105105
# Audio
@@ -117,14 +117,14 @@ document-features = { version = "0.2", optional = true }
117117

118118
# Networking
119119
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
120-
ggrs = { version = "0.9", features = ["sync-send"] }
120+
ggrs = { version = "0.10", features = ["sync-send"] }
121121
bones_matchmaker_proto = { version = "0.2", path = "../../other_crates/bones_matchmaker_proto" }
122122
bytes = "1.4"
123-
mdns-sd = { version = "0.7", default-features = false }
123+
mdns-sd = { version = "0.10", default-features = false }
124124
numquant = "0.2"
125125
ping-rs = "0.1"
126126
postcard = { version = "1.0", features = ["alloc"] }
127-
rcgen = "0.10"
127+
rcgen = "0.12"
128128
rustls = { version = "0.21", features = ["dangerous_configuration", "quic"] }
129129
smallvec = "1.10"
130130
quinn = { version = "0.10", default-features = false, features = ["native-certs", "tls-rustls"] }

0 commit comments

Comments
 (0)