diff --git a/Cargo.lock b/Cargo.lock index 7c319b82feb..5b244ffb4ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -162,12 +162,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - [[package]] name = "ash" version = "0.31.0" @@ -822,15 +816,13 @@ checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" [[package]] name = "combine" -version = "3.8.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +checksum = "b9417a0c314565e2abffaece67e95a8cb51f9238cd39f3764d9dfdf09e72b20c" dependencies = [ - "ascii", - "byteorder", - "either", + "bytes 0.5.5", "memchr", - "unreachable", + "pin-project-lite", ] [[package]] @@ -1595,16 +1587,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "error-chain" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be51ed50e75656c17216bdd4326914466db0c91b9b246b12962a00284d06566b" -dependencies = [ - "backtrace", - "version_check", -] - [[package]] name = "euclid" version = "0.20.14" @@ -2968,15 +2950,15 @@ dependencies = [ [[package]] name = "jni" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22bbdc25b49340bc4fc3d9c96dd84d878c4beeca35e3651efa53db51a68d7d4d" +checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf" dependencies = [ "cesu8", "combine", - "error-chain", "jni-sys", "log", + "thiserror", "walkdir", ] @@ -4514,9 +4496,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.7" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715" +checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-utils" @@ -6733,15 +6715,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - [[package]] name = "unwind-sys" version = "0.1.1" diff --git a/ports/libsimpleservo/jniapi/Cargo.toml b/ports/libsimpleservo/jniapi/Cargo.toml index 748653e1894..5019219baf0 100644 --- a/ports/libsimpleservo/jniapi/Cargo.toml +++ b/ports/libsimpleservo/jniapi/Cargo.toml @@ -17,7 +17,7 @@ bench = false android_injected_glue = "0.2" android_logger = "0.8" gstreamer = "0.15" -jni = "0.16.0" +jni = "0.18.0" libc = "0.2" log = "0.4" serde_json = "1.0"