fixes #142, upgrade with bevy 0.6

Author: yjpark

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "notation_kb"
-version = "0.3.4"
+version = "0.4.0"
 edition = "2021"
 description = "Fun Notation Knowledge Base"
 

apps/notation_kb/Cargo.toml

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use notation_bevy::bevy::prelude::*;
-use notation_bevy::bevy::prelude::AppBuilder;
 //use notation_bevy::bevy::input::mouse::{MouseMotion, MouseWheel, MouseScrollUnit};
 
 use notation_bevy::prelude::*;
@@ -12,19 +11,19 @@ use crate::index_panel::IndexPanel;
 pub struct NotationKnowledgeBase();
 
 impl NotationKnowledgeBase {
-    fn extra(app: &mut AppBuilder) {
+    fn extra(app: &mut App) {
         app.init_resource::<IndexPanel>();
-        app.add_startup_system(Self::setup_state.system());
+        app.add_startup_system(Self::setup_state);
         TabPlugin::setup_mouse_input(app);
         app.add_system_set(
             SystemSet::on_update(NotationAssetsStates::Loaded)
-                .with_system(IndexPanel::hack_settings.system())
-                .with_system(IndexPanel::check_reload.system())
-                .with_system(IndexPanel::index_ui.system())
-                .with_system(IndexPanel::index_audio.system())
-                .with_system(IndexPanel::handle_link_evts.system())
-                .with_system(Self::load_tab.system())
-                .with_system(Self::on_window_resized.system())
+                .with_system(IndexPanel::hack_settings)
+                .with_system(IndexPanel::check_reload)
+                .with_system(IndexPanel::index_ui)
+                .with_system(IndexPanel::index_audio)
+                .with_system(IndexPanel::handle_link_evts)
+                .with_system(Self::load_tab)
+                .with_system(Self::on_window_resized)
         );
     }
     pub fn run() {

apps/notation_kb/src/kb.rs

@@ -1,6 +1,6 @@
 [package]
 name = "notation_kb_cn"
-version = "0.3.4"
+version = "0.4.0"
 edition = "2021"
 description = "Fun Notation Knowledge Base (Chinese)"
 

apps/notation_kb_cn/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notation_tabs"
-version = "0.3.4"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

apps/notation_tabs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notation_viewer"
-version = "0.3.4"
+version = "0.4.0"
 edition = "2021"
 description = "Notation Viewer"
 

apps/notation_viewer/Cargo.toml

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-
 use notation_bevy::bevy::prelude::*;
-use notation_bevy::bevy::prelude::AppBuilder;
 use notation_bevy::bevy::input::mouse::{MouseMotion, MouseWheel, MouseScrollUnit};
 
 use notation_bevy::prelude::*;
@@ -13,17 +10,17 @@ use crate::help_panel::HelpPanel;
 pub struct NotationViewer();
 
 impl NotationViewer {
-    fn extra(app: &mut AppBuilder) {
+    fn extra(app: &mut App) {
         app.init_resource::<HelpPanel>();
         TabPlugin::setup_mouse_input(app);
         app.add_system_set(
             SystemSet::on_update(NotationAssetsStates::Loaded)
-                .with_system(Self::handle_keyboard_inputs.system())
-                .with_system(Self::handle_mouse_inputs.system())
-                .with_system(Self::handle_touch_inputs.system())
-                .with_system(Self::load_tab.system())
-                .with_system(HelpPanel::help_ui.system())
-                .with_system(HelpPanel::handle_link_evts.system())
+                .with_system(Self::handle_keyboard_inputs)
+                .with_system(Self::handle_mouse_inputs)
+                .with_system(Self::handle_touch_inputs)
+                .with_system(Self::load_tab)
+                .with_system(HelpPanel::help_ui)
+                .with_system(HelpPanel::handle_link_evts)
         );
     }
     pub fn run(tabs: Vec<String>) {
@@ -40,7 +37,7 @@ impl NotationViewer {
         mut theme: ResMut<NotationTheme>,
         mut evts: EventWriter<AddTabEvent>,
         entities: Query<Entity, With<GlobalTransform>>,
-        viewer_query: Query<(Entity, &Arc<TabViewer>), With<Arc<TabViewer>>>,
+        viewer_query: Query<(Entity, &TabViewer), With<TabViewer>>,
         asset_server: Res<AssetServer>,
         assets: Res<Assets<TabAsset>>,
     ) {

apps/notation_viewer/src/viewer.rs

@@ -1,6 +1,6 @@
 [package]
 name = "notation_viewer_cn"
-version = "0.3.4"
+version = "0.4.0"
 edition = "2021"
 description = "Notation Viewer (Chinese)"
 

apps/notation_viewer_cn/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notation_audio"
-version = "0.3.4"
+version = "0.4.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 homepage = "https://www.notation.fun"
@@ -13,6 +13,6 @@ description = "Fun notation - audio features"
 [features]
 
 [dependencies]
-bevy = { version = "0.5.0", default-features = false }
-bevy_kira_audio = "0.7.0"
+bevy = { version = "0.6.0", default-features = false }
+bevy_kira_audio = "0.8.0"
 ringbuf = "0.2.6"

crates/notation_audio/Cargo.toml

@@ -54,13 +54,13 @@ impl MonoStream {
         }
     }
     pub fn init_streaming(
-        app: &mut AppBuilder,
+        app: &mut App,
         setup_default_streaming: bool,
     ) {
         app.add_plugin(AudioPlugin);
         app.add_plugin(AudioStreamPlugin::<MonoStreamOutput>::default());
         if setup_default_streaming {
-            app.add_startup_system(Self::setup_default_streaming.system());
+            app.add_startup_system(Self::setup_default_streaming);
         }
     }
     pub fn setup_streaming(