Skip to content

Commit

Permalink
Bump MSRV to 1.69.0 considering we can't build cargo ndk with 1.68
Browse files Browse the repository at this point in the history
cargo ndk will fail to build with 1.68 due to a toml_edit dep.

Technically android-activity itself should still build with 1.68
but it's simpler to synchronize the `rust-version` with the minimum
version that we actually test in CI (where we need to build cargo ndk)
  • Loading branch information
rib committed Apr 26, 2024
1 parent c9faa9c commit 05a42d9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
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.68.0, stable]
rust-version: [1.69.0, stable]
steps:
- uses: actions/checkout@v4

Expand Down
1 change: 1 addition & 0 deletions android-activity/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

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


## [0.5.2] - 2024-01-30
Expand Down
4 changes: 2 additions & 2 deletions android-activity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ 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.68 was when Rust last updated the Android NDK version used to build the
# 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.68.0"
rust-version = "1.69.0"

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

0 comments on commit 05a42d9

Please sign in to comment.