forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert ndk-glue to 0.5 to synchronize with winit (#4916)

Browse Source 
# Objective

- Upgrading ndk-glue (our Android interop layer) desynchronized us from winit
- This further broke Android builds, see #4905 (oops...)
- Reverting to 0.5 should help with this, until the new `winit` version releases
- Fixes #4774 and closes #4529
This commit is contained in:
Alice Cecile 2022-06-04 14:30:44 +00:00
parent 1fcb7d0c2e
commit 3a9383f997
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_asset/Cargo.toml
View File

@ -40,7 +40,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.6" } ndk-glue = { version = "0.5" }
[dev-dependencies] [dev-dependencies]
futures-lite = "1.4.0" futures-lite = "1.4.0"

4
crates/bevy_internal/Cargo.toml
View File

@ -98,4 +98,6 @@ bevy_winit = { path = "../bevy_winit", optional = true, version = "0.8.0-dev" }
bevy_gilrs = { path = "../bevy_gilrs", optional = true, version = "0.8.0-dev" } bevy_gilrs = { path = "../bevy_gilrs", optional = true, version = "0.8.0-dev" }
[target.'cfg(target_os = "android")'.dependencies] [target.'cfg(target_os = "android")'.dependencies]
ndk-glue = {version = "0.6", features = ["logger"]} # This version *must* be the same as the version used by winit,
# or Android will break: https://github.com/rust-windowing/winit#android
ndk-glue = {version = "0.5", features = ["logger"]}