Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Bevy 0.15.0 #664

Merged
merged 15 commits into from
Dec 9, 2024

Conversation

mnmaita
Copy link
Contributor

@mnmaita mnmaita commented Dec 9, 2024

Adopts #644

  • Branched off pcwalton:0.15-newer and resolved conflicts with the main branch.
  • Bumped bevy_egui version requirement to the latest compatible version.
  • Set Bevy version requirement to 0.15.0.
  • Replaced usage of the deprecated SpriteBundle with Sprite and Transform components.
  • Applied system ordering suggestions from this comment.

Copy link
Contributor

@alice-i-cecile alice-i-cecile left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You all rock. This looks great. I'll prepare a release!

@mnmaita
Copy link
Contributor Author

mnmaita commented Dec 9, 2024

Just found a merge hiccup and I fixed that, but I couldn't fix the broken gamepad tests... It's either something I messed up during the merge process, or it could be that some of the latest changes in main have to be changed to be 0.15 compatible. I'll appreciate any help here!

@alice-i-cecile
Copy link
Contributor

Can you ignore the tests for now? I think we should move forward as is and then fix the tests in follow-up.

@mnmaita
Copy link
Contributor Author

mnmaita commented Dec 9, 2024

Sure @alice-i-cecile, although I'm a bit worried since they seem to be checking the press status and the values of gamepad buttons and are failing to do so:

failures:

---- buttonlike_actions_can_be_pressed_and_released_when_button_value_set stdout ----
thread 'buttonlike_actions_can_be_pressed_and_released_when_button_value_set' panicked at tests\buttonlike.rs:195:5:
assertion failed: action_state.just_pressed(&TestAction::Throttle)

---- gamepad_button_value stdout ----
thread 'gamepad_button_value' panicked at tests\buttonlike.rs:103:5:
assertion `left == right` failed
  left: 0.0
 right: 1.0
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


failures:
    buttonlike_actions_can_be_pressed_and_released_when_button_value_set
    gamepad_button_value

test result: FAILED. 4 passed; 2 failed; 2 ignored; 0 measured; 0 filtered out; finished in 0.00s

I tried fixing pcwalton's branch prior to merging main and the system ordering suggestion fixed all test issues, which suggests there's some other new issue that popped up for gamepads.

I'll push a change to ignore them anyway if that's the way to go.

@alice-i-cecile
Copy link
Contributor

Definitely share your concern: it's a blocking issue. I want to split it out though to be sure we can properly review and discuss the fix.

@alice-i-cecile alice-i-cecile enabled auto-merge (squash) December 9, 2024 20:50
@mnmaita
Copy link
Contributor Author

mnmaita commented Dec 9, 2024

I forgot to test this with all features enabled 😓 I'll do another pass and fix the remaining failures as soon as I can.

auto-merge was automatically disabled December 9, 2024 21:43

Head branch was pushed to by a user without write access

@mnmaita
Copy link
Contributor Author

mnmaita commented Dec 9, 2024

@alice-i-cecile should be ready now, I ran all CI commands locally and they all pass. I took the liberty to adjust some doc comments to better fit the fact that Gamepads are now entities.

@alice-i-cecile alice-i-cecile enabled auto-merge (squash) December 9, 2024 22:54
@alice-i-cecile alice-i-cecile merged commit d40715f into Leafwing-Studios:main Dec 9, 2024
4 checks passed
@mnmaita mnmaita deleted the mnmaita/0.15-compat branch December 10, 2024 00:40
@mnmaita mnmaita restored the mnmaita/0.15-compat branch December 10, 2024 01:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants