diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 2f95c54..0ad0fea 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -5,14 +5,14 @@ name: Dependencies on: pull_request: paths: - - '**/Cargo.toml' - - 'deny.toml' + - "**/Cargo.toml" + - "deny.toml" push: paths: - - '**/Cargo.toml' - - 'deny.toml' + - "**/Cargo.toml" + - "deny.toml" branches-ignore: - - 'dependabot/**' + - "dependabot/**" - staging-squash-merge.tmp schedule: - cron: "0 0 * * 0" @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: master + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'master' }} - uses: dtolnay/rust-toolchain@master with: toolchain: stable @@ -40,7 +40,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: master + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'master' }} - uses: dtolnay/rust-toolchain@master with: toolchain: stable @@ -54,7 +54,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: master + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'master' }} - uses: dtolnay/rust-toolchain@master with: toolchain: stable @@ -68,7 +68,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: master + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'master' }} - uses: dtolnay/rust-toolchain@master with: toolchain: stable diff --git a/Cargo.toml b/Cargo.toml index 7e8844b..cdfaebf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,20 +8,21 @@ license = "MIT OR Apache-2.0" name = "bevy_prototype_lyon" readme = "README.md" repository = "https://github.com/Nilirad/bevy_prototype_lyon/" -version = "0.13.0" +version = "0.14.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bevy = { version = "0.15.0", default-features = false, features = [ - "bevy_sprite", - "bevy_render", - "bevy_core_pipeline", +bevy = { version = "0.16", default-features = false, features = [ "bevy_asset", + "bevy_core_pipeline", + "bevy_log", + "bevy_render", + "bevy_sprite", ] } lyon_tessellation = "1" lyon_algorithms = "1" svgtypes = "0.15" [dev-dependencies] -bevy = "0.15.0" +bevy = "0.16" diff --git a/README.md b/README.md index 9c8a41e..cb3fd09 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ The following table shows the latest version of `bevy_prototype_lyon` that suppo |bevy|bevy_prototype_lyon|license| |---|---|---| +|0.16|0.14|MIT/Apache 2.0| |0.15|0.13|MIT/Apache 2.0| |0.14|0.12|MIT/Apache 2.0| |0.13|0.11|MIT/Apache 2.0| @@ -82,8 +83,8 @@ The following table shows the latest version of `bevy_prototype_lyon` that suppo Licensed under either of - * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) - * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or ) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or ) at your option. diff --git a/deny.toml b/deny.toml index ddb2e20..e7a47e8 100644 --- a/deny.toml +++ b/deny.toml @@ -5,7 +5,7 @@ version = 2 db-path = "~/.cargo/advisory-db" db-urls = ["https://github.com/rustsec/advisory-db"] ignore = [ - "RUSTSEC-2022-0048", # xml-rs unmaintained + "RUSTSEC-2024-0436", # `paste` unmaintained, but is a Bevy dependency ] yanked = "deny" @@ -23,7 +23,10 @@ allow = [ "CC0-1.0", ] exceptions = [ - { name = "unicode-ident", allow = ["Unicode-DFS-2016", "Unicode-3.0"] }, + { name = "unicode-ident", allow = [ + "Unicode-DFS-2016", + "Unicode-3.0", + ] }, ] [[licenses.clarify]] @@ -32,7 +35,7 @@ license-files = [] name = "stretch" [bans] -multiple-versions = "allow" +multiple-versions = "allow" wildcards = "allow" [sources] diff --git a/examples/dynamic_shape.rs b/examples/dynamic_shape.rs index f81bd04..dfb0460 100644 --- a/examples/dynamic_shape.rs +++ b/examples/dynamic_shape.rs @@ -1,13 +1,16 @@ use std::f64::consts::PI; -use bevy::{color::palettes::css::*, prelude::*}; +use bevy::{color::palettes::css::*, input::common_conditions::input_just_pressed, prelude::*}; use bevy_prototype_lyon::prelude::*; fn main() { App::new() .add_plugins((DefaultPlugins, ShapePlugin)) .add_systems(Startup, setup_system) - .add_systems(Update, redraw_shape) + .add_systems( + Update, + redraw_shape.run_if(input_just_pressed(KeyCode::Space)), + ) .add_systems(Update, rotate_shape_system) .run(); } @@ -34,7 +37,7 @@ fn redraw_shape(mut query: Query<&mut Shape, With>, time: Res