wip upgrade

Cargo.toml

@@ -2,14 +2,16 @@
 name = "montociel"
 version = "0.1.0"
 edition = "2021"
-resolver = "2"
+resolver = "2" # Important! wgpu/Bevy needs this!
 
 [dependencies]
-bevy = {version = "0.5", default-features = false, features = ["bevy_winit", "render", "bevy_gltf", "png"]}
+bevy = { version = "0.6", default-features = false, features = ["bevy_winit", "render", "bevy_gltf", "png"] }
 bevy_rapier2d = "*"
 rand = "0.8"
 
-# Dependencies for native only.
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-bevy = {version = "0.5", default-features = false, features = ["bevy_wgpu", "bevy_winit", "render", "x11"]}
 
+winit = "0.26.1" # newer version not ok with new rustc version
+
+# Dependencies for native only.
+# [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+# bevy = {version = "0.5", default-features = false, features = ["bevy_wgpu", "bevy_winit", "render", "x11"]}

src/cloud.rs

@@ -10,7 +10,7 @@ pub struct Evil;
 pub struct CloudPlugin;
 
 impl Plugin for CloudPlugin {
-    fn build(&self, app: &mut AppBuilder) {
+    fn build(&self, app: &mut App) {
         app.init_resource::<NewCloudTimer>()
             .add_system_set(
                 SystemSet::on_enter(AppState::InGame)

src/montociel.rs

@@ -9,7 +9,7 @@ pub struct Montociel;
 pub struct MontocielPlugin;
 
 impl Plugin for MontocielPlugin {
-    fn build(&self, app: &mut AppBuilder) {
+    fn build(&self, app: &mut App) {
         app.add_system_set(
             SystemSet::on_enter(AppState::InGame).with_system(spawn_montociel.system()),
         )

src/score.rs

@@ -26,7 +26,7 @@ impl Score {
 pub struct ScorePlugin;
 
 impl Plugin for ScorePlugin {
-    fn build(&self, app: &mut AppBuilder) {
+    fn build(&self, app: &mut App) {
         app.init_resource::<Score>()
             .add_system_set(
                 SystemSet::on_enter(AppState::InGame).with_system(setup_score_ui.system()),

src/ui.rs

@@ -4,7 +4,7 @@ use bevy::prelude::*;
 pub struct UIPlugin;
 
 impl Plugin for UIPlugin {
-    fn build(&self, app: &mut AppBuilder) {
+    fn build(&self, app: &mut App) {
         app.add_system_set(SystemSet::on_enter(AppState::Menu).with_system(setup_button.system()))
             .add_system_set(
                 SystemSet::on_enter(AppState::GameOver).with_system(setup_button.system()),