From b887e906b4c75bf368489bc47d5b149ac82c8e75 Mon Sep 17 00:00:00 2001 From: kuviman Date: Tue, 18 Jun 2024 20:05:01 +0400 Subject: [PATCH] specify git version of batbox --- Cargo.lock | 644 +++++++++++++++++++++++------------------------------ Cargo.toml | 44 ++-- 2 files changed, 306 insertions(+), 382 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 16441024..384d4796 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,27 +82,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "android-activity" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" -dependencies = [ - "android-properties", - "bitflags 2.5.0", - "cc", - "cesu8", - "jni 0.21.1", - "jni-sys", - "libc", - "log", - "ndk 0.8.0", - "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", - "thiserror", -] - [[package]] name = "android-activity" version = "0.6.0" @@ -113,14 +92,14 @@ dependencies = [ "bitflags 2.5.0", "cc", "cesu8", - "jni 0.21.1", + "jni", "jni-sys", "libc", "log", "ndk 0.9.0", "ndk-context", "ndk-sys 0.6.0+11769913", - "num_enum 0.7.2", + "num_enum", "thiserror", ] @@ -336,7 +315,7 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.1", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", @@ -497,8 +476,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "batbox" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1152dd08d3ee256b7167a63a34ac708064cd38bcbba75af65c4aef8a4f1a3d70" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "anyhow", "async-compat", @@ -534,7 +512,7 @@ dependencies = [ "futures", "getrandom 0.2.15", "http", - "itertools 0.11.0", + "itertools 0.12.1", "js-sys", "libc", "log", @@ -560,21 +538,19 @@ dependencies = [ [[package]] name = "batbox-android" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6be4e007487d4533304a31618de0ae8325b0cfab064b80c47a0ad770d099bf8" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ - "android-activity 0.5.2", - "jni 0.21.1", - "ndk 0.8.0", + "android-activity", + "jni", + "ndk 0.9.0", "ndk-context", - "oboe 0.5.0", + "oboe", ] [[package]] name = "batbox-approx" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987cbe82ac30c149bf576bfe3b1a5493a7e55a8d81470688434919aebf57e6d" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "batbox-num", ] @@ -582,8 +558,7 @@ dependencies = [ [[package]] name = "batbox-cli" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c604fbba5fe320b41b425b934a3d90924cb86c9dc18625f83abff8ad6a14322f" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "clap", "log", @@ -594,8 +569,7 @@ dependencies = [ [[package]] name = "batbox-cmp" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23bdfd4ef0439071fa7349508eeecb9868837d9476a990d94baea3be936e1c1" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "batbox-range", ] @@ -603,8 +577,7 @@ dependencies = [ [[package]] name = "batbox-collection" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8afc8c965a6f53ebc8358a245b43f1b68a808808819e2a21a6fc9148fc3258b" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "batbox-collection-derive", "batbox-diff", @@ -614,8 +587,7 @@ dependencies = [ [[package]] name = "batbox-collection-derive" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd836e3e560bed24a5c0b18837b678d448b0c7deb7541cb9f18c984f6034ed6" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "darling", "proc-macro2", @@ -627,8 +599,7 @@ dependencies = [ [[package]] name = "batbox-color" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027359e740850a3d09f69f01c1cac59c4086b535e51a6caba486ba7c5834e158" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "anyhow", "batbox-approx", @@ -639,8 +610,7 @@ dependencies = [ [[package]] name = "batbox-diff" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08e1fcac0e446497ebf160cdc7e4b2ad6b001ecadffa49f874c6709f1b93f0c5" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "batbox-diff-derive", "serde", @@ -649,8 +619,7 @@ dependencies = [ [[package]] name = "batbox-diff-derive" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfc57c4538dbcf2720a5dc4b4693dc586ef5bf3db25e7d4242548e1568b588a" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "darling", "proc-macro2", @@ -661,8 +630,7 @@ dependencies = [ [[package]] name = "batbox-file" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac333b8037640f31a78a3e548fafbc335d146ae4f71a16e4d01ed0906bb8852" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "anyhow", "async-compat", @@ -687,8 +655,7 @@ dependencies = [ [[package]] name = "batbox-file-dialog" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c2793763b430aa60534a583a17dcda8df07389302a5cbd3d7fe057c14a7c3e" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "anyhow", "batbox-file", @@ -702,8 +669,7 @@ dependencies = [ [[package]] name = "batbox-i18n" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c87ae9f22da31fd67deb476b938ecffc2e9999269b19a0eaf88c2525a8af6c0" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "batbox-i18n-macro", "libc", @@ -715,8 +681,7 @@ dependencies = [ [[package]] name = "batbox-i18n-macro" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbeba8e90e51ee57fb8dd9c789fbb18c7e2004c55e572f1fd7c8abed0b513e39" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "proc-macro2", "quote", @@ -727,8 +692,7 @@ dependencies = [ [[package]] name = "batbox-la" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d1afdda5d1a6d626898f74f7d8527f19feb93bfde68dd8a8a627ec1a2b681b" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "batbox-approx", "batbox-cmp", @@ -741,8 +705,7 @@ dependencies = [ [[package]] name = "batbox-lapp" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30614605739a5e84c1e9348fbc82a8a49256f765f775f52a3e46145805ead719" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "batbox-approx", "batbox-cmp", @@ -754,8 +717,7 @@ dependencies = [ [[package]] name = "batbox-logger" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a4b4c63a5dd432c3cc125b69a764ed963cbe6a9814f103c8bf730e14333948" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "backtrace", "env_logger", @@ -767,8 +729,7 @@ dependencies = [ [[package]] name = "batbox-num" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4c2099e667ebcc3b538e0daa42a4416f7dc3d0ae525d45a01d9bdc9e745161" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "getrandom 0.2.15", "rand 0.8.5", @@ -778,9 +739,10 @@ dependencies = [ [[package]] name = "batbox-preferences" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6987749bf65cb4a4e757b24ccea1fd69171ea58e4c5c4be4ce57ac1c5ef100" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ + "batbox-android", + "cfg-if 1.0.0", "directories", "log", "serde", @@ -791,14 +753,12 @@ dependencies = [ [[package]] name = "batbox-range" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bdebab933c64f7d0f44c303da72ce34e170059de0f2e3797b1e7d78f614a1" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" [[package]] name = "batbox-time" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe578fafcb8d94f2be12c01fa014b0ab58af25e0f637e1778ce403fb92675b4" +source = "git+https://github.com/geng-engine/batbox#71c8b1134c5d29d53996cb24c0627efd076be1e5" dependencies = [ "async-std", "js-sys", @@ -863,9 +823,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.3.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8" [[package]] name = "block-buffer" @@ -976,7 +936,7 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.5.0", "log", - "polling 3.7.1", + "polling 3.7.2", "rustix 0.38.34", "slab", "thiserror", @@ -1225,13 +1185,13 @@ dependencies = [ "core-foundation-sys", "coreaudio-rs", "dasp_sample", - "jni 0.21.1", + "jni", "js-sys", "libc", "mach2", "ndk 0.8.0", "ndk-context", - "oboe 0.6.1", + "oboe", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -1388,15 +1348,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -1488,17 +1448,27 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -2109,7 +2079,7 @@ dependencies = [ "js-sys", "log", "rand 0.8.5", - "raw-window-handle 0.6.2", + "raw-window-handle", "serde", "strum", "ugli", @@ -2263,7 +2233,7 @@ dependencies = [ "objc2-app-kit", "objc2-foundation", "once_cell", - "raw-window-handle 0.6.2", + "raw-window-handle", "wayland-sys", "windows-sys 0.52.0", "x11-dl", @@ -2276,7 +2246,7 @@ source = "git+https://github.com/rust-windowing/glutin#3296c9af3e9db47e72429698a dependencies = [ "cfg_aliases", "glutin", - "raw-window-handle 0.6.2", + "raw-window-handle", "winit", ] @@ -2306,25 +2276,6 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes 1.6.0", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "half" version = "2.4.1" @@ -2353,6 +2304,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hound" version = "3.5.1" @@ -2372,9 +2329,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes 1.6.0", "fnv", @@ -2383,26 +2340,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes 1.6.0", "http", - "pin-project-lite", ] [[package]] -name = "httparse" -version = "1.9.3" +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes 1.6.0", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] [[package]] -name = "httpdate" -version = "1.0.3" +name = "httparse" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "humantime" @@ -2412,40 +2375,59 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes 1.6.0", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes 1.6.0", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2685,7 +2667,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -2705,32 +2687,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "is_terminal_polyfill" version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -2755,20 +2717,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - [[package]] name = "jni" version = "0.21.1" @@ -3005,9 +2953,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3041,9 +2989,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -3104,20 +3052,6 @@ dependencies = [ "ws2_32-sys", ] -[[package]] -name = "ndk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum 0.5.11", - "raw-window-handle 0.5.2", - "thiserror", -] - [[package]] name = "ndk" version = "0.8.0" @@ -3128,8 +3062,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", - "raw-window-handle 0.6.2", + "num_enum", "thiserror", ] @@ -3143,8 +3076,8 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.6.0+11769913", - "num_enum 0.7.2", - "raw-window-handle 0.6.2", + "num_enum", + "raw-window-handle", "thiserror", ] @@ -3154,15 +3087,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.5.0+25.2.9519653" @@ -3258,17 +3182,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-derive" version = "0.4.2" @@ -3315,38 +3228,17 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - [[package]] name = "num_enum" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] @@ -3355,7 +3247,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.66", @@ -3573,41 +3465,18 @@ dependencies = [ "memchr", ] -[[package]] -name = "oboe" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" -dependencies = [ - "jni 0.20.0", - "ndk 0.7.0", - "ndk-context", - "num-derive 0.3.3", - "num-traits", - "oboe-sys 0.5.0", -] - [[package]] name = "oboe" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.21.1", + "jni", "ndk 0.8.0", "ndk-context", - "num-derive 0.4.2", + "num-derive", "num-traits", - "oboe-sys 0.6.1", -] - -[[package]] -name = "oboe-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" -dependencies = [ - "cc", + "oboe-sys", ] [[package]] @@ -3679,7 +3548,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", "windows-targets 0.52.5", ] @@ -3782,13 +3651,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.1" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix 0.38.34", "tracing", @@ -3810,16 +3679,6 @@ dependencies = [ "num-integer", ] -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -3894,6 +3753,53 @@ dependencies = [ "memchr", ] +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes 1.6.0", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes 1.6.0", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.7", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -3995,7 +3901,7 @@ dependencies = [ "maybe-rayon", "new_debug_unreachable", "noop_proc_macro", - "num-derive 0.4.2", + "num-derive", "num-traits", "once_cell", "paste", @@ -4011,9 +3917,9 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.5" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" dependencies = [ "avif-serialize", "imgref", @@ -4024,12 +3930,6 @@ dependencies = [ "rgb", ] -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - [[package]] name = "raw-window-handle" version = "0.6.2" @@ -4076,9 +3976,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.5.0", ] @@ -4125,20 +4025,20 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes 1.6.0", - "encoding_rs", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4146,13 +4046,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-rustls", "tokio-util", @@ -4297,32 +4198,42 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ - "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -4365,16 +4276,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sctk-adwaita" version = "0.9.0" @@ -4614,6 +4515,12 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + [[package]] name = "switch-resume" version = "0.1.3" @@ -4835,9 +4742,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "synstructure" @@ -4850,27 +4757,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "system-deps" version = "6.2.2" @@ -4890,15 +4776,6 @@ version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.61" @@ -4984,6 +4861,21 @@ dependencies = [ "zerovec", ] +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokio" version = "1.38.0" @@ -5001,11 +4893,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] @@ -5043,17 +4936,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -5078,6 +4960,27 @@ dependencies = [ "winnow 0.6.13", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5091,9 +4994,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "tracing-core" version = "0.1.32" @@ -5144,7 +5059,7 @@ dependencies = [ "glutin", "image", "log", - "num_enum 0.7.2", + "num_enum", "puffin", "serde", "serde-wasm-bindgen", @@ -5495,9 +5410,9 @@ dependencies = [ [[package]] name = "web-audio-api" -version = "0.45.1" +version = "0.45.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eec6bae8695169036a4695a589b61ac36252608e0248f2239c229a665a6dbafe" +checksum = "72c120a553d7d1a012b5c2a417868209035e4e9bd9442742532b7889500d5c12" dependencies = [ "arc-swap", "arrayvec", @@ -5544,9 +5459,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weezl" @@ -5833,12 +5751,12 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.30.1" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763759577d7e92f618ecaca2f5fe415512cae924cfc9460d1c48e1c616c716aa" +checksum = "1dc930d6cfbf53c4fe0b95689cdc2e17b8658c3f4214b9953298ccb5a1a15c90" dependencies = [ "ahash", - "android-activity 0.6.0", + "android-activity", "atomic-waker", "bitflags 2.5.0", "block2", @@ -5861,7 +5779,7 @@ dependencies = [ "orbclient", "percent-encoding", "pin-project", - "raw-window-handle 0.6.2", + "raw-window-handle", "redox_syscall 0.4.1", "rustix 0.38.34", "sctk-adwaita", @@ -5903,9 +5821,9 @@ dependencies = [ [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if 1.0.0", "windows-sys 0.48.0", @@ -6079,6 +5997,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + [[package]] name = "zerovec" version = "0.10.2" diff --git a/Cargo.toml b/Cargo.toml index fcf41c9d..bb08b9f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,28 +22,28 @@ version = "0.18.0" [workspace.dependencies] # Batbox -batbox = "0.16" -batbox-android = "0.16" -batbox-tuple-macros = "0.16" -batbox-i18n = "0.16" -batbox-i18n-macro = "0.16" -batbox-num = "0.16" -batbox-approx = "0.16" -batbox-color = "0.16" -batbox-time = "0.16" -batbox-file = "0.16" -batbox-file-dialog = "0.16" -batbox-preferences = "0.16" -batbox-cli = "0.16" -batbox-logger = "0.16" -batbox-diff = "0.16" -batbox-diff-derive = "0.16" -batbox-collection = "0.16" -batbox-collection-derive = "0.16" -batbox-range = "0.16" -batbox-cmp = "0.16" -batbox-la = "0.16" -batbox-lapp = "0.16" +batbox = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-android = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-tuple-macros = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-i18n = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-i18n-macro = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-num = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-approx = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-color = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-time = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-file = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-file-dialog = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-preferences = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-cli = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-logger = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-diff = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-diff-derive = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-collection = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-collection-derive = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-range = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-cmp = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-la = { version = "0.16", git = "https://github.com/geng-engine/batbox" } +batbox-lapp = { version = "0.16", git = "https://github.com/geng-engine/batbox" } # Ugli ugli = { version = "0.18", path = "crates/ugli" }