Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cargo-apk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
20 changes: 10 additions & 10 deletions cargo-apk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
ndk-build = { path = "../ndk-build", version = "0.5.0" }
serde = "1.0.123"
thiserror = "1.0.23"
toml = "0.5.8"
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"
thiserror = "1.0.31"
toml = "0.5"
Comment on lines +14 to +22
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This passes -Zminimal-versions, I didn't bother to find the minimal working ones for anyhow/thiserror though.

2 changes: 2 additions & 0 deletions ndk-build/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))

Expand Down
14 changes: 7 additions & 7 deletions ndk-build/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"