diff --git a/native/Cargo.lock b/native/Cargo.lock index 713132d..56a70c6 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -19,7 +19,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.89", + "syn", ] [[package]] @@ -34,12 +34,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cexpr" version = "0.6.0" @@ -83,7 +77,7 @@ version = "1.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn", ] [[package]] @@ -156,23 +150,52 @@ dependencies = [ [[package]] name = "jni" -version = "0.19.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" dependencies = [ - "cesu8", + "cfg-if", "combine", + "jni-macros", "jni-sys", "log", + "simd_cesu8", "thiserror", "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn", ] [[package]] name = "jni-sys" -version = "0.3.0" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn", +] [[package]] name = "libc" @@ -228,7 +251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.89", + "syn", ] [[package]] @@ -270,6 +293,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "same-file" version = "1.0.6" @@ -279,6 +311,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "semver" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" + [[package]] name = "shlex" version = "1.3.0" @@ -286,16 +324,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] -name = "syn" -version = "1.0.109" +name = "simd_cesu8" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "rustc_version", + "simdutf8", ] +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "syn" version = "2.0.89" @@ -309,22 +352,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.31" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -374,3 +417,9 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" diff --git a/native/chromium/Cargo.toml b/native/chromium/Cargo.toml index 9d5aa34..6e45d35 100644 --- a/native/chromium/Cargo.toml +++ b/native/chromium/Cargo.toml @@ -9,7 +9,7 @@ crate-type = ["rlib"] [dependencies] chromium_jni_utils = { path = "../chromium_jni_utils/" } chromium_jni_macro = { path = "../chromium_jni_macro/" } -jni = "0.19.0" +jni = "0.22.4" winapi = { version = "0.3.9", features = ["winuser", "libloaderapi"] } [features] diff --git a/native/chromium_jni/Cargo.toml b/native/chromium_jni/Cargo.toml index 4d55095..bd9b8a6 100644 --- a/native/chromium_jni/Cargo.toml +++ b/native/chromium_jni/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -jni = "0.19.0" +jni = "0.22.4" chromium = { path = "../chromium/" } chromium_swt = { path = "../chromium_swt/" } chromium_jni_macro = { path = "../chromium_jni_macro/" } diff --git a/native/chromium_jni_utils/Cargo.toml b/native/chromium_jni_utils/Cargo.toml index bddee1a..a573289 100644 --- a/native/chromium_jni_utils/Cargo.toml +++ b/native/chromium_jni_utils/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -jni = "0.19.0" +jni = "0.22.4" [lib] crate-type = ["rlib"] diff --git a/native/chromium_swt/Cargo.toml b/native/chromium_swt/Cargo.toml index e3b609c..581d98a 100644 --- a/native/chromium_swt/Cargo.toml +++ b/native/chromium_swt/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["rlib"] path = "src/lib.rs" [dependencies] -jni = "0.19.0" +jni = "0.22.4" chromium = { path = "../chromium/" } chromium_subp = { path = "../chromium_subp/" } chromium_jni_macro = { path = "../chromium_jni_macro/" }