From 5978c377d55391c6b655a976e717fb53256e6e77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 16:46:12 +0000 Subject: [PATCH] Update parking_lot requirement from 0.11.0 to 0.12.0 Updates the requirements on [parking_lot](https://github.com/Amanieu/parking_lot) to permit the latest version. - [Release notes](https://github.com/Amanieu/parking_lot/releases) - [Changelog](https://github.com/Amanieu/parking_lot/blob/master/CHANGELOG.md) - [Commits](https://github.com/Amanieu/parking_lot/compare/0.11.0...0.12.0) --- updated-dependencies: - dependency-name: parking_lot dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- crates/bevy_asset/Cargo.toml | 28 ++++++-------- crates/bevy_audio/Cargo.toml | 30 +++++++------- crates/bevy_ecs/Cargo.toml | 24 ++++-------- crates/bevy_reflect/Cargo.toml | 18 ++++----- crates/bevy_render/Cargo.toml | 71 +++++++++++++++++----------------- 5 files changed, 78 insertions(+), 93 deletions(-) diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml index f9b6bdf6679d8..96670fb9776d6 100644 --- a/crates/bevy_asset/Cargo.toml +++ b/crates/bevy_asset/Cargo.toml @@ -1,11 +1,7 @@ [package] name = "bevy_asset" -version = "0.5.0" -edition = "2018" -authors = [ - "Bevy Contributors ", - "Carter Anderson ", -] +version = "0.6.0" +edition = "2021" description = "Provides asset functionality for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" @@ -13,18 +9,18 @@ license = "MIT OR Apache-2.0" keywords = ["bevy"] [features] -default = ["filesystem_watcher"] +default = [] filesystem_watcher = ["notify"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.5.0" } -bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.5.0" } -bevy_ecs = { path = "../bevy_ecs", version = "0.5.0" } -bevy_log = { path = "../bevy_log", version = "0.5.0" } -bevy_reflect = { path = "../bevy_reflect", version = "0.5.0", features = ["bevy"] } -bevy_tasks = { path = "../bevy_tasks", version = "0.5.0" } -bevy_utils = { path = "../bevy_utils", version = "0.5.0" } +bevy_app = { path = "../bevy_app", version = "0.6.0" } +bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.6.0" } +bevy_ecs = { path = "../bevy_ecs", version = "0.6.0" } +bevy_log = { path = "../bevy_log", version = "0.6.0" } +bevy_reflect = { path = "../bevy_reflect", version = "0.6.0", features = ["bevy"] } +bevy_tasks = { path = "../bevy_tasks", version = "0.6.0" } +bevy_utils = { path = "../bevy_utils", version = "0.6.0" } # other serde = { version = "1", features = ["derive"] } @@ -33,7 +29,7 @@ anyhow = "1.0.4" thiserror = "1.0" downcast-rs = "1.2.0" notify = { version = "=5.0.0-pre.11", optional = true } -parking_lot = "0.11.0" +parking_lot = "0.12.0" rand = "0.8.0" [target.'cfg(target_arch = "wasm32")'.dependencies] @@ -43,7 +39,7 @@ wasm-bindgen-futures = "0.4" js-sys = "0.3" [target.'cfg(target_os = "android")'.dependencies] -ndk-glue = { version = "0.2" } +ndk-glue = { version = "0.5" } [dev-dependencies] futures-lite = "1.4.0" diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml index e5d9b02163e76..e4e4224e2da93 100644 --- a/crates/bevy_audio/Cargo.toml +++ b/crates/bevy_audio/Cargo.toml @@ -1,11 +1,7 @@ [package] name = "bevy_audio" -version = "0.5.0" -edition = "2018" -authors = [ - "Bevy Contributors ", - "Carter Anderson ", -] +version = "0.6.0" +edition = "2021" description = "Provides audio functionality for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" @@ -14,20 +10,26 @@ keywords = ["bevy"] [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.5.0" } -bevy_asset = { path = "../bevy_asset", version = "0.5.0" } -bevy_ecs = { path = "../bevy_ecs", version = "0.5.0" } -bevy_reflect = { path = "../bevy_reflect", version = "0.5.0", features = ["bevy"] } -bevy_utils = { path = "../bevy_utils", version = "0.5.0" } +bevy_app = { path = "../bevy_app", version = "0.6.0" } +bevy_asset = { path = "../bevy_asset", version = "0.6.0" } +bevy_ecs = { path = "../bevy_ecs", version = "0.6.0" } +bevy_reflect = { path = "../bevy_reflect", version = "0.6.0", features = ["bevy"] } +bevy_utils = { path = "../bevy_utils", version = "0.6.0" } # other anyhow = "1.0.4" -rodio = { version = "0.14", default-features = false } -parking_lot = "0.11.0" +rodio = { version = "0.15", default-features = false } +parking_lot = "0.12.0" + +[target.'cfg(target_arch = "wasm32")'.dependencies] +rodio = { version = "0.15", default-features = false, features = ["wasm-bindgen"] } + +[dev-dependencies] +# bevy +bevy_internal = { path = "../bevy_internal", version = "0.6.0" } [features] mp3 = ["rodio/mp3"] flac = ["rodio/flac"] wav = ["rodio/wav"] vorbis = ["rodio/vorbis"] -wasm_audio = ["rodio/wasm-bindgen"] diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml index b7797993bc427..5a9e1bc70d834 100644 --- a/crates/bevy_ecs/Cargo.toml +++ b/crates/bevy_ecs/Cargo.toml @@ -1,11 +1,7 @@ [package] name = "bevy_ecs" -version = "0.5.0" -edition = "2018" -authors = [ - "Bevy Contributors ", - "Carter Anderson ", -] +version = "0.6.0" +edition = "2021" description = "Bevy Engine's entity component system" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" @@ -18,30 +14,26 @@ trace = [] default = ["bevy_reflect"] [dependencies] -bevy_reflect = { path = "../bevy_reflect", version = "0.5.0", optional = true } -bevy_tasks = { path = "../bevy_tasks", version = "0.5.0" } -bevy_utils = { path = "../bevy_utils", version = "0.5.0" } -bevy_ecs_macros = { path = "macros", version = "0.5.0" } +bevy_reflect = { path = "../bevy_reflect", version = "0.6.0", optional = true } +bevy_tasks = { path = "../bevy_tasks", version = "0.6.0" } +bevy_utils = { path = "../bevy_utils", version = "0.6.0" } +bevy_ecs_macros = { path = "macros", version = "0.6.0" } async-channel = "1.4" fixedbitset = "0.4" fxhash = "0.2" thiserror = "1.0" downcast-rs = "1.2" -rand = "0.8" serde = "1" [dev-dependencies] -parking_lot = "0.11" +parking_lot = "0.12" +rand = "0.8" [[example]] name = "events" path = "examples/events.rs" -[[example]] -name = "component_storage" -path = "examples/component_storage.rs" - [[example]] name = "resources" path = "examples/resources.rs" diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml index 1f0e81e050939..15a6afa7e3764 100644 --- a/crates/bevy_reflect/Cargo.toml +++ b/crates/bevy_reflect/Cargo.toml @@ -1,11 +1,7 @@ [package] name = "bevy_reflect" -version = "0.5.0" -edition = "2018" -authors = [ - "Bevy Contributors ", - "Carter Anderson ", -] +version = "0.6.0" +edition = "2021" description = "Dynamically interact with rust types" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" @@ -18,17 +14,17 @@ bevy = ["glam", "smallvec"] [dependencies] # bevy -bevy_reflect_derive = { path = "bevy_reflect_derive", version = "0.5.0" } -bevy_utils = { path = "../bevy_utils", version = "0.5.0" } +bevy_reflect_derive = { path = "bevy_reflect_derive", version = "0.6.0" } +bevy_utils = { path = "../bevy_utils", version = "0.6.0" } # other erased-serde = "0.3" downcast-rs = "1.2" -parking_lot = "0.11.0" +parking_lot = "0.12.0" thiserror = "1.0" serde = "1" smallvec = { version = "1.6", features = ["serde", "union", "const_generics"], optional = true } -glam = { version = "0.15.1", features = ["serde"], optional = true } +glam = { version = "0.20.0", features = ["serde"], optional = true } [dev-dependencies] -ron = "0.6.2" +ron = "0.7.0" diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 7c82d528ea540..d79b3b814002b 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -1,57 +1,56 @@ [package] name = "bevy_render" -version = "0.5.0" -edition = "2018" -authors = [ - "Bevy Contributors ", - "Carter Anderson ", -] +version = "0.6.0" +edition = "2021" description = "Provides rendering functionality for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" license = "MIT OR Apache-2.0" keywords = ["bevy"] +[features] +png = ["image/png"] +hdr = ["image/hdr"] +dds = ["image/dds"] +tga = ["image/tga"] +jpeg = ["image/jpeg"] +bmp = ["image/bmp"] +trace = [] +wgpu_trace = ["wgpu/trace"] +ci_limits = [] +webgl = ["wgpu/webgl"] + [dependencies] # bevy -bevy_app = { path = "../bevy_app", version = "0.5.0" } -bevy_asset = { path = "../bevy_asset", version = "0.5.0" } -bevy_core = { path = "../bevy_core", version = "0.5.0" } -bevy_derive = { path = "../bevy_derive", version = "0.5.0" } -bevy_ecs = { path = "../bevy_ecs", version = "0.5.0" } -bevy_math = { path = "../bevy_math", version = "0.5.0" } -bevy_reflect = { path = "../bevy_reflect", version = "0.5.0", features = ["bevy"] } -bevy_transform = { path = "../bevy_transform", version = "0.5.0" } -bevy_window = { path = "../bevy_window", version = "0.5.0" } -bevy_utils = { path = "../bevy_utils", version = "0.5.0" } +bevy_app = { path = "../bevy_app", version = "0.6.0" } +bevy_asset = { path = "../bevy_asset", version = "0.6.0" } +bevy_core = { path = "../bevy_core", version = "0.6.0" } +bevy_crevice = { path = "../bevy_crevice", version = "0.6.0", features = ["glam"] } +bevy_derive = { path = "../bevy_derive", version = "0.6.0" } +bevy_ecs = { path = "../bevy_ecs", version = "0.6.0" } +bevy_math = { path = "../bevy_math", version = "0.6.0" } +bevy_reflect = { path = "../bevy_reflect", version = "0.6.0", features = ["bevy"] } +bevy_transform = { path = "../bevy_transform", version = "0.6.0" } +bevy_window = { path = "../bevy_window", version = "0.6.0" } +bevy_utils = { path = "../bevy_utils", version = "0.6.0" } # rendering image = { version = "0.23.12", default-features = false } # misc +wgpu = { version = "0.12.0", features = ["spirv"] } +codespan-reporting = "0.11.0" +naga = { version = "0.8.0", features = ["glsl-in", "spv-in", "spv-out", "wgsl-in", "wgsl-out"] } serde = { version = "1", features = ["derive"] } bitflags = "1.2.1" +smallvec = { version = "1.6", features = ["union", "const_generics"] } once_cell = "1.4.1" # TODO: replace once_cell with std equivalent if/when this lands: https://github.com/rust-lang/rfcs/pull/2788 downcast-rs = "1.2.0" thiserror = "1.0" -anyhow = "1.0.4" +futures-lite = "1.4.0" +anyhow = "1.0" hex = "0.4.2" -hexasphere = "4.0.0" -parking_lot = "0.11.0" - -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -spirv-reflect = "0.2.3" - -[target.'cfg(any(all(target_arch="x86_64", target_os="linux", target_env="gnu"), all(target_arch="x86_64", target_os="macos"), all(target_arch="aarch64", target_os="android"), all(target_arch="armv7", target_os="androidabi"), all(target_arch="x86_64", target_os="windows", target_env="msvc")))'.dependencies] -bevy-glsl-to-spirv = "0.2.0" - -[target.'cfg(not(any(target_arch = "wasm32", all(target_arch="x86_64", target_os="linux", target_env="gnu"), all(target_arch="x86_64", target_os="macos"), all(target_arch="aarch64", target_os="android"), all(target_arch="armv7", target_os="androidabi"), all(target_arch="x86_64", target_os="windows", target_env="msvc"))))'.dependencies] -shaderc = "0.7.0" - -[features] -png = ["image/png"] -hdr = ["image/hdr"] -dds = ["image/dds"] -tga = ["image/tga"] -jpeg = ["image/jpeg"] -bmp = ["image/bmp"] +hexasphere = "6.0.0" +parking_lot = "0.12.0" +regex = "1.5" +copyless = "0.1.5"