bump to 0.18.0-rc.2 (#729)

* bump to 0.18.0-rc.1

* add release notes

* updaet RELEASES doc

* bump to rc.2 and remove unnecessary feature flag

* update release notes

* readd gamepad flag by default for placeholder entity queries

* Format imports in gamepad_axis.rs

Author: it-me-joda

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "leafwing-input-manager"
 description = "A powerful, flexible and ergonomic way to manage action-input keybindings for the Bevy game engine."
-version = "0.19.0"
+version = "0.20.0"
 authors = ["Leafwing Studios"]
 homepage = "https://leafwing-studios.com/"
 repository = "https://github.com/leafwing-studios/leafwing-input-manager"
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 categories = ["games", "game-development"]
 keywords = ["bevy"]
 exclude = ["assets/**/*", "tools/**/*", ".github/**/*"]
@@ -49,10 +49,11 @@ docs = ['winit/x11', 'winit/wayland']
 
 [dependencies]
 leafwing_input_manager_macros = { path = "macros", version = "0.17" }
-bevy = { version = "0.17.0", default-features = false, features = [
+bevy = { version = "0.18.0-rc.2", default-features = false, features = [
   "serialize",
   "std",
   "bevy_log",
+  "gamepad"
 ] }
 # Needed for the `docs` feature. Must be kept in sync with Bevy's version
 winit = { version = "0.30", default-features = false, optional = true }
@@ -65,7 +66,7 @@ dyn-eq = "0.1"
 dyn-hash = "1.0"
 
 [dev-dependencies]
-bevy = { version = "0.17.0-rc.1", default-features = false, features = [
+bevy = { version = "0.18.0-rc.2", default-features = false, features = [
   "std",
   "bevy_asset",
   "bevy_sprite",

README.md

@@ -16,6 +16,7 @@ and a single input can result in multiple actions being triggered, which can be
 
 | Bevy | leafwing-input-manager |
 | ---- | ---------------------- |
+| 0.18 | 0.20 (Unreleased)      |
 | 0.17 | 0.18..0.19             |
 | 0.16 | 0.17                   |
 | 0.15 | 0.16                   |

RELEASES.md

@@ -1,5 +1,11 @@
 # Release Notes
 
+## Version 0.20.0 (Unreleased)
+
+### Dependencies (0.20.0)
+
+- updated to Bevy 0.18.rc.2 (this should be compatible with Bevy 0.18 more broadly, assuming no further relevant breaking changes occur upstream)
+
 ## Version 0.19.0
 
 ### Breaking Changes (0.19.0)

src/action_diff.rs

@@ -18,7 +18,7 @@ use bevy::{
 use serde::{Deserialize, Serialize};
 
 use crate::buttonlike::ButtonValue;
-use crate::{action_state::ActionKindData, prelude::ActionState, Actionlike};
+use crate::{Actionlike, action_state::ActionKindData, prelude::ActionState};
 
 /// Stores presses and releases of buttons without timing information
 ///

src/action_state/action_data.rs

@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
 use crate::buttonlike::ButtonValue;
 #[cfg(feature = "timing")]
 use crate::timing::Timing;
-use crate::{buttonlike::ButtonState, InputControlKind};
+use crate::{InputControlKind, buttonlike::ButtonState};
 
 /// Data about the state of an action.
 ///

src/action_state/mod.rs

@@ -2,8 +2,8 @@
 
 use crate::buttonlike::ButtonValue;
 use crate::input_map::UpdatedValue;
-use crate::{action_diff::ActionDiff, input_map::UpdatedActions};
 use crate::{Actionlike, InputControlKind};
+use crate::{action_diff::ActionDiff, input_map::UpdatedActions};
 
 use bevy::platform::{collections::HashMap, time::Instant};
 use bevy::prelude::Resource;
@@ -310,7 +310,7 @@ impl<A: Actionlike> ActionState<A> {
     pub fn button_data_mut(&mut self, action: &A) -> Option<&mut ButtonData> {
         match self.action_data_mut(action) {
             Some(action_data) => match &mut action_data.kind_data {
-                ActionKindData::Button(ref mut button_data) => Some(button_data),
+                ActionKindData::Button(button_data) => Some(button_data),
                 _ => None,
             },
             None => None,
@@ -380,7 +380,7 @@ impl<A: Actionlike> ActionState<A> {
     pub fn axis_data_mut(&mut self, action: &A) -> Option<&mut AxisData> {
         match self.action_data_mut(action) {
             Some(action_data) => match &mut action_data.kind_data {
-                ActionKindData::Axis(ref mut axis_data) => Some(axis_data),
+                ActionKindData::Axis(axis_data) => Some(axis_data),
                 _ => None,
             },
             None => None,
@@ -453,7 +453,7 @@ impl<A: Actionlike> ActionState<A> {
 
         match self.action_data_mut(action) {
             Some(action_data) => match &mut action_data.kind_data {
-                ActionKindData::DualAxis(ref mut dual_axis_data) => Some(dual_axis_data),
+                ActionKindData::DualAxis(dual_axis_data) => Some(dual_axis_data),
                 _ => None,
             },
             None => None,
@@ -526,7 +526,7 @@ impl<A: Actionlike> ActionState<A> {
 
         match self.action_data_mut(action) {
             Some(action_data) => match &mut action_data.kind_data {
-                ActionKindData::TripleAxis(ref mut triple_axis_data) => Some(triple_axis_data),
+                ActionKindData::TripleAxis(triple_axis_data) => Some(triple_axis_data),
                 _ => None,
             },
             None => None,
@@ -1370,9 +1370,9 @@ mod tests {
     fn press_lifecycle() {
         use std::time::{Duration, Instant};
 
-        use crate::prelude::updating::CentralInputStore;
         use crate::prelude::Buttonlike;
         use crate::prelude::ClashStrategy;
+        use crate::prelude::updating::CentralInputStore;
 
         let ctx = TestContext::new();
         let mut app = ctx.app;
@@ -1466,8 +1466,8 @@ mod tests {
     fn update_with_clashes_prioritizing_longest() {
         use std::time::{Duration, Instant};
 
-        use crate::prelude::updating::CentralInputStore;
         use crate::prelude::ClashStrategy;
+        use crate::prelude::updating::CentralInputStore;
         use crate::user_input::Buttonlike;
         use bevy::prelude::KeyCode::*;
 
@@ -1780,17 +1780,21 @@ mod tests {
                 }),
             },
         );
-        assert!(action_state
-            .dual_axis_data_mut(&TestAction::DualAxis)
-            .is_some());
+        assert!(
+            action_state
+                .dual_axis_data_mut(&TestAction::DualAxis)
+                .is_some()
+        );
     }
 
     #[test]
     fn test_dual_axis_data_mut_for_dual_axis_action_without_data() {
         let mut action_state = ActionState::<TestAction>::default();
-        assert!(action_state
-            .dual_axis_data_mut(&TestAction::DualAxis)
-            .is_none());
+        assert!(
+            action_state
+                .dual_axis_data_mut(&TestAction::DualAxis)
+                .is_none()
+        );
     }
 
     #[test]
@@ -1803,9 +1807,11 @@ mod tests {
     #[test]
     fn test_triple_axis_data_for_triple_axis_action_without_data() {
         let action_state = ActionState::<TestAction>::default();
-        assert!(action_state
-            .triple_axis_data(&TestAction::TripleAxis)
-            .is_none());
+        assert!(
+            action_state
+                .triple_axis_data(&TestAction::TripleAxis)
+                .is_none()
+        );
     }
 
     #[test]
@@ -1822,9 +1828,11 @@ mod tests {
                 }),
             },
         );
-        assert!(action_state
-            .triple_axis_data_mut(&TestAction::TripleAxis)
-            .is_some());
+        assert!(
+            action_state
+                .triple_axis_data_mut(&TestAction::TripleAxis)
+                .is_some()
+        );
     }
 
     #[test]

src/clashing_inputs.rs

@@ -480,8 +480,8 @@ mod tests {
             plugin::CentralInputStorePlugin,
             prelude::{ModifierKey, VirtualDPad},
         };
-        use bevy::{input::InputPlugin, prelude::*};
         use Action::*;
+        use bevy::{input::InputPlugin, prelude::*};
 
         #[test]
         #[ignore = "Figuring out how to handle the length of chords with group inputs is out of scope."]
@@ -572,9 +572,11 @@ mod tests {
             assert!(input_map.possible_clash(&One, &OneAndTwo).is_some());
             assert!(input_map.possible_clash(&One, &OneAndTwoAndThree).is_some());
             assert!(input_map.possible_clash(&One, &TwoAndThree).is_none());
-            assert!(input_map
-                .possible_clash(&OneAndTwo, &OneAndTwoAndThree)
-                .is_some());
+            assert!(
+                input_map
+                    .possible_clash(&OneAndTwo, &OneAndTwoAndThree)
+                    .is_some()
+            );
         }
 
         #[test]
@@ -728,9 +730,11 @@ mod tests {
                 .first()
                 .unwrap();
 
-            assert!(chord_input
-                .decompose()
-                .clashes_with(&dpad_input.decompose()));
+            assert!(
+                chord_input
+                    .decompose()
+                    .clashes_with(&dpad_input.decompose())
+            );
 
             // Triple check that the inputs are clashing
             input_map

src/common_conditions.rs

@@ -1,6 +1,6 @@
 //! Run conditions for actions.
 
-use crate::{prelude::ActionState, Actionlike};
+use crate::{Actionlike, prelude::ActionState};
 use bevy::{
     ecs::system::{Single, SystemParam},
     log::warn,
@@ -27,7 +27,9 @@ where
             Some(self.action_state_component.as_ref().unwrap())
         } else {
             let type_name = std::any::type_name::<A>();
-            warn!("No ActionState found for {type_name}. Please ensure that an ActionState resource is added, or that an InputMap component exists to provide an ActionState.");
+            warn!(
+                "No ActionState found for {type_name}. Please ensure that an ActionState resource is added, or that an InputMap component exists to provide an ActionState."
+            );
             None
         }
     }

src/input_map.rs

@@ -5,8 +5,9 @@ use std::hash::Hash;
 
 #[cfg(feature = "asset")]
 use bevy::asset::Asset;
+use bevy::input::gamepad::Gamepad;
 use bevy::platform::collections::HashMap;
-use bevy::prelude::{Component, Deref, DerefMut, Entity, Gamepad, Query, Reflect, Resource, With};
+use bevy::prelude::{Component, Deref, DerefMut, Entity, Query, Reflect, Resource, With};
 use bevy::{log::error, prelude::ReflectComponent};
 use bevy::{
     math::{Vec2, Vec3},
@@ -1213,7 +1214,7 @@ mod tests {
     #[test]
     fn input_map_serde() {
         use bevy::prelude::{App, KeyCode};
-        use serde_test::{assert_tokens, Token};
+        use serde_test::{Token, assert_tokens};
 
         let mut app = App::new();
 

src/input_processing/dual_axis/custom.rs

@@ -6,15 +6,15 @@ use bevy::app::App;
 use bevy::prelude::{FromReflect, Reflect, ReflectDeserialize, ReflectSerialize, TypePath, Vec2};
 use bevy::reflect::utility::{GenericTypePathCell, NonGenericTypeInfoCell};
 use bevy::reflect::{
-    erased_serde, FromType, GetTypeRegistration, OpaqueInfo, PartialReflect, ReflectFromPtr,
-    ReflectKind, ReflectMut, ReflectOwned, ReflectRef, TypeInfo, TypeRegistration, Typed,
+    FromType, GetTypeRegistration, OpaqueInfo, PartialReflect, ReflectFromPtr, ReflectKind,
+    ReflectMut, ReflectOwned, ReflectRef, TypeInfo, TypeRegistration, Typed, erased_serde,
 };
 use dyn_clone::DynClone;
 use dyn_eq::DynEq;
 use dyn_hash::DynHash;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_flexitos::ser::require_erased_serialize_impl;
-use serde_flexitos::{serialize_trait_object, Registry};
+use serde_flexitos::{Registry, serialize_trait_object};
 
 use crate::input_processing::DualAxisProcessor;
 use crate::typetag::{InfallibleMapRegistry, RegisterTypeTag};
@@ -310,7 +310,7 @@ mod tests {
     use super::*;
     use crate as leafwing_input_manager;
     use leafwing_input_manager_macros::serde_typetag;
-    use serde_test::{assert_tokens, Token};
+    use serde_test::{Token, assert_tokens};
 
     #[test]
     fn test_custom_dual_axis_processor() {