Skip to content

Reduce duplicate dependencies on windows-sys and windows-targets #6516

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

Closed
mgoldenberg wants to merge 2 commits into from
Closed

Reduce duplicate dependencies on windows-sys and windows-targets #6516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68b75f0
chore(deps): bump reqwest to 0.13.3
mgoldenberg Apr 28, 2026
19f7d60
chore(deps): bump rustls-platform-verifier to 0.7.0
mgoldenberg Apr 28, 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
146 changes: 61 additions & 85 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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ proptest = { version = "1.9.0", default-features = false, features = ["std"] }
quote = { version = "1.0.37", default-features = false }
rand = { version = "0.10.1", default-features = false, features = ["std", "std_rng", "thread_rng"] }
regex = { version = "1.12.2", default-features = false }
reqwest = { version = "0.13.1", default-features = false }
reqwest = { version = "0.13.3", default-features = false }
rmp-serde = { version = "1.3.0", default-features = false }
ruma = { version = "0.15.1", features = [
"client-api-c",
Expand Down
4 changes: 1 addition & 3 deletions bindings/matrix-sdk-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,8 @@ uniffi = { workspace = true, features = ["tokio"] }

[target.'cfg(target_os = "android")'.dependencies]
paranoid-android = { version = "0.2.2", default-features = false }
# Needed for `rustls-platform-verifier`. Newer versions aren't compatible with it.
jni = "0.21.1"

@jmartinesp jmartinesp Apr 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We still need this for the Android bindings:

error[E0433]: failed to resolve: use of unresolved module or unlinked crate `jni`
 --> bindings/matrix-sdk-ffi/src/platform/android_platform.rs:3:5
  |
3 | use jni::{
  |     ^^^ use of unresolved module or unlinked crate `jni`
  |
  = help: if you wanted to use a crate named `jni`, use `cargo add jni` to add it to your `Cargo.toml`

@jmartinesp jmartinesp Apr 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

... and we can't upgrade to jni 0.22.x because jvm-getter doesn't support it 🫠

@mgoldenberg mgoldenberg Apr 30, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Too bad... 😭

I guess this will have to wait? Unless we can replace jvm-getter with something else?

@jmartinesp jmartinesp May 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think there's anything to replace it with... We could either contribute to it by updating their code so they use jni 0.22.x or maybe include the contents of the crate's lib.rs and android.rs files in the FFI layer and fix the incompatibilities there.

@poljar , @Hywan : WDYT?

@poljar poljar May 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Status update: An PR was opened to attempt to update upstream: gobley/jvm-getter#14.

# Used to access the credential storage on Android
rustls-platform-verifier = "0.6.2"
rustls-platform-verifier = "0.7.0"
# Needed for intializing and keeping the JavaVM reference around
once_cell = "1.21.4"
# Gobley's jvm-getter is used to get a JVM pointer from all Android versions
Expand Down
Loading