From dc5a44cefc517bf282a1b6b141ce4ccce8cd287b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= Date: Thu, 1 Feb 2024 21:14:46 +0100 Subject: [PATCH] Update android-activity to 0.5.2, bump other Rust dependencies --- native/Cargo.lock | 337 +++++++++++++++++----------------------- native/Cargo.toml | 2 +- native/src/navigator.rs | 2 +- 3 files changed, 147 insertions(+), 194 deletions(-) diff --git a/native/Cargo.lock b/native/Cargo.lock index 1fe9b1b1..ac2ea6ba 100644 --- a/native/Cargo.lock +++ b/native/Cargo.lock @@ -55,12 +55,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - [[package]] name = "allocator-api2" version = "0.2.16" @@ -69,9 +63,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-activity" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b801912a977c3fd52d80511fe1c0c8480c6f957f21ae2ce1b92ffe970cf4b9" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", "bitflags 2.4.2", @@ -143,9 +137,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" [[package]] name = "anstyle-parse" @@ -331,7 +325,7 @@ dependencies = [ [[package]] name = "build_playerglobal" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "clap", "colored", @@ -353,9 +347,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" dependencies = [ "bytemuck_derive", ] @@ -439,14 +433,14 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -694,9 +688,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" dependencies = [ "darling_core", "darling_macro", @@ -704,9 +698,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" dependencies = [ "fnv", "ident_case", @@ -717,9 +711,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ "darling_core", "quote", @@ -1141,7 +1135,7 @@ dependencies = [ [[package]] name = "flv-rs" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "bitflags 2.4.2", "thiserror", @@ -1285,7 +1279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57b2e43b3fc51b9900cc9ced1c4630dcbfae1859573102a84d2231ac744c1208" dependencies = [ "gc-arena-derive", - "hashbrown 0.14.3", + "hashbrown", "sptr", ] @@ -1333,9 +1327,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1432,7 +1426,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.4.2", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -1460,7 +1454,7 @@ name = "h263-rs-deblock" version = "0.1.0" source = "git+https://github.com/ruffle-rs/h263-rs?rev=16700664e2b3334f0a930f99af86011aebee14cc#16700664e2b3334f0a930f99af86011aebee14cc" dependencies = [ - "itertools 0.11.0", + "itertools", "wide", ] @@ -1473,15 +1467,6 @@ dependencies = [ "wide", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.3" @@ -1600,12 +1585,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -1636,15 +1621,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.10" @@ -1722,9 +1698,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -1797,11 +1773,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -1883,22 +1859,13 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "metal" version = "0.27.0" @@ -1954,7 +1921,7 @@ dependencies = [ [[package]] name = "naga-agal" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "bitflags 2.4.2", "naga", @@ -1965,7 +1932,7 @@ dependencies = [ [[package]] name = "naga-pixelbender" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "anyhow", "bitflags 2.4.2", @@ -2057,18 +2024,6 @@ dependencies = [ "nihav_core", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", -] - [[package]] name = "nom" version = "7.1.3" @@ -2099,6 +2054,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.4.1" @@ -2216,31 +2177,6 @@ dependencies = [ "libredox", ] -[[package]] -name = "ouroboros" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" -dependencies = [ - "heck", - "itertools 0.12.0", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn 2.0.48", -] - [[package]] name = "owned_ttf_parser" version = "0.20.0" @@ -2396,33 +2332,11 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "proc-macro2-diagnostics" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", - "version_check", - "yansi", -] - [[package]] name = "profiling" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" - -[[package]] -name = "quick-xml" -version = "0.30.0" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] +checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" [[package]] name = "quick-xml" @@ -2525,9 +2439,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -2542,11 +2456,11 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "regress" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ed9969cad8051328011596bf549629f1b800cf1731e7964b1eef8dfc480d2c2" +checksum = "4f5f39ba4513916c1b2657b72af6ec671f091cd637992f58d0ede5cae4e5dea0" dependencies = [ - "hashbrown 0.13.2", + "hashbrown", "memchr", ] @@ -2581,7 +2495,7 @@ dependencies = [ [[package]] name = "ruffle_core" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "async-channel", "bitflags 2.4.2", @@ -2602,7 +2516,7 @@ dependencies = [ "fnv", "futures", "generational-arena", - "hashbrown 0.14.3", + "hashbrown", "image", "indexmap", "lzma-rs", @@ -2611,7 +2525,7 @@ dependencies = [ "num-derive", "num-traits", "percent-encoding", - "quick-xml 0.31.0", + "quick-xml", "rand", "realfft", "regress", @@ -2629,6 +2543,7 @@ dependencies = [ "thiserror", "tracing", "ttf-parser", + "unic-segment", "url", "wasm-bindgen-futures", "weak-table", @@ -2638,7 +2553,7 @@ dependencies = [ [[package]] name = "ruffle_gc_arena" version = "0.0.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "gc-arena", ] @@ -2646,7 +2561,7 @@ dependencies = [ [[package]] name = "ruffle_macros" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "quote", "syn 2.0.48", @@ -2655,7 +2570,7 @@ dependencies = [ [[package]] name = "ruffle_render" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "byteorder", "downcast-rs", @@ -2663,6 +2578,7 @@ dependencies = [ "flate2", "gif", "h263-rs-yuv", + "indexmap", "jpeg-decoder", "lru", "lyon", @@ -2682,7 +2598,7 @@ dependencies = [ [[package]] name = "ruffle_render_wgpu" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "bytemuck", "downcast-rs", @@ -2696,12 +2612,10 @@ dependencies = [ "naga-agal", "naga-pixelbender", "naga_oil", - "ouroboros", "raw-window-handle", "ruffle_render", "swf", "tracing", - "typed-arena", "web-sys", "wgpu", ] @@ -2709,7 +2623,7 @@ dependencies = [ [[package]] name = "ruffle_video" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "generational-arena", "ruffle_render", @@ -2720,7 +2634,7 @@ dependencies = [ [[package]] name = "ruffle_video_software" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "flate2", "generational-arena", @@ -2739,7 +2653,7 @@ dependencies = [ [[package]] name = "ruffle_wstr" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" [[package]] name = "rustc-demangle" @@ -2764,9 +2678,9 @@ dependencies = [ [[package]] name = "rustfft" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" dependencies = [ "num-complex", "num-integer", @@ -2779,9 +2693,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.2", "errno", @@ -2856,9 +2770,9 @@ checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] @@ -2877,9 +2791,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -2888,9 +2802,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "indexmap", "itoa", @@ -3047,7 +2961,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "swf" version = "0.2.0" -source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#262dff83a40e0b9537eafddb4e1e044bf37495a9" +source = "git+https://github.com/ruffle-rs/ruffle.git?branch=master#4154a0945ddff531b68e387fc409fd19367d653a" dependencies = [ "bitflags 2.4.2", "bitstream-io 2.2.0", @@ -3136,14 +3050,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", "syn 2.0.48", - "unicode-xid", ] [[package]] @@ -3188,12 +3101,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "fe80ced77cbfb4cb91a94bf72b378b4b6791a0d9b7f09d0be747d1bdff4e68bd" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -3208,10 +3122,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -3272,9 +3187,9 @@ checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", @@ -3338,10 +3253,25 @@ dependencies = [ ] [[package]] -name = "typed-arena" -version = "2.0.2" +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" [[package]] name = "unic-langid" @@ -3386,6 +3316,35 @@ dependencies = [ "unic-langid-impl", ] +[[package]] +name = "unic-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" +dependencies = [ + "unic-ucd-segment", +] + +[[package]] +name = "unic-ucd-segment" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -3532,13 +3491,13 @@ checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wayland-backend" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "nix", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -3546,12 +3505,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ "bitflags 2.4.2", - "nix", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -3569,20 +3528,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "nix", + "rustix", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.0" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ "bitflags 2.4.2", "wayland-backend", @@ -3618,12 +3577,12 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", - "quick-xml 0.30.0", + "quick-xml", "quote", ] @@ -3779,9 +3738,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b31891d644eba1789fb6715f27fbc322e4bdf2ecdc412ede1993246159271613" +checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c" dependencies = [ "bytemuck", "safe_arch", @@ -4091,9 +4050,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249" dependencies = [ "memchr", ] @@ -4161,12 +4120,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" -[[package]] -name = "yansi" -version = "1.0.0-rc.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" - [[package]] name = "zerocopy" version = "0.7.32" diff --git a/native/Cargo.toml b/native/Cargo.toml index 8f592242..2b4501aa 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -14,7 +14,7 @@ strip = "symbols" [dependencies] -android-activity = { version = "0.5.1", features = ["game-activity"] } +android-activity = { version = "0.5.2", features = ["game-activity"] } android_logger = "0.13.3" jni = "0.21.1" diff --git a/native/src/navigator.rs b/native/src/navigator.rs index 63d3282d..59b62680 100644 --- a/native/src/navigator.rs +++ b/native/src/navigator.rs @@ -143,7 +143,7 @@ impl NavigatorBackend for ExternalNavigatorBackend { } } - fn fetch(&self, request: Request) -> OwnedFuture { + fn fetch(&self, request: Request) -> OwnedFuture, ErrorResponse> { // TODO: honor sandbox type (local-with-filesystem, local-with-network, remote, ...) let mut processed_url = match self.resolve_url(request.url()) { Ok(url) => url,