Skip to content

Commit db3ea33

Browse files
committed
Bump rust-version to 1.73.0
There was a fix for the definition of the `stat` struct on Android in 1.73, and even though it's unlikely to affect many applications it still seems worthwhile to draw a line under this and ensure that all android-activity based applications will have that fix. Rust 1.73 was released October 2023, which is still well over a year old and very conservative. This updates `generate-bindings.sh` to pass `--rust-target 1.73.0` so we avoid generating bindings that require a more recent compiler. (This doesn't actually regenerate the bindings but does ensure that future updates will be constrained to generate code that is backwards compatible with 1.73.)
1 parent 51d05d4 commit db3ea33

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
# See top README for MSRV policy
20-
rust-version: [1.69.0, stable]
20+
rust-version: [1.73.0, stable]
2121
steps:
2222
- uses: actions/checkout@v4
2323

android-activity/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
> - `Source::is_xxx_class()` functions are replaced by querying `Source::class()` and comparing against variants from the returned `SourceClass` `bitflags` enum.
1717
> - `SourceFlags::TRACKBALL` (from `Source::is_trackball_class()`) is named `SourceClass::NAVIGATION` in the `ndk`.
1818
19+
- rust-version bumped to 1.73.0 ([#193](https://github.com/rust-mobile/android-activity/pull/193))
20+
1921
## [0.6.0] - 2024-04-26
2022

2123
### Changed

android-activity/Cargo.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ documentation = "https://docs.rs/android-activity"
1010
description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
1111
license = "MIT OR Apache-2.0"
1212

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

2018
[features]
2119
# Note: we don't enable any backend by default since features

android-activity/generate-bindings.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ while read ARCH && read TARGET ; do
1414

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

0 commit comments

Comments
 (0)