Merge pull request #65 from jkb0o/bevy-0.11

Migrate to bevy 0.11
jkb0o · Sep 20, 2023 · ddd29fc · ddd29fc
2 parents bbc2bbb + 59c7d68
commit ddd29fc
Show file tree

Hide file tree

Showing 80 changed files with 2,808 additions and 2,119 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "belly"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -16,7 +16,7 @@ members = [
 ]
 
 [dependencies]
-bevy = "0.10"
+bevy = "0.11"
 embed-doc-image = "0.1"
 tagstr = { path = "crates/tagstr" }
 belly_macro = { path = "crates/belly_macro" }

diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -189,8 +189,8 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -267,8 +267,8 @@ use belly::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -336,8 +336,8 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -430,8 +430,8 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -823,9 +823,9 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
-        .add_system(update_label)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
+         .add_systems(update_label)
         .run();
 }
 
@@ -887,8 +887,8 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -1074,8 +1074,8 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -1179,7 +1179,6 @@ fn setup(mut commands: Commands) {
             <button on:press=|ctx| { ctx.select("#container > *").toggle_class("hidden"); }>
                 "Toggle container children visibility"
             </button>
-            <br/>
             <span class="box target">"Target span"</span>
             <span id="container">
                 <span class="box target">"Target span"</span>
@@ -1232,8 +1231,8 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -1281,17 +1280,16 @@ use bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BellyPlugin)
-        .add_startup_system(setup)
+        .add_plugins(BellyPlugin)
+        .add_systems(Startup, setup)
         .run();
 }
 
 fn setup(mut commands: Commands) {
     commands.spawn(Camera2dBundle::default());
     commands.add(eml! {
-        <body s:padding="50px">
+        <body s:padding="50px" s:flex-direction="column">
             <progressbar s:width="200px" bind:value=from!(Time:elapsed_seconds()*0.2)/>
-            <br/>
             <progressbar s:width="200px" bind:value=from!(Time:elapsed_seconds()*0.2)>
                 <slot separator>
                     <span s:height="100%" s:min-width="10px" s:background-color="red"/>

diff --git a/assets/stylesheet.ess b/assets/stylesheet.ess
@@ -1,6 +1,7 @@
 /* stylesheet.ess */
 body {
     padding: 5px;
+    flex-direction: column;
 }
 span {
     padding: 25px;

diff --git a/crates/belly_core/Cargo.toml b/crates/belly_core/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "belly_core"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.10"
+bevy = "0.11"
 bevy_stylebox = { path = "../bevy_stylebox" }
 cssparser = "0.29.6"
 itertools = "0.10.5"