From a20cda380d2d2d44ac38572ad87d27b42a844213 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Mon, 11 Nov 2024 11:47:45 +0100
Subject: [PATCH] Bump dependency patch-versions to fix `-Zminimal-versions`
 and MSRV check

Use `-Zminimal-versions` in our MSRV check.  This not only ensures
our minimum version bounds are actually solid and tested (even if
they may be a bit conservative at times, i.e. we could allow older
versions except for the crates that are bumped in this patch which were
explicitly build-tested), it also allows us to use this as a base for
the MSRV test, and preempt us from failing it whenever a (transitive!)
dependency bumps its MSRV beyond ours in a *semver-compatible* release.
---
 .github/workflows/ci.yml    | 14 ++++++++++++++
 android-activity/Cargo.toml |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db32199..9f258e4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # Downgrade all dependencies to their minimum version, both to ensure our
+      # minimum version bounds are correct and buildable, as well as to satisfy
+      # our MSRV check when arbitrary dependencies bump their MSRV beyond our
+      # MSRV in a patch-release.
+      # This implies that downstream consumers can only rely on our MSRV when
+      # downgrading various (indirect) dependencies.
+      - uses: hecrj/setup-rust-action@v2
+        with:
+          rust-version: nightly
+        if: ${{ matrix.rust-version != 'stable' }}
+      - name: Downgrade dependencies
+        run: cargo +nightly generate-lockfile -Zminimal-versions
+        if: ${{ matrix.rust-version != 'stable' }}
+
       - uses: hecrj/setup-rust-action@v2
         with:
           rust-version: ${{ matrix.rust-version }}
diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index c05ad3f..56e7aeb 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -36,15 +36,15 @@ cesu8 = "1"
 jni = "0.21"
 ndk-sys = "0.6.0"
 ndk = { version = "0.9.0", default-features = false }
-ndk-context = "0.1"
+ndk-context = "0.1.1"
 android-properties = "0.2"
 num_enum = "0.7"
 bitflags = "2.0"
-libc = "0.2"
+libc = "0.2.139"
 thiserror = "1"
 
 [build-dependencies]
-cc = { version = "1.0", features = ["parallel"] }
+cc = { version = "1.0.42", features = ["parallel"] }
 
 [package.metadata.docs.rs]
 targets = [