Skip to content

Commit 880266a

Browse files
authored
chore: bump MSRV to 1.70 (#8031)
1 parent a5686e1 commit 880266a

File tree

21 files changed

+45
-37
lines changed

21 files changed

+45
-37
lines changed

.changes/msrv-1.70.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"tauri-cli": 'minor:feat'
3+
"tauri-bundler": 'minor:feat'
4+
"tauri": 'minor:feat'
5+
"tauri-build": 'minor:feat'
6+
"tauri-codegen": 'minor:feat'
7+
"tauri-macros": 'minor:feat'
8+
"tauri-utils": 'minor:feat'
9+
"tauri-runtime": 'minor:feat'
10+
"tauri-runtime-wry": 'minor:feat'
11+
---
12+
13+
Bump the MSRV to 1.70.

.github/workflows/test-core.yml

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,35 @@ jobs:
3434
- {
3535
target: x86_64-pc-windows-msvc,
3636
os: windows-latest,
37-
toolchain: '1.65.0',
37+
toolchain: '1.70.0',
3838
cross: false,
3939
command: 'test'
4040
}
4141
- {
4242
target: x86_64-unknown-linux-gnu,
4343
os: ubuntu-latest,
44-
toolchain: '1.65.0',
44+
toolchain: '1.70.0',
4545
cross: false,
4646
command: 'test'
4747
}
4848
- {
4949
target: x86_64-apple-darwin,
5050
os: macos-latest,
51-
toolchain: '1.65.0',
51+
toolchain: '1.70.0',
5252
cross: false,
5353
command: 'test'
5454
}
5555
- {
5656
target: aarch64-apple-ios,
5757
os: macos-latest,
58-
toolchain: '1.65.0',
58+
toolchain: '1.70.0',
5959
cross: false,
6060
command: 'build'
6161
}
6262
- {
6363
target: aarch64-linux-android,
6464
os: ubuntu-latest,
65-
toolchain: '1.65.0',
65+
toolchain: '1.70.0',
6666
cross: true,
6767
command: 'build'
6868
}
@@ -95,21 +95,16 @@ jobs:
9595
9696
- uses: Swatinem/rust-cache@v2
9797
with:
98+
prefix-key: v2
9899
workspaces: core -> ../target
99100
save-if: ${{ matrix.features.key == 'all' }}
100101

101-
- name: Downgrade crates with MSRV conflict
102-
# The --precise flag can only be used once per invocation.
102+
- name: test (using cross)
103+
if: ${{ matrix.platform.cross }}
103104
run: |
104-
cargo update -p time --precise 0.3.23
105-
cargo update -p toml@0.7.8 --precise 0.7.6
106-
cargo update -p toml_edit@0.19.15 --precise 0.19.14
107-
cargo update -p cfg-expr@0.15.5 --precise 0.15.4
108-
cargo update -p system-deps --precise 6.1.1
105+
cargo install cross --git https://github.com/cross-rs/cross
106+
cross ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
109107
110-
- name: test
111-
uses: actions-rs/cargo@v1
112-
with:
113-
use-cross: ${{ matrix.platform.cross }}
114-
command: ${{ matrix.platform.command }}
115-
args: --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
108+
- name: test (using cargo)
109+
if: ${{ !matrix.platform.cross }}
110+
run: cargo ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }}

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ repository = "https://github.com/tauri-apps/tauri"
3131
categories = ["gui", "web-programming"]
3232
license = "Apache-2.0 OR MIT"
3333
edition = "2021"
34-
rust-version = "1.65"
34+
rust-version = "1.70"
3535

3636
# default to small, optimized workspace release binaries
3737
[profile.release]

examples/api/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "api"
33
version = "0.1.0"
44
description = "An example Tauri Application showcasing the api"
55
edition = "2021"
6-
rust-version = "1.65"
6+
rust-version = "1.70"
77
license = "Apache-2.0 OR MIT"
88

99
[lib]

examples/file-associations/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "tauri-file-associations-demo"
33
version = "0.1.0"
44
description = "A Tauri application that associate file types"
55
edition = "2021"
6-
rust-version = "1.57"
6+
rust-version = "1.70"
77

88
[build-dependencies]
99
tauri-build = { path = "../../../core/tauri-build", features = ["codegen"] }

examples/resources/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "resources"
33
version = "0.1.0"
44
description = "A Tauri application that uses Node.js with app resources"
55
edition = "2021"
6-
rust-version = "1.65"
6+
rust-version = "1.70"
77

88
[build-dependencies]
99
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }

examples/tauri-dynamic-lib/src-app1/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "app1"
33
version = "0.1.0"
44
description = "A simple app that makes a dll call"
55
edition = "2021"
6-
rust-version = "1.65"
6+
rust-version = "1.70"
77

88
[workspace]
99

examples/tauri-dynamic-lib/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "tauri_app"
33
version = "0.1.0"
44
description = "A very simple Dll Library that runs tauri and launches a webview window"
55
edition = "2021"
6-
rust-version = "1.65"
6+
rust-version = "1.70"
77

88
[workspace]
99

examples/web/core/tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = ""
77
repository = ""
88
default-run = "app"
99
edition = "2021"
10-
rust-version = "1.65"
10+
rust-version = "1.70"
1111

1212
[build-dependencies]
1313
tauri-build = { path = "../../../../core/tauri-build", features = [] }

examples/workspace/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = ""
77
repository = ""
88
default-run = "app"
99
edition = "2021"
10-
rust-version = "1.65"
10+
rust-version = "1.70"
1111

1212
[build-dependencies]
1313
tauri-build = { workspace = true }

0 commit comments

Comments
 (0)