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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
# See top README for MSRV policy
rust-version: [1.69.0, stable]
rust-version: [1.73.0, stable]
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 2 additions & 0 deletions android-activity/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
> - `Source::is_xxx_class()` functions are replaced by querying `Source::class()` and comparing against variants from the returned `SourceClass` `bitflags` enum.
> - `SourceFlags::TRACKBALL` (from `Source::is_trackball_class()`) is named `SourceClass::NAVIGATION` in the `ndk`.

- rust-version bumped to 1.73.0 ([#193](https://github.com/rust-mobile/android-activity/pull/193))

## [0.6.0] - 2024-04-26

### Changed
Expand Down
10 changes: 4 additions & 6 deletions android-activity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ documentation = "https://docs.rs/android-activity"
description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
license = "MIT OR Apache-2.0"

# 1.69 was when Rust last updated the Android NDK version used to build the
# standard library which avoids needing the -lunwind workaround in build tools.
#
# We depend on cargo-ndk for building which has dropped support for the above
# linker workaround.
rust-version = "1.69.0"
# Even though we could technically still build with 1.69, 1.73 has a fix for the
# definition of the `stat` struct on Android, and so it seems worthwhile drawing
# a line under that to ensure android-activity applications have that fix.
rust-version = "1.73.0"

[features]
# Note: we don't enable any backend by default since features
Expand Down
1 change: 1 addition & 0 deletions android-activity/generate-bindings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ while read ARCH && read TARGET ; do

# --module-raw-line 'use '
bindgen game-activity-ffi.h -o src/game_activity/ffi_$ARCH.rs \
--rust-target '1.73.0' \
--blocklist-item 'JNI\w+' \
--blocklist-item 'C?_?JNIEnv' \
--blocklist-item '_?JavaVM' \
Expand Down