Bevy 0.17 (#10)

Author: mockersf

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - name: Install Dependencies
         if: runner.os == 'linux'
-        run: sudo apt-get update; sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libusb-1.0-0-dev libhidapi-dev
+        run: sudo apt-get update; sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libusb-1.0-0-dev libhidapi-dev libwayland-dev libxkbcommon-dev
       - name: Run cargo test
         run: cargo test
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_streamdeck"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2024"
 authors = ["François Mockers <[email protected]>"]
 description = "Elgato Stream Deck plugin for Bevy"
@@ -28,15 +28,15 @@ assets = ["dep:bevy_asset"]
 # features = ["multi_threaded"]
 
 [dependencies]
-bevy_ecs = { version = "0.16.0", default-features = false }
-bevy_app = { version = "0.16.0", default-features = false }
-bevy_input = { version = "0.16.0", default-features = false }
-bevy_tasks = { version = "0.16.0", default-features = false }
-bevy_color = { version = "0.16.0", default-features = false }
-bevy_math = { version = "0.16.0" }
-bevy_render = { version = "0.16.0", default-features = false, optional = true }
-bevy_asset = { version = "0.16.0", default-features = false, optional = true }
-bevy_image = { version = "0.16.0", default-features = false, optional = true }
+bevy_ecs = { version = "0.17", default-features = false }
+bevy_app = { version = "0.17", default-features = false }
+bevy_input = { version = "0.17", default-features = false }
+bevy_tasks = { version = "0.17", default-features = false }
+bevy_color = { version = "0.17", default-features = false }
+bevy_math = { version = "0.17" }
+bevy_render = { version = "0.17", default-features = false, optional = true }
+bevy_asset = { version = "0.17", default-features = false, optional = true }
+bevy_image = { version = "0.17", default-features = false, optional = true }
 streamdeck = { version = "0.9", default-features = false }
 crossbeam-channel = "0.5"
 image = { version = "0.25", optional = true }
@@ -45,7 +45,7 @@ glam = { version = "0.29" }
 
 [dev-dependencies]
 rand = "0.8"
-bevy = { version = "0.16.0" }
+bevy = { version = "0.17" }
 
 [[example]]
 name = "image"

README.md

@@ -21,6 +21,7 @@ app.add_plugin(StreamDeckPlugin);
 ### Handling Input Events
 
 Receive events from button presses (see [inputs example](https://github.com/vleue/bevy_streamdeck/blob/main/examples/inputs.rs)):
+
 ```rust
 fn print_streamdeck_events(mut streamdeck_input_events: EventReader<StreamDeckInput>) {
     for event in streamdeck_input_events.iter() {
@@ -32,6 +33,7 @@ fn print_streamdeck_events(mut streamdeck_input_events: EventReader<StreamDeckIn
 ### Setting Button Colors
 
 Set a button color (see [colors example](https://github.com/vleue/bevy_streamdeck/blob/main/examples/colors.rs)):
+
 ```rust
 fn set_color(streamdeck: Res<StreamDeck>) {
     streamdeck.set_key_color(1, Color::BLUE);
@@ -42,6 +44,7 @@ fn set_color(streamdeck: Res<StreamDeck>) {
 ### Displaying Images
 
 Display an image on a button (see [image example](https://github.com/vleue/bevy_streamdeck/blob/main/examples/image.rs)):
+
 ```rust
 fn set_image(streamdeck: Res<StreamDeck>, logo: Res<Logo>, images: Res<Assets<Image>>) {
     let handle: Handle<Image> = ...;
@@ -51,7 +54,6 @@ fn set_image(streamdeck: Res<StreamDeck>, logo: Res<Logo>, images: Res<Assets<Im
 }
 ```
 
-
 ## Platform-Specific Setup
 
 ### Linux
@@ -62,11 +64,12 @@ For Linux setup, please refer to the [rust-streamdeck getting started guide](htt
 
 ### Bevy Compatibility
 
-|Bevy|bevy_streamdeck|
-|---|---|
-|0.16|0.6|
-|0.15|0.5|
-|0.14|0.4|
-|0.13|0.3|
-|0.9|0.2|
-|0.8|0.1|
+| Bevy | bevy_streamdeck |
+| ---- | --------------- |
+| 0.17 | 0.7             |
+| 0.16 | 0.6             |
+| 0.15 | 0.5             |
+| 0.14 | 0.4             |
+| 0.13 | 0.3             |
+| 0.9  | 0.2             |
+| 0.8  | 0.1             |

examples/animated.rs

@@ -1,4 +1,4 @@
-use bevy::{asset::AssetPlugin, log::LogPlugin, prelude::*, render::texture::ImagePlugin};
+use bevy::{asset::AssetPlugin, log::LogPlugin, prelude::*};
 use bevy_streamdeck::{StreamDeck, StreamDeckPlugin};
 
 fn main() {

examples/demo.rs

@@ -1,8 +1,7 @@
 use std::time::Duration;
 
 use bevy::{
-    app::AppExit, asset::AssetPlugin, log::LogPlugin, prelude::*, render::texture::ImagePlugin,
-    time::common_conditions::on_timer,
+    app::AppExit, asset::AssetPlugin, log::LogPlugin, prelude::*, time::common_conditions::on_timer,
 };
 use bevy_streamdeck::{ImageMode, StreamDeck, StreamDeckPlugin};
 use rand::Rng;
@@ -36,7 +35,7 @@ fn main() {
 fn change_color(
     streamdeck: Res<StreamDeck>,
     time: Res<Time>,
-    mut app_exit_events: EventWriter<AppExit>,
+    mut app_exit: MessageWriter<AppExit>,
 ) {
     if let Some(_) = streamdeck.kind() {
         let color = Color::hsl(
@@ -46,7 +45,7 @@ fn change_color(
         );
         streamdeck.set_key_color(1, color);
         if (time.elapsed_secs() / 5.0).cos() + 0.9995 < 0.0 {
-            app_exit_events.send(AppExit::Success);
+            app_exit.write(AppExit::Success);
         }
     }
 }

examples/image.rs

@@ -1,4 +1,4 @@
-use bevy::{asset::AssetPlugin, log::LogPlugin, prelude::*, render::texture::ImagePlugin};
+use bevy::{asset::AssetPlugin, log::LogPlugin, prelude::*};
 use bevy_streamdeck::{StreamDeck, StreamDeckPlugin};
 use rand::Rng;
 

examples/inputs.rs

@@ -12,8 +12,8 @@ fn main() {
         .run();
 }
 
-fn print_streamdeck_events(mut streamdeck_input_events: EventReader<StreamDeckInput>) {
-    for event in streamdeck_input_events.read() {
+fn print_streamdeck_events(mut streamdeck_input: MessageReader<StreamDeckInput>) {
+    for event in streamdeck_input.read() {
         info!("{:?}", event);
     }
 }

examples/whack_a_mole.rs

@@ -111,7 +111,7 @@ fn whack(
     streamdeck_key: Res<ButtonInput<StreamDeckKey>>,
     streamdeck: Res<StreamDeck>,
     mut player: ResMut<Player>,
-    mut app_exit_events: EventWriter<AppExit>,
+    mut app_exit: MessageWriter<AppExit>,
 ) {
     for (entity, mole) in moles.iter() {
         if streamdeck_key.just_pressed(StreamDeckKey(mole.key)) {
@@ -123,15 +123,15 @@ fn whack(
                     info!("Mega ouch!");
                     if player.lives == 0 {
                         info!("You lost!");
-                        app_exit_events.send(AppExit::error());
+                        app_exit.write(AppExit::error());
                     }
                 }
                 MoleType::Bad => {
                     player.lives = player.lives.saturating_sub(1);
                     info!("Ouch!");
                     if player.lives == 0 {
                         info!("You lost!");
-                        app_exit_events.send(AppExit::error());
+                        app_exit.write(AppExit::error());
                     }
                 }
                 MoleType::Good => {

src/lib.rs

@@ -3,7 +3,7 @@ use std::time::Duration;
 use bevy_app::{App, AppExit, Last, Plugin, PreStartup, PreUpdate};
 pub use bevy_color::{Color, ColorToComponents, LinearRgba};
 use bevy_ecs::{
-    event::{Event, EventReader, EventWriter},
+    message::{Message, MessageReader, MessageWriter},
     resource::Resource,
     system::{Commands, Res, ResMut},
 };
@@ -22,7 +22,7 @@ pub struct StreamDeckPlugin;
 
 impl Plugin for StreamDeckPlugin {
     fn build(&self, app: &mut App) {
-        app.add_event::<StreamDeckInput>()
+        app.add_message::<StreamDeckInput>()
             .init_resource::<ButtonInput<StreamDeckKey>>()
             .add_systems(PreStartup, listener)
             .add_systems(PreUpdate, receiver)
@@ -33,7 +33,7 @@ impl Plugin for StreamDeckPlugin {
 #[derive(Clone, Copy, Hash, PartialEq, Eq)]
 pub struct StreamDeckKey(pub u8);
 
-#[derive(Event, Debug)]
+#[derive(Message, Debug)]
 pub enum StreamDeckInput {
     Press(u8),
     Release(u8),
@@ -122,11 +122,11 @@ fn listener(mut commands: Commands) {
             if lost_connection {
                 streamdeck = None;
             }
-            if streamdeck.is_none() {
-                if let Ok(new_streamdeck) = streamdeck::StreamDeck::connect(0x0fd9, 0x0063, None) {
-                    let _ = event_tx.send(StreamDeckEvent::Connected(new_streamdeck.kind()));
-                    streamdeck = Some(new_streamdeck);
-                }
+            if streamdeck.is_none()
+                && let Ok(new_streamdeck) = streamdeck::StreamDeck::connect(0x0fd9, 0x0063, None)
+            {
+                let _ = event_tx.send(StreamDeckEvent::Connected(new_streamdeck.kind()));
+                streamdeck = Some(new_streamdeck);
             }
         }
     });
@@ -142,7 +142,7 @@ fn receiver(
     mut streamdeck: ResMut<StreamDeck>,
     internal: Res<StreamDeckInternal>,
     mut inputs: ResMut<ButtonInput<StreamDeckKey>>,
-    mut input_events: EventWriter<StreamDeckInput>,
+    mut input_events: MessageWriter<StreamDeckInput>,
 ) {
     inputs.clear();
     for from_stream in internal.events.try_iter() {
@@ -262,7 +262,7 @@ impl StreamDeck {
     }
 }
 
-fn exit_on_exit(streamdeck: Res<StreamDeck>, mut exit_events: EventReader<AppExit>) {
+fn exit_on_exit(streamdeck: Res<StreamDeck>, mut exit_events: MessageReader<AppExit>) {
     if exit_events.read().next().is_some() {
         let _ = streamdeck.orders.send(StreamDeckOrder::Reset);
         let _ = streamdeck.orders.send(StreamDeckOrder::Exit);