diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31e1bdc6d..82bc529cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -228,7 +228,7 @@ jobs: java-version: "17" - name: Setup Android SDK - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2 + uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4 - name: Setup Android NDK uses: arqu/setup-ndk@4f8a02c22e2c17ff9ebba9026e599da847aa8374 # main @@ -283,7 +283,7 @@ jobs: java-version: "17" - name: Setup Android SDK - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2 + uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4 - name: Setup Android NDK uses: arqu/setup-ndk@4f8a02c22e2c17ff9ebba9026e599da847aa8374 # main diff --git a/.pinact.yaml b/.pinact.yaml index cb3a9d077..fd23001b8 100644 --- a/.pinact.yaml +++ b/.pinact.yaml @@ -24,3 +24,9 @@ rules: # baseline feature landed upstream. - expr: | ActionName == "n0-computer/cargo-semver-checks-action" + - min_age: 0 + conditions: + # v4.0.2+ stops installing the `tools` SDK package, which Google no + # longer serves; every older release fails. Remove after 2026-09-24. + - expr: | + ActionName == "android-actions/setup-android" && VersionComment == "v4.0.4" diff --git a/Cargo.lock b/Cargo.lock index e8930ee9a..7eecda014 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -327,23 +327,24 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-lc-fips-sys" -version = "0.13.13" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bce4948d2520386c6d92a6ea2d472300257702242e5a1d01d6add52bd2e7c1" +checksum = "03367707e92796b190a4207d4d39b0a4271d574503d2969c2b0cfbf5c87658ee" dependencies = [ "bindgen", "cc", "cmake", "dunce", "fs_extra", + "pkg-config", "regex", ] [[package]] name = "aws-lc-rs" -version = "1.16.2" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" +checksum = "b281d307588d634de920874890732659e2e7672f72b5e10e81badc1a8a83621e" dependencies = [ "aws-lc-fips-sys", "aws-lc-sys", @@ -352,14 +353,15 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.39.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa7e52a4c5c547c741610a2c6f123f3881e409b714cd27e6798ef020c514f0a" +checksum = "9bff6c3b54fad79a2e60b8102caf565819711497c1f5f092f49508e2f5c31b27" dependencies = [ "cc", "cmake", "dunce", "fs_extra", + "pkg-config", ] [[package]] @@ -2107,6 +2109,12 @@ dependencies = [ "futures-io", ] +[[package]] +name = "pkg-config" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" + [[package]] name = "polling" version = "3.11.0" @@ -2430,9 +2438,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.42" +version = "0.23.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138" +checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" dependencies = [ "aws-lc-rs", "log", @@ -2495,9 +2503,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.13" +version = "0.103.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" dependencies = [ "aws-lc-rs", "ring", diff --git a/Cargo.toml b/Cargo.toml index 74a2fa688..2ad943281 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,8 +68,8 @@ windows-sys = { version = "0.61", features = ["Win32_Foundation", "Win32_System_ async-executor = "1.13.0" async-fs = "2.1" async-global-executor = "2.4.1" -aws-lc-fips-sys = "0.13.10" -aws-lc-sys = "0.39.0" +aws-lc-fips-sys = "0.14.2" +aws-lc-sys = "0.45.0" gcc = "0.3.55" http = "1.1.0" lazy_static = "1.5.0"