From 7d36455f8b850ce716debcef551f86fc7fa9ecaf Mon Sep 17 00:00:00 2001 From: msiglreith Date: Tue, 20 Oct 2020 00:30:28 +0200 Subject: [PATCH] Explicitly set docs.rs targets and bump versions to 0.2.1/0.5.3 (#82) --- cargo-apk/CHANGELOG.md | 2 ++ cargo-apk/Cargo.toml | 2 +- ndk-glue/CHANGELOG.md | 4 ++++ ndk-glue/Cargo.toml | 14 +++++++++++--- ndk-sys/CHANGELOG.md | 4 ++++ ndk-sys/Cargo.toml | 10 +++++++--- ndk-sys/src/lib.rs | 11 ++++------- ndk/CHANGELOG.md | 4 ++++ ndk/Cargo.toml | 18 +++++++++++------- 9 files changed, 48 insertions(+), 21 deletions(-) diff --git a/cargo-apk/CHANGELOG.md b/cargo-apk/CHANGELOG.md index 27681526..1eb2e825 100644 --- a/cargo-apk/CHANGELOG.md +++ b/cargo-apk/CHANGELOG.md @@ -1,5 +1,7 @@ # Unreleased +# 0.5.3 (2020-10-15) + - Fix `res` folder resolve. # 0.5.2 (2020-09-15) diff --git a/cargo-apk/Cargo.toml b/cargo-apk/Cargo.toml index c6a7a03a..685a4129 100644 --- a/cargo-apk/Cargo.toml +++ b/cargo-apk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-apk" -version = "0.5.2" +version = "0.5.3" authors = ["The Rust Windowing contributors"] edition = "2018" description = "Helps cargo build APKs" diff --git a/ndk-glue/CHANGELOG.md b/ndk-glue/CHANGELOG.md index b5d6db36..91230363 100644 --- a/ndk-glue/CHANGELOG.md +++ b/ndk-glue/CHANGELOG.md @@ -1,5 +1,9 @@ # Unreleased +# 0.2.1 (2020-10-15) + +- Fix documentation build on docs.rs + # 0.2.0 (2020-09-15) - **Breaking:** Removed `ndk_glue` macro in favor of new `main` attribute macro. diff --git a/ndk-glue/Cargo.toml b/ndk-glue/Cargo.toml index b1fa6dc1..37785c9e 100644 --- a/ndk-glue/Cargo.toml +++ b/ndk-glue/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ndk-glue" -version = "0.2.0" +version = "0.2.1" authors = ["The Rust Windowing contributors"] edition = "2018" description = "Startup code for android binaries" @@ -12,8 +12,8 @@ homepage = "https://github.com/rust-windowing/android-ndk-rs" repository = "https://github.com/rust-windowing/android-ndk-rs" [dependencies] -ndk = { path = "../ndk", version = "0.2.0" } -ndk-sys = { path = "../ndk-sys", version = "0.2.0" } +ndk = { path = "../ndk", version = "0.2.1" } +ndk-sys = { path = "../ndk-sys", version = "0.2.1" } ndk-macro = { path = "../ndk-macro", version = "0.2.0" } lazy_static = "1.4.0" libc = "0.2.66" @@ -23,3 +23,11 @@ android_logger = { version = "0.8.6", optional = true } [features] default = [] logger = ["android_logger", "ndk-macro/logger"] + +[package.metadata.docs.rs] +targets = [ + "aarch64-linux-android", + "armv7-linux-androideabi", + "i686-linux-android", + "x86_64-linux-android", +] diff --git a/ndk-sys/CHANGELOG.md b/ndk-sys/CHANGELOG.md index 04c4bd2c..a37e05b0 100644 --- a/ndk-sys/CHANGELOG.md +++ b/ndk-sys/CHANGELOG.md @@ -1,5 +1,9 @@ # Unreleased +# 0.2.1 (2020-10-15) + +- Fix documentation build on docs.rs + # 0.2.0 (2020-09-15) - **Breaking:** `onSaveInstanceState` signature corrected to take `outSize` as a `*mut size_t` instead of `*mut usize`. diff --git a/ndk-sys/Cargo.toml b/ndk-sys/Cargo.toml index 42e5b64d..181e7024 100644 --- a/ndk-sys/Cargo.toml +++ b/ndk-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ndk-sys" -version = "0.2.0" +version = "0.2.1" authors = ["The Rust Windowing contributors"] edition = "2018" description = "FFI bindings for the Android NDK" @@ -12,11 +12,15 @@ homepage = "https://github.com/rust-windowing/android-ndk-rs" repository = "https://github.com/rust-windowing/android-ndk-rs" [features] -rustdoc = [] test = [] aaudio = [] bitmap = [] media = [] [package.metadata.docs.rs] -features = ["rustdoc"] +targets = [ + "aarch64-linux-android", + "armv7-linux-androideabi", + "i686-linux-android", + "x86_64-linux-android", +] diff --git a/ndk-sys/src/lib.rs b/ndk-sys/src/lib.rs index c91bb76a..36bc9f9c 100644 --- a/ndk-sys/src/lib.rs +++ b/ndk-sys/src/lib.rs @@ -14,15 +14,12 @@ // Test setup lints #![cfg_attr(test, allow(dead_code))] -#[cfg(not(any(target_os = "android", feature = "test", feature = "rustdoc")))] +#[cfg(not(any(target_os = "android", feature = "test")))] compile_error!("android-ndk-sys only supports compiling for Android"); -#[cfg(any( - all( - any(target_os = "android", feature = "test"), - any(target_arch = "arm", target_arch = "armv7") - ), - feature = "rustdoc" +#[cfg(all( + any(target_os = "android", feature = "test"), + any(target_arch = "arm", target_arch = "armv7") ))] include!("ffi_arm.rs"); diff --git a/ndk/CHANGELOG.md b/ndk/CHANGELOG.md index c191fd7d..2bd586bb 100644 --- a/ndk/CHANGELOG.md +++ b/ndk/CHANGELOG.md @@ -1,5 +1,9 @@ # Unreleased +# 0.2.1 (2020-10-15) + +- Fix documentation build on docs.rs + # 0.2.0 (2020-09-15) - **Breaking:** Updated to use [ndk-sys 0.2.0](../ndk-sys/CHANGELOG.md#020-2020-09-15) diff --git a/ndk/Cargo.toml b/ndk/Cargo.toml index cb83027e..95a9c811 100644 --- a/ndk/Cargo.toml +++ b/ndk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ndk" -version = "0.2.0" +version = "0.2.1" authors = ["The Rust Windowing contributors"] edition = "2018" description = "Safe Rust bindings to the Android NDK" @@ -12,8 +12,6 @@ homepage = "https://github.com/rust-windowing/android-ndk-rs" repository = "https://github.com/rust-windowing/android-ndk-rs" [features] -rustdoc = ["ffi/rustdoc", "jni", "jni-glue", "all"] - all = ["aaudio", "bitmap", "hardware_buffer", "media", "trace", "api-level-30"] aaudio = ["ffi/aaudio", "api-level-26"] @@ -28,9 +26,6 @@ api-level-26 = ["api-level-24"] api-level-29 = ["api-level-26"] api-level-30 = ["api-level-29"] -[package.metadata.docs.rs] -features = ["rustdoc"] - [dependencies] num_enum = "0.4.2" jni-sys = "0.3.0" @@ -47,4 +42,13 @@ optional = true [dependencies.ffi] package = "ndk-sys" path = "../ndk-sys" -version = "0.2.0" +version = "0.2.1" + +[package.metadata.docs.rs] +features = ["jni", "jni-glue", "all"] +targets = [ + "aarch64-linux-android", + "armv7-linux-androideabi", + "i686-linux-android", + "x86_64-linux-android", +]