From b525ddadf7e7588c3e195cf0f821c9862c545d06 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Wed, 20 Mar 2024 19:15:58 -0300 Subject: [PATCH] fix(cli): openssl is no longer a required macOS dep (#9237) --- .changes/cli-openssl-cargo-mobile2-removal.md | 6 ++ tooling/cli/Cargo.lock | 90 ++++++++++++++++--- tooling/cli/Cargo.toml | 8 +- 3 files changed, 85 insertions(+), 19 deletions(-) create mode 100644 .changes/cli-openssl-cargo-mobile2-removal.md diff --git a/.changes/cli-openssl-cargo-mobile2-removal.md b/.changes/cli-openssl-cargo-mobile2-removal.md new file mode 100644 index 000000000..f6ae732e4 --- /dev/null +++ b/.changes/cli-openssl-cargo-mobile2-removal.md @@ -0,0 +1,6 @@ +--- +"@tauri-apps/cli": patch:enhance +"tauri-cli": patch:enhance +--- + +`openssl` is no longer a required dependency on macOS. diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index a94d40b6f..fab7d1ef8 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -293,6 +293,16 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bcder" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627747a6774aab38beb35990d88309481378558875a41da1a4b2e373c906ef0" +dependencies = [ + "bytes", + "smallvec", +] + [[package]] name = "beef" version = "0.5.2" @@ -473,9 +483,9 @@ dependencies = [ [[package]] name = "cargo-mobile2" -version = "0.10.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4151a9a0e09e3acc2695c326cfdcf0b5ce5b04ab617cea6405a085f639b001" +checksum = "e6eb3459f8fb1fd0e12ca229db09cd763befe00827061cc5aaf6bdf173dad37c" dependencies = [ "colored", "core-foundation", @@ -486,14 +496,13 @@ dependencies = [ "english-numbers", "freedesktop_entry_parser", "handlebars 4.5.0", - "heck", + "heck 0.5.0", "home", "ignore", "java-properties", "libc", "log", "once-cell-regex", - "openssl", "os_info", "os_pipe", "path_abs", @@ -505,6 +514,7 @@ dependencies = [ "ureq", "which", "windows", + "x509-certificate", ] [[package]] @@ -613,7 +623,7 @@ version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.52", @@ -1834,6 +1844,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" @@ -2032,7 +2048,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -3233,6 +3249,16 @@ dependencies = [ "hmac", ] +[[package]] +name = "pem" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +dependencies = [ + "base64 0.21.7", + "serde", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -4840,7 +4866,7 @@ dependencies = [ "flate2", "glob", "handlebars 5.1.0", - "heck", + "heck 0.4.1", "hex", "image", "log", @@ -4891,7 +4917,7 @@ dependencies = [ "env_logger", "glob", "handlebars 5.1.0", - "heck", + "heck 0.4.1", "html5ever", "ignore", "image", @@ -4967,7 +4993,7 @@ dependencies = [ "ctor", "dunce", "getrandom 0.2.12", - "heck", + "heck 0.4.1", "html5ever", "infer 0.13.0", "json-patch", @@ -4997,7 +5023,7 @@ dependencies = [ "dunce", "getrandom 0.2.12", "glob", - "heck", + "heck 0.4.1", "html5ever", "infer 0.15.0", "json-patch", @@ -5897,11 +5923,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-core", + "windows-core 0.54.0", "windows-targets 0.52.4", ] @@ -5914,6 +5940,25 @@ dependencies = [ "windows-targets 0.52.4", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-result" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +dependencies = [ + "windows-targets 0.52.4", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -6115,6 +6160,25 @@ dependencies = [ "zeroize", ] +[[package]] +name = "x509-certificate" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66534846dec7a11d7c50a74b7cdb208b9a581cad890b7866430d438455847c85" +dependencies = [ + "bcder", + "bytes", + "chrono", + "der", + "hex", + "pem", + "ring", + "signature", + "spki", + "thiserror", + "zeroize", +] + [[package]] name = "xattr" version = "1.3.1" diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index df5dfe8c3..03886c199 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -39,7 +39,7 @@ name = "cargo-tauri" path = "src/main.rs" [dependencies] -cargo-mobile2 = { version = "0.10.3", default-features = false } +cargo-mobile2 = { version = "0.11", default-features = false } jsonrpsee = { version = "0.22", features = [ "server" ] } jsonrpsee-core = "0.22" jsonrpsee-client-transport = { version = "0.22", features = [ "ws" ] } @@ -113,11 +113,7 @@ native-tls = [ "cargo-mobile2/native-tls", "ureq/native-tls" ] -native-tls-vendored = [ - "native-tls", - "tauri-bundler/native-tls-vendored", - "cargo-mobile2/openssl-vendored" -] +native-tls-vendored = [ "native-tls", "tauri-bundler/native-tls-vendored" ] rustls = [ "tauri-bundler/rustls", "cargo-mobile2/rustls", "ureq/tls" ] [profile.release-size-optimized]