Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 04:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

update ndk-glue to 0.4 (#2684)

Browse source 
# Objective

- We currently depends on ndk 0.2, 0.3, 0.4
- Only 0.2 dependencies comes from Bevy itself

## Solution

- Replace #1371 
- Update Bevy to ndk-glue 0.4
- Also fixes duplicate dependency CI issue
This commit is contained in:
François 2021-08-19 01:02:15 +00:00
parent 98a08cf495
commit 1a758dd9e2
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/bevy_asset/Cargo.toml
View file

@ -39,7 +39,7 @@ wasm-bindgen-futures = "0.4"
js-sys = "0.3" js-sys = "0.3"
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
ndk-glue = { version = "0.2" } ndk-glue = { version = "0.4" }
[dev-dependencies] [dev-dependencies]
futures-lite = "1.4.0" futures-lite = "1.4.0"

2
crates/bevy_internal/Cargo.toml
View file

@ -74,4 +74,4 @@ bevy_winit = { path = "../bevy_winit", optional = true, version = "0.5.0" }
bevy_gilrs = { path = "../bevy_gilrs", optional = true, version = "0.5.0" } bevy_gilrs = { path = "../bevy_gilrs", optional = true, version = "0.5.0" }
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
ndk-glue = {version = "0.2", features = ["logger"]} ndk-glue = {version = "0.4", features = ["logger"]}

7
deny.toml
View file

@ -37,7 +37,6 @@ highlight = "all"
# Certain crates/versions that will be skipped when doing duplicate detection. # Certain crates/versions that will be skipped when doing duplicate detection.
skip = [ skip = [
{ name = "ahash", version = "0.4" }, { name = "ahash", version = "0.4" },
{ name = "android_log-sys", version = "0.1" },
{ name = "cfg-if", version = "0.1" }, # https://github.com/rustwasm/console_error_panic_hook/pull/18 { name = "cfg-if", version = "0.1" }, # https://github.com/rustwasm/console_error_panic_hook/pull/18
{ name = "core-foundation", version = "0.6" }, { name = "core-foundation", version = "0.6" },
{ name = "core-foundation", version = "0.7" }, { name = "core-foundation", version = "0.7" },
@ -48,10 +47,8 @@ skip = [
{ name = "hashbrown", version = "0.9" }, { name = "hashbrown", version = "0.9" },
{ name = "libm", version = "0.1" }, { name = "libm", version = "0.1" },
{ name = "mach", version = "0.2" }, { name = "mach", version = "0.2" },
{ name = "ndk", version = "0.2" }, { name = "ndk", version = "0.3" },
{ name = "ndk-glue", version = "0.2" }, { name = "ndk-glue", version = "0.3" },
{ name = "num_enum", version = "0.4" },
{ name = "num_enum_derive", version = "0.4" },
{ name = "proc-macro-crate", version = "0.1" }, { name = "proc-macro-crate", version = "0.1" },
{ name = "stdweb", version = "0.1" }, { name = "stdweb", version = "0.1" },
] ]