Skip to content

Commit

Permalink
Merge pull request #103 from rust-mobile/rib/pr/msrv-1.68
Browse files Browse the repository at this point in the history
Bump MSRV to 1.68
  • Loading branch information
rib committed Aug 3, 2023
2 parents ed2dc53 + 66cfc68 commit c0a9e20
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
6 changes: 2 additions & 4 deletions .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.64.0, stable]
rust_version: [1.68.0, stable]
steps:
- uses: actions/checkout@v3

Expand All @@ -34,9 +34,7 @@ jobs:
i686-linux-android
- name: Install cargo-ndk
# We're currently sticking with cargo-ndk 2, until we bump our
# MSRV to 1.68+
run: cargo install cargo-ndk --version "^2"
run: cargo install cargo-ndk

- name: Setup Java
uses: actions/setup-java@v3
Expand Down
2 changes: 1 addition & 1 deletion android-activity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository = "https://github.com/rust-mobile/android-activity"
documentation = "https://docs.rs/android-activity"
description = "Glue for building Rust applications on Android with NativeActivity or GameActivity"
license = "MIT OR Apache-2.0"
rust-version = "1.64"
rust-version = "1.68.0"

[features]
# Note: we don't enable any backend by default since features
Expand Down
1 change: 0 additions & 1 deletion android-activity/src/game_activity/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,6 @@ extern "Rust" {
// `app_main` function. This is run on a dedicated thread spawned
// by android_native_app_glue.
#[no_mangle]
#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
abort_on_panic(|| {
// Maybe make this stdout/stderr redirection an optional / opt-in feature?...
Expand Down
1 change: 0 additions & 1 deletion android-activity/src/native_activity/glue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,6 @@ unsafe extern "C" fn on_content_rect_changed(

/// This is the native entrypoint for our cdylib library that `ANativeActivity` will look for via `dlsym`
#[no_mangle]
#[allow(unused_unsafe)] // Otherwise rust 1.64 moans about using unsafe{} in unsafe functions
extern "C" fn ANativeActivity_onCreate(
activity: *mut ndk_sys::ANativeActivity,
saved_state: *const libc::c_void,
Expand Down

0 comments on commit c0a9e20

Please sign in to comment.