Skip to content

Jni 0.22 neunenak #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
neunenak wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Jni 0.22 neunenak #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5bea30
Bump MSRV to 1.77.0
complexspaces Sep 13, 2025
cae50a9
Upgrade jni to 0.22
djc Sep 13, 2025
aa845f8
rust-version to 1.85
neunenak Mar 11, 2026
cd8b4d3
Bump toolchain in ci file
neunenak Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:

- uses: dtolnay/rust-toolchain@master
with:
toolchain: "1.71.0" # MSRV
toolchain: "1.85" # MSRV
components: clippy

- name: Install cargo-ndk.
Expand Down
166 changes: 76 additions & 90 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![crates.io version](https://img.shields.io/crates/v/rustls-platform-verifier.svg)](https://crates.io/crates/rustls-platform-verifier)
[![crate documentation](https://docs.rs/rustls-platform-verifier/badge.svg)](https://docs.rs/rustls-platform-verifier)
![MSRV](https://img.shields.io/badge/rustc-1.64+-blue.svg)
![MSRV](https://img.shields.io/badge/rustc-1.77+-blue.svg)
[![crates.io downloads](https://img.shields.io/crates/d/rustls-platform-verifier.svg)](https://crates.io/crates/rustls-platform-verifier)
![CI](https://github.com/1Password/rustls-platform-verifier/workflows/CI/badge.svg)

Expand Down
6 changes: 3 additions & 3 deletions rustls-platform-verifier/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords = ["tls", "certificate", "verification", "os", "native"]
repository = "https://github.com/rustls/rustls-platform-verifier"
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.71.0"
rust-version = "1.85"
Copy link
Member

@ctz ctz Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need a matching change in ci.yml, in fact just squash this into the first commit and the needed changes will reveal themselves

Copy link
Author

@neunenak neunenak Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ctz can you mention this on #193 ? I don't intrinsically care about this particular PR, I would just like to see the upgrade to jni 0.22 happen so I can use that version of rustls-platform-verifier myself, and I was trying to see if updating the rust version would fix the android/nix CI issues that are plaguing that other PR.


[lib]
name = "rustls_platform_verifier"
Expand All @@ -28,7 +28,7 @@ docsrs = ["jni", "once_cell"]
rustls = { version = "0.23.27", default-features = false, features = ["std"] }
log = { version = "0.4" }
base64 = { version = "0.22", optional = true } # Only used when the `cert-logging` feature is enabled.
jni = { version = "0.21", default-features = false, optional = true } # Only used during doc generation
jni = { version = "0.22", default-features = false, optional = true } # Only used during doc generation
once_cell = { version = "1.9", optional = true } # Only used during doc generation

[target.'cfg(all(unix, not(target_os = "android"), not(target_vendor = "apple"), not(target_arch = "wasm32")))'.dependencies]
Expand All @@ -38,7 +38,7 @@ webpki = { package = "rustls-webpki", version = "0.103", default-features = fals
[target.'cfg(target_os = "android")'.dependencies]
once_cell = "1.9"
rustls-platform-verifier-android = { path = "../android-release-support", version = "0.1.0" }
jni = { version = "0.21", default-features = false }
jni = { version = "0.22", default-features = false }
webpki = { package = "rustls-webpki", version = "0.103", default-features = false }
android_logger = { version = "0.15", optional = true } # Only used during testing.

Expand Down
Loading
Loading