Skip to content

Commit

Permalink
raise msrv to 1.71
Browse files Browse the repository at this point in the history
  • Loading branch information
amrbashir committed Aug 27, 2024
1 parent d5c02af commit c30067a
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 59 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions bench/tests/cpu_intensive/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions bench/tests/files_transfer/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions bench/tests/helloworld/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 4 additions & 11 deletions crates/tauri-bundler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
[package]
name = "tauri-bundler"
version = "2.0.1-rc.5"
authors = [
"George Burton <burtonageo@gmail.com>",
"Tauri Programme within The Commons Conservancy",
]
authors = ["George Burton <burtonageo@gmail.com>", "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"
Expand All @@ -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"
Expand Down
20 changes: 4 additions & 16 deletions crates/tauri-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"] }
Expand Down Expand Up @@ -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"
Expand All @@ -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"]
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-cli/templates/plugin/Cargo.crate-manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["you"]
license = ""
repository = ""
edition = "2021"
rust-version = "1.70"
rust-version = "1.71"

[lib]
name = "tauri_app_lib"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["you"]
license = ""
repository = ""
edition = "2021"
rust-version = "1.70"
rust-version = "1.71"

[lib]
name = "tauri_app_lib"
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-macos-sign/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 2 additions & 5 deletions examples/api/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@ 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]
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"
Expand Down
2 changes: 1 addition & 1 deletion examples/file-associations/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/resources/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down

0 comments on commit c30067a

Please sign in to comment.