From 82e0b31ebab3468a908bc7bc41eb020a64116a05 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 18 May 2023 13:08:07 -0300 Subject: [PATCH] change default feature to native-tls --- .github/workflows/test-rust.yml | 2 +- plugins/http/Cargo.toml | 2 +- plugins/updater/Cargo.toml | 2 +- plugins/upload/Cargo.toml | 2 +- plugins/websocket/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml index a9a1067a..66254085 100644 --- a/.github/workflows/test-rust.yml +++ b/.github/workflows/test-rust.yml @@ -140,7 +140,7 @@ jobs: sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libudev-dev - name: install openssl - if: ${{ matrix.platform == 'windows-latest' && matrix.package == 'tauri-plugin-authenticator' }} + if: ${{ matrix.platform == 'windows-latest' && contains(fromJSON('["tauri-plugin-http", "tauri-plugin-upload", "tauri-plugin-updater", "tauri-plugin-websocket", "tauri-plugin-authenticator"]'), matrix.package) }} run: | echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append vcpkg install openssl:x64-windows-static-md diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml index 40863f17..53c4a65f 100644 --- a/plugins/http/Cargo.toml +++ b/plugins/http/Cargo.toml @@ -19,7 +19,7 @@ http = "0.2" reqwest = { version = "0.11", default-features = false, features = [ "json", "stream" ] } [features] -default = [ "native-tls-vendored" ] +default = [ "native-tls" ] multipart = [ "reqwest/multipart" ] native-tls = [ "reqwest/native-tls" ] native-tls-vendored = [ "reqwest/native-tls-vendored" ] diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml index a5cd01ed..09ad0642 100644 --- a/plugins/updater/Cargo.toml +++ b/plugins/updater/Cargo.toml @@ -35,7 +35,7 @@ mockito = "0.31" tokio-test = "0.4.2" [features] -default = [ "native-tls-vendored" ] +default = [ "native-tls" ] native-tls = [ "reqwest/native-tls" ] native-tls-vendored = [ "reqwest/native-tls-vendored" ] rustls-tls = [ "reqwest/rustls-tls" ] diff --git a/plugins/upload/Cargo.toml b/plugins/upload/Cargo.toml index e027968e..cae33836 100644 --- a/plugins/upload/Cargo.toml +++ b/plugins/upload/Cargo.toml @@ -22,7 +22,7 @@ futures-util = "0.3" read-progress-stream = "1.0.0" [features] -default = [ "native-tls-vendored" ] +default = [ "native-tls" ] native-tls = [ "reqwest/native-tls" ] native-tls-vendored = [ "reqwest/native-tls-vendored" ] rustls-tls = [ "reqwest/rustls-tls" ] \ No newline at end of file diff --git a/plugins/websocket/Cargo.toml b/plugins/websocket/Cargo.toml index b396bf27..dd69f03d 100644 --- a/plugins/websocket/Cargo.toml +++ b/plugins/websocket/Cargo.toml @@ -21,7 +21,7 @@ tokio = { version = "1", features = ["net", "sync"] } tokio-tungstenite = { version = "0.18", features = ["native-tls"] } [features] -default = [ "native-tls-vendored" ] +default = [ "native-tls" ] native-tls = [ "tokio-tungstenite/native-tls" ] native-tls-vendored = [ "tokio-tungstenite/native-tls-vendored" ] rustls-tls-webpki-roots = [ "tokio-tungstenite/rustls-tls-webpki-roots" ]