From 7a10b83c99d37bbb8795afdc6b9b659e3721ef3b Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Tue, 17 Oct 2023 08:26:02 -0300 Subject: [PATCH] chore: bump MSRV to 1.74 --- .changes/msrv-1.74.md | 13 +++++++++++++ .github/workflows/test-core.yml | 19 +++++-------------- Cargo.toml | 2 +- examples/api/src-tauri/Cargo.toml | 2 +- .../file-associations/src-tauri/Cargo.toml | 2 +- examples/resources/src-tauri/Cargo.toml | 2 +- .../tauri-dynamic-lib/src-app1/Cargo.toml | 2 +- .../tauri-dynamic-lib/src-tauri/Cargo.toml | 2 +- examples/web/core/tauri/Cargo.toml | 2 +- examples/workspace/src-tauri/Cargo.toml | 2 +- tooling/bench/Cargo.toml | 2 +- .../tests/cpu_intensive/src-tauri/Cargo.toml | 2 +- .../tests/files_transfer/src-tauri/Cargo.toml | 2 +- .../tests/helloworld/src-tauri/Cargo.toml | 2 +- tooling/bundler/Cargo.toml | 2 +- tooling/cli/Cargo.toml | 2 +- .../jest/fixtures/app/src-tauri/Cargo.toml | 2 +- .../app/src-tauri/Cargo.crate-manifest | 2 +- .../cli/templates/plugin/Cargo.crate-manifest | 2 +- .../tauri-app/src-tauri/Cargo.crate-manifest | 2 +- .../vanilla/src-tauri/Cargo.crate-manifest | 2 +- 21 files changed, 37 insertions(+), 33 deletions(-) create mode 100644 .changes/msrv-1.74.md diff --git a/.changes/msrv-1.74.md b/.changes/msrv-1.74.md new file mode 100644 index 000000000000..c9e9056cdb76 --- /dev/null +++ b/.changes/msrv-1.74.md @@ -0,0 +1,13 @@ +--- +"tauri-cli": 'minor:feat' +"tauri-bundler": 'minor:feat' +"tauri": 'minor:feat' +"tauri-build": 'minor:feat' +"tauri-codegen": 'minor:feat' +"tauri-macros": 'minor:feat' +"tauri-utils": 'minor:feat' +"tauri-runtime": 'minor:feat' +"tauri-runtime-wry": 'minor:feat' +--- + +Bump the MSRV to 1.74. diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index 2ec2093b3f1f..c0985c0e5ab1 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -34,35 +34,35 @@ jobs: - { target: x86_64-pc-windows-msvc, os: windows-latest, - toolchain: '1.65.0', + toolchain: '1.74.0', cross: false, command: 'test' } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, - toolchain: '1.65.0', + toolchain: '1.74.0', cross: false, command: 'test' } - { target: x86_64-apple-darwin, os: macos-latest, - toolchain: '1.65.0', + toolchain: '1.74.0', cross: false, command: 'test' } - { target: aarch64-apple-ios, os: macos-latest, - toolchain: '1.65.0', + toolchain: '1.74.0', cross: false, command: 'build' } - { target: aarch64-linux-android, os: ubuntu-latest, - toolchain: '1.65.0', + toolchain: '1.74.0', cross: true, command: 'build' } @@ -98,15 +98,6 @@ jobs: workspaces: core -> ../target save-if: ${{ matrix.features.key == 'all' }} - - name: Downgrade crates with MSRV conflict - # The --precise flag can only be used once per invocation. - run: | - cargo update -p time --precise 0.3.23 - cargo update -p toml@0.7.8 --precise 0.7.6 - cargo update -p toml_edit@0.19.15 --precise 0.19.14 - cargo update -p cfg-expr@0.15.5 --precise 0.15.4 - cargo update -p system-deps --precise 6.1.1 - - name: test uses: actions-rs/cargo@v1 with: diff --git a/Cargo.toml b/Cargo.toml index 65e68fbf1b6f..7052e9970449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ repository = "https://github.com/tauri-apps/tauri" categories = ["gui", "web-programming"] license = "Apache-2.0 OR MIT" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" # default to small, optimized workspace release binaries [profile.release] diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index a70dda3e2374..78e0e635653e 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.65" +rust-version = "1.74" license = "Apache-2.0 OR MIT" [lib] diff --git a/examples/file-associations/src-tauri/Cargo.toml b/examples/file-associations/src-tauri/Cargo.toml index 16306b875586..27146addb234 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.57" +rust-version = "1.74" [build-dependencies] tauri-build = { path = "../../../core/tauri-build", features = ["codegen"] } diff --git a/examples/resources/src-tauri/Cargo.toml b/examples/resources/src-tauri/Cargo.toml index da590a6e8f95..8830d57fcf91 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.65" +rust-version = "1.74" [build-dependencies] tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] } diff --git a/examples/tauri-dynamic-lib/src-app1/Cargo.toml b/examples/tauri-dynamic-lib/src-app1/Cargo.toml index e895d8df8f31..c2f7bc8f7713 100644 --- a/examples/tauri-dynamic-lib/src-app1/Cargo.toml +++ b/examples/tauri-dynamic-lib/src-app1/Cargo.toml @@ -3,7 +3,7 @@ name = "app1" version = "0.1.0" description = "A simple app that makes a dll call" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" [workspace] diff --git a/examples/tauri-dynamic-lib/src-tauri/Cargo.toml b/examples/tauri-dynamic-lib/src-tauri/Cargo.toml index d70c0740fcaa..a8f1fda519ac 100644 --- a/examples/tauri-dynamic-lib/src-tauri/Cargo.toml +++ b/examples/tauri-dynamic-lib/src-tauri/Cargo.toml @@ -3,7 +3,7 @@ name = "tauri_app" version = "0.1.0" description = "A very simple Dll Library that runs tauri and launches a webview window" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" [workspace] diff --git a/examples/web/core/tauri/Cargo.toml b/examples/web/core/tauri/Cargo.toml index ebf0e357cd57..0d66762bfa06 100644 --- a/examples/web/core/tauri/Cargo.toml +++ b/examples/web/core/tauri/Cargo.toml @@ -7,7 +7,7 @@ license = "" repository = "" default-run = "app" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" [build-dependencies] tauri-build = { path = "../../../../core/tauri-build", features = [] } diff --git a/examples/workspace/src-tauri/Cargo.toml b/examples/workspace/src-tauri/Cargo.toml index fb5c4ab32ce4..3a871c8642f4 100644 --- a/examples/workspace/src-tauri/Cargo.toml +++ b/examples/workspace/src-tauri/Cargo.toml @@ -7,7 +7,7 @@ license = "" repository = "" default-run = "app" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" [build-dependencies] tauri-build = { workspace = true } diff --git a/tooling/bench/Cargo.toml b/tooling/bench/Cargo.toml index 12b11158557b..4276e347ae5b 100644 --- a/tooling/bench/Cargo.toml +++ b/tooling/bench/Cargo.toml @@ -5,7 +5,7 @@ name = "tauri_bench" version = "0.1.0" authors = [ "Tauri Programme within The Commons Conservancy" ] edition = "2021" -rust-version = "1.65" +rust-version = "1.74" license = "Apache-2.0 OR MIT" description = "Cross-platform WebView rendering library" repository = "https://github.com/tauri-apps/wry" diff --git a/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml b/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml index efa0373788af..e22ce491b2aa 100644 --- a/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml +++ b/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml @@ -3,7 +3,7 @@ name = "bench_cpu_intensive" version = "0.1.0" description = "A very simple Tauri Application" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" [build-dependencies] tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] } diff --git a/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml b/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml index 07586f515f18..937bb33d8c51 100644 --- a/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml +++ b/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml @@ -3,7 +3,7 @@ name = "bench_files_transfer" version = "0.1.0" description = "A very simple Tauri Application" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" [build-dependencies] tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] } diff --git a/tooling/bench/tests/helloworld/src-tauri/Cargo.toml b/tooling/bench/tests/helloworld/src-tauri/Cargo.toml index 26c8a9a63e3f..c11a14884a5e 100644 --- a/tooling/bench/tests/helloworld/src-tauri/Cargo.toml +++ b/tooling/bench/tests/helloworld/src-tauri/Cargo.toml @@ -3,7 +3,7 @@ name = "bench_helloworld" version = "0.1.0" description = "A very simple Tauri Application" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" [build-dependencies] tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] } diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index a704e69ce168..2a2d2775488c 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -13,7 +13,7 @@ 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.65" +rust-version = "1.74" exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ] [dependencies] diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index e1253c48319e..87adde11d050 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -6,7 +6,7 @@ name = "tauri-cli" version = "2.0.0-alpha.15" authors = [ "Tauri Programme within The Commons Conservancy" ] edition = "2021" -rust-version = "1.65" +rust-version = "1.74" categories = [ "gui", "web-programming" ] license = "Apache-2.0 OR MIT" homepage = "https://tauri.app" diff --git a/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml b/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml index a695e0ea6b88..00a5c4a57beb 100644 --- a/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml +++ b/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml @@ -8,7 +8,7 @@ authors = [ "Tauri Programme within The Commons Conservancy" ] license = "" repository = "" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" [package.metadata.bundle] identifier = "com.tauri.dev" diff --git a/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest index 51b6324e99db..09cec3903e2a 100755 --- a/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest +++ b/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tooling/cli/templates/plugin/Cargo.crate-manifest b/tooling/cli/templates/plugin/Cargo.crate-manifest index 388143d9a522..c86d96f26ca5 100644 --- a/tooling/cli/templates/plugin/Cargo.crate-manifest +++ b/tooling/cli/templates/plugin/Cargo.crate-manifest @@ -4,7 +4,7 @@ version = "0.0.0" authors = [ "{{ author }}" ] description = "" edition = "2021" -rust-version = "1.65" +rust-version = "1.74" exclude = ["/examples", "/webview-dist", "/webview-src", "/node_modules"] links = "tauri-plugin-{{ plugin_name }}" diff --git a/tooling/cli/templates/plugin/__example-api/tauri-app/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/plugin/__example-api/tauri-app/src-tauri/Cargo.crate-manifest index 86ed8b7bc6fe..eaa425218d9e 100644 --- a/tooling/cli/templates/plugin/__example-api/tauri-app/src-tauri/Cargo.crate-manifest +++ b/tooling/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.60" +rust-version = "1.74" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tooling/cli/templates/plugin/__example-basic/vanilla/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/plugin/__example-basic/vanilla/src-tauri/Cargo.crate-manifest index 86ed8b7bc6fe..eaa425218d9e 100644 --- a/tooling/cli/templates/plugin/__example-basic/vanilla/src-tauri/Cargo.crate-manifest +++ b/tooling/cli/templates/plugin/__example-basic/vanilla/src-tauri/Cargo.crate-manifest @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" edition = "2021" -rust-version = "1.60" +rust-version = "1.74" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html