From c30067aad3fe7314ac737d621c1a0244849fb307 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Wed, 28 Aug 2024 00:00:24 +0300 Subject: [PATCH] raise msrv to 1.71 --- .github/workflows/test-core.yml | 12 +++++------ Cargo.toml | 2 +- bench/Cargo.toml | 2 +- .../tests/cpu_intensive/src-tauri/Cargo.toml | 6 ++---- .../tests/files_transfer/src-tauri/Cargo.toml | 6 ++---- bench/tests/helloworld/src-tauri/Cargo.toml | 6 ++---- crates/tauri-bundler/Cargo.toml | 15 ++++---------- crates/tauri-cli/Cargo.toml | 20 ++++--------------- .../app/src-tauri/Cargo.crate-manifest | 2 +- .../templates/plugin/Cargo.crate-manifest | 2 +- .../tauri-app/src-tauri/Cargo.crate-manifest | 2 +- .../vanilla/src-tauri/Cargo.crate-manifest | 2 +- crates/tauri-macos-sign/Cargo.toml | 2 +- examples/api/src-tauri/Cargo.toml | 7 ++----- .../file-associations/src-tauri/Cargo.toml | 2 +- examples/resources/src-tauri/Cargo.toml | 2 +- 16 files changed, 31 insertions(+), 59 deletions(-) diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index d8573159da5a..6d1cc90fe4fb 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -37,35 +37,35 @@ jobs: - { target: x86_64-pc-windows-msvc, os: windows-latest, - toolchain: '1.70.0', + toolchain: '1.71.0', cross: false, command: 'test' } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, - toolchain: '1.70.0', + toolchain: '1.71.0', cross: false, command: 'test' } - { target: aarch64-apple-darwin, os: macos-14, - toolchain: '1.70.0', + toolchain: '1.71.0', cross: false, command: 'test' } - { target: aarch64-apple-ios, os: macos-latest, - toolchain: '1.70.0', + toolchain: '1.71.0', cross: false, command: 'build' } - { target: aarch64-linux-android, os: ubuntu-latest, - toolchain: '1.70.0', + toolchain: '1.71.0', cross: true, command: 'build' } @@ -99,7 +99,7 @@ jobs: - name: test (using cross) if: ${{ matrix.platform.cross }} - # update or remove the rev once we update the MSRV from 1.70.0 + # update or remove the rev once we update the MSRV from 1.71.0 run: | cargo install cross --git https://github.com/cross-rs/cross --rev 20c73df79c9aaf78a2ad2e9fe8ae981668a729dc --locked cross ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }} --manifest-path crates/tauri/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml index 01030d5d6190..ae61bd6fe677 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ repository = "https://github.com/tauri-apps/tauri" categories = ["gui", "web-programming"] license = "Apache-2.0 OR MIT" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" # default to small, optimized workspace release binaries [profile.release] diff --git a/bench/Cargo.toml b/bench/Cargo.toml index 8235978ba43a..4756b4cf2180 100644 --- a/bench/Cargo.toml +++ b/bench/Cargo.toml @@ -3,7 +3,7 @@ name = "tauri_bench" version = "0.1.0" authors = ["Tauri Programme within The Commons Conservancy"] edition = "2021" -rust-version = "1.70" +rust-version = "1.71" license = "Apache-2.0 OR MIT" description = "Cross-platform WebView rendering library" repository = "https://github.com/tauri-apps/wry" diff --git a/bench/tests/cpu_intensive/src-tauri/Cargo.toml b/bench/tests/cpu_intensive/src-tauri/Cargo.toml index f99ddd77d59a..fee4300bcb43 100644 --- a/bench/tests/cpu_intensive/src-tauri/Cargo.toml +++ b/bench/tests/cpu_intensive/src-tauri/Cargo.toml @@ -3,12 +3,10 @@ name = "bench_cpu_intensive" version = "0.1.0" description = "A very simple Tauri Application" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" [build-dependencies] -tauri-build = { path = "../../../../crates/tauri-build", features = [ - "codegen", -] } +tauri-build = { path = "../../../../crates/tauri-build", features = ["codegen"] } [dependencies] serde_json = "1.0" diff --git a/bench/tests/files_transfer/src-tauri/Cargo.toml b/bench/tests/files_transfer/src-tauri/Cargo.toml index 0b9169b29d10..92d15439c2ed 100644 --- a/bench/tests/files_transfer/src-tauri/Cargo.toml +++ b/bench/tests/files_transfer/src-tauri/Cargo.toml @@ -3,12 +3,10 @@ name = "bench_files_transfer" version = "0.1.0" description = "A very simple Tauri Application" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" [build-dependencies] -tauri-build = { path = "../../../../crates/tauri-build", features = [ - "codegen", -] } +tauri-build = { path = "../../../../crates/tauri-build", features = ["codegen"] } [dependencies] serde_json = "1.0" diff --git a/bench/tests/helloworld/src-tauri/Cargo.toml b/bench/tests/helloworld/src-tauri/Cargo.toml index f3a1dd7efd6f..be5952897bca 100644 --- a/bench/tests/helloworld/src-tauri/Cargo.toml +++ b/bench/tests/helloworld/src-tauri/Cargo.toml @@ -3,12 +3,10 @@ name = "bench_helloworld" version = "0.1.0" description = "A very simple Tauri Application" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" [build-dependencies] -tauri-build = { path = "../../../../crates/tauri-build", features = [ - "codegen", -] } +tauri-build = { path = "../../../../crates/tauri-build", features = ["codegen"] } [dependencies] serde_json = "1.0" diff --git a/crates/tauri-bundler/Cargo.toml b/crates/tauri-bundler/Cargo.toml index fed50f08a6fe..910d1c4482e0 100644 --- a/crates/tauri-bundler/Cargo.toml +++ b/crates/tauri-bundler/Cargo.toml @@ -1,23 +1,18 @@ [package] name = "tauri-bundler" version = "2.0.1-rc.5" -authors = [ - "George Burton ", - "Tauri Programme within The Commons Conservancy", -] +authors = ["George Burton ", "Tauri Programme within The Commons Conservancy"] categories = ["command-line-utilities", "development-tools::cargo-plugins"] license = "Apache-2.0 OR MIT" keywords = ["bundle", "cargo", "tauri"] repository = "https://github.com/tauri-apps/tauri" description = "Wrap rust executables in OS-specific app bundles for Tauri" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"] [dependencies] -tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = [ - "resources", -] } +tauri-utils = { version = "2.0.0-rc.6", path = "../tauri-utils", features = ["resources"] } image = "0.25.0" flate2 = "1.0" anyhow = "1.0" @@ -32,9 +27,7 @@ tempfile = "3.10.1" log = { version = "0.4.21", features = ["kv"] } dirs = "5" os_pipe = "1" -ureq = { version = "2.9.6", default-features = false, features = [ - "socks-proxy", -] } +ureq = { version = "2.9.6", default-features = false, features = ["socks-proxy"] } native-tls = { version = "0.2", optional = true } hex = "0.4" semver = "1" diff --git a/crates/tauri-cli/Cargo.toml b/crates/tauri-cli/Cargo.toml index bb25d065cd04..af1310c4af6c 100644 --- a/crates/tauri-cli/Cargo.toml +++ b/crates/tauri-cli/Cargo.toml @@ -3,7 +3,7 @@ name = "tauri-cli" version = "2.0.0-rc.7" authors = ["Tauri Programme within The Commons Conservancy"] edition = "2021" -rust-version = "1.70" +rust-version = "1.71" categories = ["gui", "web-programming"] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" @@ -86,11 +86,7 @@ os_pipe = "1" ignore = "0.4" ctrlc = "3.4" log = { version = "0.4.21", features = ["kv", "kv_std"] } -env_logger = { version = "0.11.5", default-features = false, features = [ - "auto-color", - "humantime", - "regex", -] } +env_logger = "0.11.5" icns = { package = "tauri-icns", version = "0.1" } image = { version = "0.25", default-features = false, features = ["ico"] } axum = { version = "0.7.4", features = ["ws"] } @@ -122,11 +118,7 @@ pretty_assertions = "1" [target."cfg(windows)".dependencies.windows-sys] version = "0.59" -features = [ - "Win32_Storage_FileSystem", - "Win32_System_IO", - "Win32_System_Console", -] +features = ["Win32_Storage_FileSystem", "Win32_System_IO", "Win32_System_Console"] [target."cfg(unix)".dependencies] libc = "0.2" @@ -137,10 +129,6 @@ tauri-macos-sign = { version = "0.1.1-rc.0", path = "../tauri-macos-sign" } [features] default = ["rustls"] -native-tls = [ - "tauri-bundler/native-tls", - "cargo-mobile2/native-tls", - "ureq/native-tls", -] +native-tls = ["tauri-bundler/native-tls", "cargo-mobile2/native-tls", "ureq/native-tls"] native-tls-vendored = ["native-tls", "tauri-bundler/native-tls-vendored"] rustls = ["tauri-bundler/rustls", "cargo-mobile2/rustls", "ureq/tls"] diff --git a/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest b/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest index 8f1429d35f9c..9f30822607da 100644 --- a/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest +++ b/crates/tauri-cli/templates/app/src-tauri/Cargo.crate-manifest @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/tauri-cli/templates/plugin/Cargo.crate-manifest b/crates/tauri-cli/templates/plugin/Cargo.crate-manifest index e49074d36782..b5a37912a5e1 100644 --- a/crates/tauri-cli/templates/plugin/Cargo.crate-manifest +++ b/crates/tauri-cli/templates/plugin/Cargo.crate-manifest @@ -4,7 +4,7 @@ version = "0.1.0" authors = [ "{{ author }}" ] description = "" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" exclude = ["/examples", "/webview-dist", "/webview-src", "/node_modules"] links = "tauri-plugin-{{ plugin_name }}" diff --git a/crates/tauri-cli/templates/plugin/__example-api/tauri-app/src-tauri/Cargo.crate-manifest b/crates/tauri-cli/templates/plugin/__example-api/tauri-app/src-tauri/Cargo.crate-manifest index 96624d4b8a46..db40be7dbc16 100644 --- a/crates/tauri-cli/templates/plugin/__example-api/tauri-app/src-tauri/Cargo.crate-manifest +++ b/crates/tauri-cli/templates/plugin/__example-api/tauri-app/src-tauri/Cargo.crate-manifest @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" [lib] name = "tauri_app_lib" diff --git a/crates/tauri-cli/templates/plugin/__example-basic/vanilla/src-tauri/Cargo.crate-manifest b/crates/tauri-cli/templates/plugin/__example-basic/vanilla/src-tauri/Cargo.crate-manifest index 09b2aed44720..eb68eab61830 100644 --- a/crates/tauri-cli/templates/plugin/__example-basic/vanilla/src-tauri/Cargo.crate-manifest +++ b/crates/tauri-cli/templates/plugin/__example-basic/vanilla/src-tauri/Cargo.crate-manifest @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" [lib] name = "tauri_app_lib" diff --git a/crates/tauri-macos-sign/Cargo.toml b/crates/tauri-macos-sign/Cargo.toml index c2d55cdd139e..330f1b8e1b46 100644 --- a/crates/tauri-macos-sign/Cargo.toml +++ b/crates/tauri-macos-sign/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["codesign", "signing", "macos", "ios", "tauri"] repository = "https://github.com/tauri-apps/tauri" description = "Code signing utilities for macOS and iOS apps" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" [dependencies] anyhow = "1" diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index 29875b37f341..2fecdcf43029 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -3,7 +3,7 @@ name = "api" version = "0.1.0" description = "An example Tauri Application showcasing the api" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" license = "Apache-2.0 OR MIT" [lib] @@ -11,10 +11,7 @@ name = "api_lib" crate-type = ["staticlib", "cdylib", "lib"] [build-dependencies] -tauri-build = { path = "../../../crates/tauri-build", features = [ - "codegen", - "isolation", -] } +tauri-build = { path = "../../../crates/tauri-build", features = ["codegen", "isolation"] } [dependencies] serde_json = "1.0" diff --git a/examples/file-associations/src-tauri/Cargo.toml b/examples/file-associations/src-tauri/Cargo.toml index fede17022076..f43956199c03 100644 --- a/examples/file-associations/src-tauri/Cargo.toml +++ b/examples/file-associations/src-tauri/Cargo.toml @@ -3,7 +3,7 @@ name = "tauri-file-associations-demo" version = "0.1.0" description = "A Tauri application that associate file types" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" [build-dependencies] tauri-build = { path = "../../../crates/tauri-build", features = ["codegen"] } diff --git a/examples/resources/src-tauri/Cargo.toml b/examples/resources/src-tauri/Cargo.toml index 410741b660f8..e0cb342c0189 100644 --- a/examples/resources/src-tauri/Cargo.toml +++ b/examples/resources/src-tauri/Cargo.toml @@ -3,7 +3,7 @@ name = "resources" version = "0.1.0" description = "A Tauri application that uses Node.js with app resources" edition = "2021" -rust-version = "1.70" +rust-version = "1.71" [build-dependencies] tauri-build = { path = "../../../crates/tauri-build", features = ["codegen"] }