From 4ff3a8bae96c975195414408bfe40778d7cb7239 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Mon, 15 May 2023 13:59:35 +0200 Subject: [PATCH] fix(core): unpin all dependencies, closes #6944 --- .changes/unpin-deps.md | 9 +++++++++ .github/workflows/test-core.yml | 8 ++++++++ core/tauri-build/Cargo.toml | 1 - core/tauri-codegen/Cargo.toml | 2 +- core/tauri-runtime-wry/Cargo.toml | 2 +- core/tauri-runtime/Cargo.toml | 2 +- core/tauri/Cargo.toml | 7 +++---- core/tests/app-updater/Cargo.toml | 2 +- tooling/cli/Cargo.toml | 2 +- 9 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 .changes/unpin-deps.md diff --git a/.changes/unpin-deps.md b/.changes/unpin-deps.md new file mode 100644 index 000000000000..43eea0efd851 --- /dev/null +++ b/.changes/unpin-deps.md @@ -0,0 +1,9 @@ +--- +'tauri': patch +'tauri-build': patch +'tauri-codegen': patch +'tauri-runtime': patch +'tauri-runtime-wry': patch +--- + +Unpin `time`, `ignore`, `winnow`, and `ignore` crate versions. Developers now have to pin crates if needed themselves. A list of crates that need pinning to adhere to Tauri's MSRV will be visible in Tauri's GitHub workflow: https://github.com/tauri-apps/tauri/blob/dev/.github/workflows/test-core.yml#L85. diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index e92403a38c82..ca3e4968c3cd 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -82,5 +82,13 @@ 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.15 + cargo update -p ignore --precise 0.4.18 + cargo update -p winnow --precise 0.4.1 + cargo update -p raw-window-handle --precise 0.5.0 + - name: test run: cargo test --target ${{ matrix.platform.target }} ${{ matrix.features.args }} diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index 044557e53122..514d7ade13c3 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -22,7 +22,6 @@ quote = { version = "1", optional = true } tauri-codegen = { version = "1.3.0", path = "../tauri-codegen", optional = true } tauri-utils = { version = "1.3.0", path = "../tauri-utils", features = [ "build", "resources" ] } cargo_toml = "0.15" -winnow = "=0.4.1" serde = "1" serde_json = "1" heck = "0.4" diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml index 4a7568684423..c1bb4e13bf62 100644 --- a/core/tauri-codegen/Cargo.toml +++ b/core/tauri-codegen/Cargo.toml @@ -32,7 +32,7 @@ json-patch = "1.0" [target."cfg(target_os = \"macos\")".dependencies] plist = "1" -time = { version = "=0.3.15", features = [ "parsing", "formatting" ] } +time = { version = "0.3", features = [ "parsing", "formatting" ] } [features] default = [ "compression" ] diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml index 062edc8afe64..d4a6c69a75ee 100644 --- a/core/tauri-runtime-wry/Cargo.toml +++ b/core/tauri-runtime-wry/Cargo.toml @@ -18,7 +18,7 @@ tauri-runtime = { version = "0.13.0", path = "../tauri-runtime" } tauri-utils = { version = "1.3.0", path = "../tauri-utils" } uuid = { version = "1", features = [ "v4" ] } rand = "0.8" -raw-window-handle = "=0.5.0" +raw-window-handle = "0.5" [target."cfg(windows)".dependencies] webview2-com = "0.19.1" diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml index 875c9042701e..75070bb338ea 100644 --- a/core/tauri-runtime/Cargo.toml +++ b/core/tauri-runtime/Cargo.toml @@ -30,7 +30,7 @@ tauri-utils = { version = "1.3.0", path = "../tauri-utils" } uuid = { version = "1", features = [ "v4" ] } http = "0.2.4" http-range = "0.1.4" -raw-window-handle = "=0.5.0" +raw-window-handle = "0.5" rand = "0.8" url = { version = "2" } diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index 63ff2f91a5ca..d6caa70ca89e 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -60,7 +60,7 @@ state = "0.5" tar = "0.4.38" tempfile = "3" zip = { version = "0.6", default-features = false, optional = true } -ignore = "=0.4.18" +ignore = "0.4" flate2 = "1.0" http = "0.2" dirs-next = "2.0" @@ -73,9 +73,9 @@ attohttpc = { version = "0.22", features = [ "compress", "json", "form" ], optio open = { version = "3.2", optional = true } shared_child = { version = "1.0", optional = true } os_pipe = { version = "1.0", optional = true } -raw-window-handle = "=0.5.0" +raw-window-handle = "0.5" minisign-verify = { version = "0.2", optional = true } -time = { version = "=0.3.15", features = [ "parsing", "formatting" ], optional = true } +time = { version = "0.3", features = [ "parsing", "formatting" ], optional = true } os_info = { version = "3", optional = true } regex = { version = "1.6.0", optional = true } glob = "0.3" @@ -123,7 +123,6 @@ tauri = { path = ".", default-features = false, features = [ "wry" ] } tokio-test = "0.4.2" tokio = { version = "1", features = [ "full" ] } cargo_toml = "0.11" -winnow = "=0.4.1" [features] default = [ "wry", "compression", "objc-exception" ] diff --git a/core/tests/app-updater/Cargo.toml b/core/tests/app-updater/Cargo.toml index 230c6b1dec19..641afabe83aa 100644 --- a/core/tests/app-updater/Cargo.toml +++ b/core/tests/app-updater/Cargo.toml @@ -11,7 +11,7 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" tiny_http = "0.11" tauri = { path = "../../tauri", features = ["updater"] } -time = { version = "=0.3.15", features = ["formatting"] } +time = { version = "0.3", features = ["formatting"] } [features] default = ["custom-protocol"] diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index 92328aea7983..b798c28706ae 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -68,7 +68,7 @@ heck = { version = "0.4", features = [ "unicode" ] } dialoguer = "0.10" url = { version = "2.3", features = [ "serde" ] } os_pipe = "1" -ignore = "=0.4.18" +ignore = "0.4" ctrlc = "3.2" log = { version = "0.4.17", features = [ "kv_unstable", "kv_unstable_std" ] } env_logger = "0.9.1"