Merge branch 'master' into kchibisov/ignore-cargo

rust-windowing · Apr 27, 2024 · 2e54ba9 · 2e54ba9
2 parents 3b39ff1 + 304a585
commit 2e54ba9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -103,9 +103,8 @@ softbuffer = { version = "0.4.0", default-features = false, features = [
 ] }
 
 [target.'cfg(target_os = "android")'.dependencies]
-android-activity = "0.5.0"
-ndk = { version = "0.8.0", default-features = false }
-ndk-sys = "0.5.0"
+android-activity = "0.6.0"
+ndk = { version = "0.9.0", default-features = false }
 
 [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
 core-foundation = "0.9.3"

diff --git a/src/changelog/unreleased.md b/src/changelog/unreleased.md
@@ -91,6 +91,8 @@ changelog entry.
 - On macOS, return `HandleError::Unavailable` when a window handle is not available.
 - On Windows, remove `WS_CAPTION`, `WS_BORDER`, and `WS_EX_WINDOWEDGE` styles
   for child windows without decorations.
+- On Android, bump `ndk` to `0.9.0` and `android-activity` to `0.6.0`,
+  and remove unused direct dependency on `ndk-sys`.
 
 ### Deprecated