chore: bump MSRV to 1.70 (#8031)

tauri-apps · Oct 17, 2023 · 880266a · 880266a
1 parent a5686e1
commit 880266a
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 37 deletions.
diff --git a/.changes/msrv-1.70.md b/.changes/msrv-1.70.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.70.
diff --git 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.70.0',
               cross: false,
               command: 'test'
             }
           - {
               target: x86_64-unknown-linux-gnu,
               os: ubuntu-latest,
-              toolchain: '1.65.0',
+              toolchain: '1.70.0',
               cross: false,
               command: 'test'
             }
           - {
               target: x86_64-apple-darwin,
               os: macos-latest,
-              toolchain: '1.65.0',
+              toolchain: '1.70.0',
               cross: false,
               command: 'test'
             }
           - {
               target: aarch64-apple-ios,
               os: macos-latest,
-              toolchain: '1.65.0',
+              toolchain: '1.70.0',
               cross: false,
               command: 'build'
             }
           - {
               target: aarch64-linux-android,
               os: ubuntu-latest,
-              toolchain: '1.65.0',
+              toolchain: '1.70.0',
               cross: true,
               command: 'build'
             }
@@ -95,21 +95,16 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
+          prefix-key: v2
           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.
+      - name: test (using cross)
+        if: ${{ matrix.platform.cross }}
         run: |
-          cargo update -p time --precise 0.3.23
-          cargo update -p [email protected] --precise 0.7.6
-          cargo update -p [email protected] --precise 0.19.14
-          cargo update -p [email protected] --precise 0.15.4
-          cargo update -p system-deps --precise 6.1.1
+          cargo install cross --git https://github.com/cross-rs/cross
+          cross ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
 
-      - name: test
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ matrix.platform.cross }}
-          command: ${{ matrix.platform.command }}
-          args: --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
+      - name: test (using cargo)
+        if: ${{ !matrix.platform.cross }}
+        run: cargo ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
diff --git 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.70"
 
 # 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
@@ -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.70"
 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
@@ -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.70"
 
 [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
@@ -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.70"
 
 [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
@@ -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.70"
 
 [workspace]
 

diff --git 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.70"
 
 [workspace]
 

diff --git 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.70"
 
 [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
@@ -7,7 +7,7 @@ license = ""
 repository = ""
 default-run = "app"
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.70"
 
 [build-dependencies]
 tauri-build = { workspace = true }

diff --git 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.70"
 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
@@ -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.70"
 
 [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
@@ -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.70"
 
 [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
@@ -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.70"
 
 [build-dependencies]
 tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }

diff --git 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.70"
 exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ]
 
 [dependencies]

diff --git 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.70"
 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
@@ -8,7 +8,7 @@ authors = [ "Tauri Programme within The Commons Conservancy" ]
 license = ""
 repository = ""
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.70"
 
 [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
@@ -6,7 +6,7 @@ authors = ["you"]
 license = ""
 repository = ""
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.70"
 
 # 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
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = [ "{{ author }}" ]
 description = ""
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.70"
 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
@@ -6,7 +6,7 @@ authors = ["you"]
 license = ""
 repository = ""
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.70"
 
 # 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
@@ -6,7 +6,7 @@ authors = ["you"]
 license = ""
 repository = ""
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.70"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html