Explorar el Código

chore(deps) Update Tauri Core (1.x) (#8103)

* chore(deps) Update Tauri Core

* Update Cargo.toml

* up and comments

* update covector for comment support

* fix mock deprecation warnings

* Revert "fix mock deprecation warnings"

This reverts commit d49f022ecc158248e95797eb26c1890f213a4613.

* downgrade mockito

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Fabian-Lars <fabianlars@fabianlars.de>
renovate[bot] hace 1 año
padre
commit
bc69b03101
Se han modificado 3 ficheros con 58 adiciones y 101 borrados
  1. 20 63
      Cargo.lock
  2. 37 37
      core/tauri/Cargo.toml
  3. 1 1
      package.json

+ 20 - 63
Cargo.lock

@@ -363,6 +363,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -511,17 +517,6 @@ dependencies = [
  "x11",
 ]
 
-[[package]]
-name = "cargo_toml"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e72c3ff59e3b7d24630206bb63a73af65da4ed5df1f76ee84dfafb9fee2ba60e"
-dependencies = [
- "serde",
- "serde_derive",
- "toml 0.5.11",
-]
-
 [[package]]
 name = "cargo_toml"
 version = "0.15.2"
@@ -893,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "data-url"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
+checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
 
 [[package]]
 name = "derivative"
@@ -1805,16 +1800,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ico"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd"
-dependencies = [
- "byteorder",
- "png",
-]
-
 [[package]]
 name = "ico"
 version = "0.3.0"
@@ -1887,18 +1872,18 @@ dependencies = [
 
 [[package]]
 name = "infer"
-version = "0.9.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a"
+checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
 dependencies = [
  "cfb",
 ]
 
 [[package]]
 name = "infer"
-version = "0.13.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
+checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847"
 dependencies = [
  "cfb",
 ]
@@ -3914,15 +3899,11 @@ dependencies = [
 
 [[package]]
 name = "sys-locale"
-version = "0.2.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee"
+checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
 dependencies = [
- "js-sys",
  "libc",
- "wasm-bindgen",
- "web-sys",
- "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -4033,9 +4014,9 @@ name = "tauri"
 version = "1.7.1"
 dependencies = [
  "anyhow",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
- "cargo_toml 0.11.8",
+ "cargo_toml",
  "clap",
  "cocoa",
  "data-url",
@@ -4051,10 +4032,10 @@ dependencies = [
  "gtk",
  "heck 0.5.0",
  "http",
- "ico 0.2.0",
+ "ico",
  "ignore",
  "indexmap",
- "infer 0.9.0",
+ "infer 0.16.0",
  "minisign-verify",
  "mockito",
  "nix 0.26.4",
@@ -4108,7 +4089,7 @@ name = "tauri-build"
 version = "1.5.3"
 dependencies = [
  "anyhow",
- "cargo_toml 0.15.2",
+ "cargo_toml",
  "dirs-next",
  "heck 0.5.0",
  "json-patch",
@@ -4128,7 +4109,7 @@ version = "1.4.4"
 dependencies = [
  "base64 0.21.7",
  "brotli",
- "ico 0.3.0",
+ "ico",
  "json-patch",
  "plist",
  "png",
@@ -5205,15 +5186,6 @@ dependencies = [
  "windows_x86_64_msvc 0.42.2",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -5232,21 +5204,6 @@ dependencies = [
  "windows-targets 0.52.5",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"

+ 37 - 37
core/tauri/Cargo.toml

@@ -58,7 +58,7 @@ serde = { version = "1.0", features = [ "derive" ] }
 tokio = { version = "1", features = ["time", "rt", "rt-multi-thread", "sync", "fs", "io-util" ] }
 futures-util = "0.3"
 uuid = { version = "1", features = [ "v4" ] }
-url = { version = "2.3" }
+url = { version = "2" }
 anyhow = "1.0"
 thiserror = "1.0"
 once_cell = "1"
@@ -67,63 +67,63 @@ tauri-macros = { version = "1.4.5", path = "../tauri-macros" }
 tauri-utils = { version = "1.6.0", features = [ "resources" ], path = "../tauri-utils" }
 tauri-runtime-wry = { version = "0.14.9", path = "../tauri-runtime-wry", optional = true }
 rand = "0.8"
-semver = { version = "1.0", features = [ "serde" ] }
+semver = { version = "1", features = [ "serde" ] }
 serde_repr = "0.1"
-state = "0.5"
-tar = "0.4.38"
+state = "0.5" # 0.6 raised msrv
+tar = "0.4"
 tempfile = "3"
-zip = { version = "0.6", default-features = false, optional = true }
+zip = { version = "0.6", default-features = false, optional = true } # 0.7(?) raised msrv
 ignore = "0.4"
-flate2 = "1.0"
-http = "0.2"
+flate2 = "1"
+http = "0.2" # All other crates we use here are still on 0.2
 dirs-next = "2.0"
-percent-encoding = "2.2"
-base64 = { version = "0.21", optional = true }
-clap = { version = "3", optional = true }
-reqwest = { version = "0.11", features = [ "json", "stream" ], optional = true }
+percent-encoding = "2"
+base64 = { version = "0.22", optional = true }
+clap = { version = "3", optional = true } # 4.0 is too big of a change to be worth to upgrade in tauri v1
+reqwest = { version = "0.11", features = [ "json", "stream" ], optional = true } # 0.12 raised msrv
 bytes = { version = "1", features = [ "serde" ], optional = true }
-open = { version = "3.2", optional = true }
+open = { version = "3", optional = true } # 4.0 raised msrv
 shared_child = { version = "1.0", optional = true }
-os_pipe = { version = "1.0", optional = true }
-raw-window-handle = "0.5"
+os_pipe = { version = "1", optional = true }
+raw-window-handle = "0.5" # All other crates we use here are still on 0.5
 minisign-verify = { version = "0.2", optional = true }
 time = { version = "0.3", features = [ "parsing", "formatting" ], optional = true }
 os_info = { version = "3", optional = true }
 regex = { version = "1", optional = true }
 glob = "0.3"
-data-url = { version = "0.2", optional = true }
+data-url = { version = "0.3", optional = true }
 serialize-to-javascript = "=0.1.1"
-infer = { version = "0.9", optional = true }
+infer = { version = "0.16", optional = true }
 png = { version = "0.17", optional = true }
-ico = { version = "0.2.0", optional = true }
-encoding_rs = "0.8.31"
-sys-locale = { version = "0.2.3", optional = true }
+ico = { version = "0.3", optional = true }
+encoding_rs = "0.8"
+sys-locale = { version = "0.3", optional = true }
 tracing = { version = "0.1", optional = true }
 indexmap = { version = "1", features = [ "std", "serde" ], optional = true }
 getrandom = { version = "0.2", features = [ "std" ] }
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-rfd = { version = "0.10", optional = true, features = [ "gtk3", "common-controls-v6" ] }
-notify-rust = { version = "4.5", optional = true }
+rfd = { version = "0.10", optional = true, features = [ "gtk3", "common-controls-v6" ] } # 0.11 raised gtk version
+notify-rust = { version = "4", optional = true }
 
 [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-gtk = { version = "0.15", features = [ "v3_20" ] }
-glib = "0.15"
-webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] }
-nix = { version = "0.26.0", default-features = false, features = [ "user", "socket", "uio" ], optional = true }
+gtk = { version = "0.15", features = [ "v3_20" ] } # Do not update without consensus
+glib = "0.15" # Do not update without consensus
+webkit2gtk = { version = "0.18.2", features = [ "v2_22" ] } # Do not update without consensus
+nix = { version = "0.26.0", default-features = false, features = [ "user", "socket", "uio" ], optional = true } # 0.27 raised msrv
 
 [target."cfg(target_os = \"macos\")".dependencies]
 embed_plist = "1.2"
-cocoa = "0.24"
-objc = "0.2"
+cocoa = "0.24" # wry still uses 0.24
+objc = "0.2" # Do not update without consensus
 
 [target."cfg(windows)".dependencies]
 dunce = "1"
-webview2-com = "0.19.1"
+webview2-com = "0.19.1" # Do not update without consensus
 win7-notifications = { version = "0.4", optional = true }
 
   [target."cfg(windows)".dependencies.windows]
-  version = "0.39.0"
+  version = "0.39.0" # Do not update without consensus
   features = [
   "Win32_Foundation",
   "Win32_UI_WindowsAndMessaging",
@@ -135,16 +135,16 @@ heck = "0.5"
 once_cell = "1"
 
 [dev-dependencies]
-mockito = "0.31"
-proptest = "1.0.0"
-quickcheck = "1.0.3"
-quickcheck_macros = "1.0.0"
-serde = { version = "1.0", features = [ "derive" ] }
-serde_json = "1.0"
+mockito = "0.31" # 0.32 raised msrv
+proptest = "1"
+quickcheck = "1"
+quickcheck_macros = "1"
+serde = { version = "1", features = [ "derive" ] }
+serde_json = "1"
 tauri = { path = ".", default-features = false, features = [ "wry" ] }
-tokio-test = "0.4.2"
+tokio-test = "0.4"
 tokio = { version = "1", features = [ "full" ] }
-cargo_toml = "0.11"
+cargo_toml = "0.15"
 
 [features]
 default = [ "wry", "compression", "objc-exception" ]

+ 1 - 1
package.json

@@ -16,7 +16,7 @@
    "postinstall": "husky install"
   },
   "devDependencies": {
-    "covector": "^0.7.3",
+    "covector": "^0.12.3",
     "husky": "^6.0.0",
     "prettier": "^2.5.1"
   },