From 8dfa6ce2f0346001f07af468068b0dd46b7c6d8f Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Fri, 4 Feb 2022 13:17:48 +0100 Subject: [PATCH] Update tts 0.19 -> 0.20 --- Cargo.lock | 115 ++++++++++++++++++++---------------------- egui-winit/Cargo.toml | 2 +- egui_web/Cargo.toml | 2 +- 3 files changed, 56 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 21debba75..3d6e3fd44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1859,7 +1859,20 @@ checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" dependencies = [ "bitflags", "jni-sys", - "ndk-sys", + "ndk-sys 0.2.2", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys 0.3.0", "num_enum", "thiserror", ] @@ -1873,9 +1886,23 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk", + "ndk 0.5.0", + "ndk-macro", + "ndk-sys 0.2.2", +] + +[[package]] +name = "ndk-glue" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c0d14b0858eb9962a5dac30b809b19f19da7e4547d64af2b0bb051d2e55d79" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk 0.6.0", "ndk-macro", - "ndk-sys", + "ndk-sys 0.3.0", ] [[package]] @@ -1897,6 +1924,15 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" version = "0.22.3" @@ -2456,7 +2492,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.30.0", + "windows", ] [[package]] @@ -2731,9 +2767,9 @@ dependencies = [ [[package]] name = "speech-dispatcher" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b684552615661fef2658506637989f8a8ead697c83c9a35a12d2a11bbd96955" +checksum = "c04e0e6004980d1b81d175356b8f7ecfaab345ce1a10e11af29639b6996a2050" dependencies = [ "lazy_static", "speech-dispatcher-sys", @@ -3004,9 +3040,9 @@ checksum = "4ccbe8381883510b6a2d8f1e32905bddd178c11caef8083086d0c0c9ab0ac281" [[package]] name = "tts" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dcd7e0cdd94949f55b94c24ccbb7922437883ec268dbbac23480db32287016" +checksum = "f3329496ed5cf3596f9e0726415774bf47558f1d2cb65c09f56c4297bde05ec9" dependencies = [ "cocoa-foundation", "dyn-clonable", @@ -3014,13 +3050,13 @@ dependencies = [ "lazy_static", "libc", "log", - "ndk-glue", + "ndk-glue 0.6.0", "objc", "speech-dispatcher", "thiserror", "wasm-bindgen", "web-sys", - "windows 0.29.0", + "windows", ] [[package]] @@ -3384,86 +3420,43 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3" -dependencies = [ - "windows_aarch64_msvc 0.29.0", - "windows_i686_gnu 0.29.0", - "windows_i686_msvc 0.29.0", - "windows_x86_64_gnu 0.29.0", - "windows_x86_64_msvc 0.29.0", -] - [[package]] name = "windows" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b749ebd2304aa012c5992d11a25d07b406bdbe5f79d371cb7a918ce501a19eb0" dependencies = [ - "windows_aarch64_msvc 0.30.0", - "windows_i686_gnu 0.30.0", - "windows_i686_msvc 0.30.0", - "windows_x86_64_gnu 0.30.0", - "windows_x86_64_msvc 0.30.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_msvc" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" - [[package]] name = "windows_aarch64_msvc" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" -[[package]] -name = "windows_i686_gnu" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" - [[package]] name = "windows_i686_gnu" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" -[[package]] -name = "windows_i686_msvc" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" - [[package]] name = "windows_i686_msvc" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" -[[package]] -name = "windows_x86_64_gnu" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" - [[package]] name = "windows_x86_64_gnu" version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" -[[package]] -name = "windows_x86_64_msvc" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" - [[package]] name = "windows_x86_64_msvc" version = "0.30.0" @@ -3487,9 +3480,9 @@ dependencies = [ "libc", "log", "mio", - "ndk", - "ndk-glue", - "ndk-sys", + "ndk 0.5.0", + "ndk-glue 0.5.0", + "ndk-sys 0.2.2", "objc", "parking_lot", "percent-encoding", diff --git a/egui-winit/Cargo.toml b/egui-winit/Cargo.toml index fe5715ea6..6897f547a 100644 --- a/egui-winit/Cargo.toml +++ b/egui-winit/Cargo.toml @@ -35,7 +35,7 @@ serde = { version = "1.0", optional = true, features = ["derive"] } webbrowser = { version = "0.5", optional = true } # feature screen_reader -tts = { version = "0.19", optional = true } +tts = { version = "0.20", optional = true } [features] default = ["clipboard", "dark-light", "links"] diff --git a/egui_web/Cargo.toml b/egui_web/Cargo.toml index d55bb8ccf..ec48f19a4 100644 --- a/egui_web/Cargo.toml +++ b/egui_web/Cargo.toml @@ -45,7 +45,7 @@ wasm-bindgen-futures = "0.4" # Optional: ron = { version = "0.7", optional = true } serde = { version = "1", optional = true } -tts = { version = "0.19", optional = true } # feature screen_reader +tts = { version = "0.20", optional = true } # feature screen_reader [features] default = ["default_fonts", "glow"]