From c0bd78b30450dea114c432cac7b8d6f64cd51692 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 11 Jun 2022 10:10:53 +0200
Subject: [PATCH 1/2] Release ndk-build-0.6.0, cargo-apk-0.9.2

Moves the NDK r23 `-lgcc` workaround to `ndk_build::cargo::cargo_ndk()`,
so that `cargo apk --` blanket invocations receive it too.  This should
solve `winit` CI failures again now that GitHub Actions Virtual
Enviroments are finishing up the migration to NDK r23.
---
 cargo-apk/CHANGELOG.md | 4 +++-
 cargo-apk/Cargo.toml   | 4 ++--
 ndk-build/CHANGELOG.md | 2 ++
 ndk-build/Cargo.toml   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cargo-apk/CHANGELOG.md b/cargo-apk/CHANGELOG.md
index 5fafa1ce..57819aa1 100644
--- a/cargo-apk/CHANGELOG.md
+++ b/cargo-apk/CHANGELOG.md
@@ -1,12 +1,14 @@
 # Unreleased
 
+# 0.9.2 (2022-06-11)
+
 - Move NDK r23 `-lgcc` workaround to `ndk_build::cargo::cargo_ndk()`, to also apply to our `cargo apk --` invocations. ([#286](https://github.com/rust-windowing/android-ndk-rs/pull/286))
 - Disable `aapt` compression for the [(default) `dev` profile](https://doc.rust-lang.org/cargo/reference/profiles.html). ([#283](https://github.com/rust-windowing/android-ndk-rs/pull/283))
 - Append `--target` to blanket `cargo apk --` calls when not provided by the user. ([#287](https://github.com/rust-windowing/android-ndk-rs/pull/287))
 
 # 0.9.1 (2022-05-12)
 
-- Reimplement NDK r23 `-lgcc` workaround using `RUSTFLAGS`, to apply to transitive `cdylib` compilations (#270)
+- Reimplement NDK r23 `-lgcc` workaround using `RUSTFLAGS`, to apply to transitive `cdylib` compilations. (#270)
 
 # 0.9.0 (2022-05-07)
 
diff --git a/cargo-apk/Cargo.toml b/cargo-apk/Cargo.toml
index a742e79e..22cfd67a 100644
--- a/cargo-apk/Cargo.toml
+++ b/cargo-apk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-apk"
-version = "0.9.1"
+version = "0.9.2"
 authors = ["The Rust Windowing contributors"]
 edition = "2018"
 description = "Helps cargo build APKs"
@@ -16,7 +16,7 @@ cargo-subcommand = "0.7.0"
 dunce = "1.0.1"
 env_logger = "0.8.2"
 log = "0.4.14"
-ndk-build = { path = "../ndk-build", version = "0.5.0" }
+ndk-build = { path = "../ndk-build", version = "0.6.0" }
 serde = "1.0.123"
 thiserror = "1.0.23"
 toml = "0.5.8"
diff --git a/ndk-build/CHANGELOG.md b/ndk-build/CHANGELOG.md
index 0c26275a..116513f6 100644
--- a/ndk-build/CHANGELOG.md
+++ b/ndk-build/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+# 0.6.0 (2022-06-11)
+
 - **Breaking:** Provide NDK r23 `-lgcc` workaround in `cargo_ndk()` function, now requiring `target_dir` as argument. ([#286](https://github.com/rust-windowing/android-ndk-rs/pull/286))
 - **Breaking:** Add `disable_aapt_compression` field to `ApkConfig` to disable `aapt` compression. ([#283](https://github.com/rust-windowing/android-ndk-rs/pull/283))
 
diff --git a/ndk-build/Cargo.toml b/ndk-build/Cargo.toml
index 64c9e402..d0f04d3e 100644
--- a/ndk-build/Cargo.toml
+++ b/ndk-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ndk-build"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["The Rust Windowing contributors"]
 edition = "2018"
 description = "Utilities for building Android binaries"

From 5451ed235fa9021d41348a626b6616faefe8c0d6 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 11 Jun 2022 10:36:32 +0200
Subject: [PATCH 2/2] ndk-build,cargo-apk: Bump all dependencies to the latest
 version

---
 cargo-apk/Cargo.toml | 16 ++++++++--------
 ndk-build/Cargo.toml | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cargo-apk/Cargo.toml b/cargo-apk/Cargo.toml
index 22cfd67a..828537d3 100644
--- a/cargo-apk/Cargo.toml
+++ b/cargo-apk/Cargo.toml
@@ -11,12 +11,12 @@ homepage = "https://github.com/rust-windowing/android-ndk-rs"
 repository = "https://github.com/rust-windowing/android-ndk-rs"
 
 [dependencies]
-anyhow = "1.0.38"
-cargo-subcommand = "0.7.0"
-dunce = "1.0.1"
-env_logger = "0.8.2"
-log = "0.4.14"
+anyhow = "1.0.57"
+cargo-subcommand = "0.7"
+dunce = "1"
+env_logger = "0.9"
+log = "0.4"
 ndk-build = { path = "../ndk-build", version = "0.6.0" }
-serde = "1.0.123"
-thiserror = "1.0.23"
-toml = "0.5.8"
+serde = "1"
+thiserror = "1.0.31"
+toml = "0.5"
diff --git a/ndk-build/Cargo.toml b/ndk-build/Cargo.toml
index d0f04d3e..e045113d 100644
--- a/ndk-build/Cargo.toml
+++ b/ndk-build/Cargo.toml
@@ -11,9 +11,9 @@ homepage = "https://github.com/rust-windowing/android-ndk-rs"
 repository = "https://github.com/rust-windowing/android-ndk-rs"
 
 [dependencies]
-dirs = "3.0.1"
-dunce = "1.0.1"
-serde = { version = "1.0.123", features = ["derive"] }
-quick-xml = { version = "0.20.0", features = ["serialize"] }
-thiserror = "1.0.23"
-which = "4.0.2"
+dirs = "4"
+dunce = "1"
+quick-xml = { version = "0.23", features = ["serialize"] }
+serde = { version = "1", features = ["derive"] }
+thiserror = "1"
+which = "4"