Merge branch '1.x' into v1/msrv-check

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" ]

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"
   },