aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2023-07-15 22:10:52 +0200
committerGitHub <noreply@github.com>2023-07-15 22:10:52 +0200
commitc5e81f1ae0d8abf30a8e74968ba396b4e15b47d2 (patch)
treebd9fa2682570d36a0e18b1adc020cef150526626
parent90c8bd01df208c85967d1fb9169b7a7ad1685f73 (diff)
downloadFlightCore-c5e81f1ae0d8abf30a8e74968ba396b4e15b47d2.tar.gz
FlightCore-c5e81f1ae0d8abf30a8e74968ba396b4e15b47d2.zip
chore: Bump Tauri to 1.4 (#412)
-rw-r--r--package-lock.json105
-rw-r--r--package.json4
-rw-r--r--src-tauri/Cargo.lock91
-rw-r--r--src-tauri/Cargo.toml4
4 files changed, 119 insertions, 85 deletions
diff --git a/package-lock.json b/package-lock.json
index 5899f295..d0c6aa49 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,16 +6,16 @@
"": {
"name": "flightcore",
"dependencies": {
- "@tauri-apps/api": "^1.3.0"
+ "@tauri-apps/api": "^1.4.0"
},
"devDependencies": {
- "@tauri-apps/cli": "^1.3.0"
+ "@tauri-apps/cli": "^1.4.0"
}
},
"node_modules/@tauri-apps/api": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.3.0.tgz",
- "integrity": "sha512-AH+3FonkKZNtfRtGrObY38PrzEj4d+1emCbwNGu0V2ENbXjlLHMZQlUh+Bhu/CRmjaIwZMGJ3yFvWaZZgTHoog==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.4.0.tgz",
+ "integrity": "sha512-Jd6HPoTM1PZSFIzq7FB8VmMu3qSSyo/3lSwLpoapW+lQ41CL5Dow2KryLg+gyazA/58DRWI9vu/XpEeHK4uMdw==",
"engines": {
"node": ">= 14.6.0",
"npm": ">= 6.6.0",
@@ -27,9 +27,9 @@
}
},
"node_modules/@tauri-apps/cli": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.3.0.tgz",
- "integrity": "sha512-H65YQQkE6SBTQ+KlqTmzx7oCL/2p36v2jPFVNHBhZ5EN7g0VLYmImh9TFcB/QsO2aT+sVlRZSmTpL3R0Iiu8pA==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.4.0.tgz",
+ "integrity": "sha512-VXYr2i2iVFl98etQSQsqLzXgX96bnWiNZd1YADgatqwy/qecbd6Kl5ZAPB5R4ynsgE8A1gU7Fbzh7dCEQYFfmA==",
"dev": true,
"bin": {
"tauri": "tauri.js"
@@ -42,21 +42,22 @@
"url": "https://opencollective.com/tauri"
},
"optionalDependencies": {
- "@tauri-apps/cli-darwin-arm64": "1.3.0",
- "@tauri-apps/cli-darwin-x64": "1.3.0",
- "@tauri-apps/cli-linux-arm-gnueabihf": "1.3.0",
- "@tauri-apps/cli-linux-arm64-gnu": "1.3.0",
- "@tauri-apps/cli-linux-arm64-musl": "1.3.0",
- "@tauri-apps/cli-linux-x64-gnu": "1.3.0",
- "@tauri-apps/cli-linux-x64-musl": "1.3.0",
- "@tauri-apps/cli-win32-ia32-msvc": "1.3.0",
- "@tauri-apps/cli-win32-x64-msvc": "1.3.0"
+ "@tauri-apps/cli-darwin-arm64": "1.4.0",
+ "@tauri-apps/cli-darwin-x64": "1.4.0",
+ "@tauri-apps/cli-linux-arm-gnueabihf": "1.4.0",
+ "@tauri-apps/cli-linux-arm64-gnu": "1.4.0",
+ "@tauri-apps/cli-linux-arm64-musl": "1.4.0",
+ "@tauri-apps/cli-linux-x64-gnu": "1.4.0",
+ "@tauri-apps/cli-linux-x64-musl": "1.4.0",
+ "@tauri-apps/cli-win32-arm64-msvc": "1.4.0",
+ "@tauri-apps/cli-win32-ia32-msvc": "1.4.0",
+ "@tauri-apps/cli-win32-x64-msvc": "1.4.0"
}
},
"node_modules/@tauri-apps/cli-darwin-arm64": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.3.0.tgz",
- "integrity": "sha512-uuhx3/LaqFyHkoGOnOltBLKWGOzC6WzdXu+/Qv3NmNnyQWkY7O34z5V0oP6ibfuiOBZufKjOuBR+8YAIR8Qh9Q==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.4.0.tgz",
+ "integrity": "sha512-nA/ml0SfUt6/CYLVbHmT500Y+ijqsuv5+s9EBnVXYSLVg9kbPUZJJHluEYK+xKuOj6xzyuT/+rZFMRapmJD3jQ==",
"cpu": [
"arm64"
],
@@ -70,9 +71,9 @@
}
},
"node_modules/@tauri-apps/cli-darwin-x64": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.3.0.tgz",
- "integrity": "sha512-fj0VXHMDvb/H1CjaS/JoYd7xcourxndJn1IyM4afYbpXibT/fpmM6uZflDI6rRa220NfnBtQvy+asgwC9wuyLA==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.4.0.tgz",
+ "integrity": "sha512-ov/F6Zr+dg9B0PtRu65stFo2G0ow2TUlneqYYrkj+vA3n+moWDHfVty0raDjMLQbQt3rv3uayFMXGPMgble9OA==",
"cpu": [
"x64"
],
@@ -86,9 +87,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.3.0.tgz",
- "integrity": "sha512-f80DmFPnH5ZskG61KIlAyMVk9YkrTq0XM2uiQjOo5gToIdJidSwhPQVeBLv+7UxhqaRBx082Dg2fOkWlO3LiOQ==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.4.0.tgz",
+ "integrity": "sha512-zwjbiMncycXDV7doovymyKD7sCg53ouAmfgpUqEBOTY3vgBi9TwijyPhJOqoG5vUVWhouNBC08akGmE4dja15g==",
"cpu": [
"arm"
],
@@ -102,9 +103,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-arm64-gnu": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.3.0.tgz",
- "integrity": "sha512-s6/OByuGoppoUSnOXv/b6Oe6cVFk2w/KHs19aJJpo9ov/dUAA1w9wXlXu2l6sOFGsu/plaVomF2cw3iAQmaUCQ==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.4.0.tgz",
+ "integrity": "sha512-5MCBcziqXC72mMXnkZU68mutXIR6zavDxopArE2gQtK841IlE06bIgtLi0kUUhlFJk2nhPRgiDgdLbrPlyt7fw==",
"cpu": [
"arm64"
],
@@ -118,9 +119,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-arm64-musl": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.3.0.tgz",
- "integrity": "sha512-yZfZAW4BG92cynL/D4wdrwBAl2oekRwiZnU5CM8k5yncalVEL0tyzuxQjjqbqrtDcw0rdkoBWrhFd+EB89vQaQ==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.4.0.tgz",
+ "integrity": "sha512-7J3pRB6n6uNYgIfCeKt2Oz8J7oSaz2s8GGFRRH2HPxuTHrBNCinzVYm68UhVpJrL3bnGkU0ziVZLsW/iaOGfUg==",
"cpu": [
"arm64"
],
@@ -134,9 +135,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-x64-gnu": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.3.0.tgz",
- "integrity": "sha512-K3KRWSGKh7DTBr/ZKgWzeNX1Vdgx1ZBlUJXsm72R0Hb+93fDEp3TWgiwVkxqecB4aNWJhJsDcvRHuxw1G8xPlA==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.4.0.tgz",
+ "integrity": "sha512-Zh5gfAJxOv5AVWxcwuueaQ2vIAhlg0d6nZui6nMyfIJ8dbf3aZQ5ZzP38sYow5h/fbvgL+3GSQxZRBIa3c2E1w==",
"cpu": [
"x64"
],
@@ -150,9 +151,9 @@
}
},
"node_modules/@tauri-apps/cli-linux-x64-musl": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.3.0.tgz",
- "integrity": "sha512-99bVHqL1EtF7oESrlmEb5BWJsMNQ2ha70gesZhaVO2qI9Vg089XvrFZWC+aGiUsXNFrOw270+D9DKn03xO5+Zg==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.4.0.tgz",
+ "integrity": "sha512-OLAYoICU3FaYiTdBsI+lQTKnDHeMmFMXIApN0M+xGiOkoIOQcV9CConMPjgmJQ867+NHRNgUGlvBEAh9CiJodQ==",
"cpu": [
"x64"
],
@@ -165,10 +166,26 @@
"node": ">= 10"
}
},
+ "node_modules/@tauri-apps/cli-win32-arm64-msvc": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.4.0.tgz",
+ "integrity": "sha512-gZ05GENFbI6CB5MlOUsLlU0kZ9UtHn9riYtSXKT6MYs8HSPRffPHaHSL0WxsJweWh9nR5Hgh/TUU8uW3sYCzCg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10"
+ }
+ },
"node_modules/@tauri-apps/cli-win32-ia32-msvc": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.3.0.tgz",
- "integrity": "sha512-ckBUTqXXdnCiYyf2xvxiuqiKZurg7ET++f6yzfvYa+gofd5dagQJkGLlkIg2pJ2c8mhEG1Cfk1vxWPqqGfN2GQ==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.4.0.tgz",
+ "integrity": "sha512-JsetT/lTx/Zq98eo8T5CiRyF1nKeX04RO8JlJrI3ZOYsZpp/A5RJvMd/szQ17iOzwiHdge+tx7k2jHysR6oBlQ==",
"cpu": [
"ia32"
],
@@ -182,9 +199,9 @@
}
},
"node_modules/@tauri-apps/cli-win32-x64-msvc": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.3.0.tgz",
- "integrity": "sha512-vQ4wqRE0aziyRxgHIOLudGuxx4wETvFnmMvDBaNJRRrZQPlkOKnRxrvj1rNnI1845BdzSbDF4p7JDcFzToAfXA==",
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.4.0.tgz",
+ "integrity": "sha512-z8Olcnwp5aYhzqUAarFjqF+oELCjuYWnB2HAJHlfsYNfDCAORY5kct3Fklz8PSsubC3U2EugWn8n42DwnThurg==",
"cpu": [
"x64"
],
diff --git a/package.json b/package.json
index 66b4f7f9..27094072 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,9 @@
"tauri": "tauri"
},
"dependencies": {
- "@tauri-apps/api": "^1.3.0"
+ "@tauri-apps/api": "^1.4.0"
},
"devDependencies": {
- "@tauri-apps/cli": "^1.3.0"
+ "@tauri-apps/cli": "^1.4.0"
}
}
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index ec06785b..d94d833d 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -242,22 +242,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
[[package]]
-name = "attohttpc"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
-dependencies = [
- "flate2",
- "http",
- "log",
- "native-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "url",
-]
-
-[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -397,6 +381,9 @@ name = "bytes"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+dependencies = [
+ "serde",
+]
[[package]]
name = "bzip2"
@@ -3120,10 +3107,12 @@ dependencies = [
"serde_urlencoded",
"tokio",
"tokio-native-tls",
+ "tokio-util",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
+ "wasm-streams",
"web-sys",
"winreg 0.10.1",
]
@@ -3535,11 +3524,11 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "2.3.3"
+version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
+checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513"
dependencies = [
- "base64 0.13.1",
+ "base64 0.21.0",
"chrono",
"hex",
"indexmap",
@@ -3551,9 +3540,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "2.3.3"
+version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
+checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070"
dependencies = [
"darling",
"proc-macro2",
@@ -3834,6 +3823,19 @@ dependencies = [
]
[[package]]
+name = "sys-locale"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee"
+dependencies = [
+ "js-sys",
+ "libc",
+ "wasm-bindgen",
+ "web-sys",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
name = "sysinfo"
version = "0.26.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3944,13 +3946,13 @@ dependencies = [
[[package]]
name = "tauri"
-version = "1.3.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d42ba3a2e8556722f31336a0750c10dbb6a81396a1c452977f515da83f69f842"
+checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e"
dependencies = [
"anyhow",
- "attohttpc",
"base64 0.21.0",
+ "bytes",
"cocoa",
"dirs-next",
"embed_plist",
@@ -3974,6 +3976,7 @@ dependencies = [
"rand 0.8.5",
"raw-window-handle",
"regex",
+ "reqwest",
"rfd",
"semver 1.0.17",
"serde",
@@ -3982,6 +3985,7 @@ dependencies = [
"serialize-to-javascript",
"shared_child",
"state",
+ "sys-locale",
"tar",
"tauri-macros",
"tauri-runtime",
@@ -4001,9 +4005,9 @@ dependencies = [
[[package]]
name = "tauri-build"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929b3bd1248afc07b63e33a6a53c3f82c32d0b0a5e216e4530e94c467e019389"
+checksum = "7d2edd6a259b5591c8efdeb9d5702cb53515b82a6affebd55c7fd6d3a27b7d1b"
dependencies = [
"anyhow",
"cargo_toml",
@@ -4014,14 +4018,13 @@ dependencies = [
"serde_json",
"tauri-utils",
"tauri-winres",
- "winnow",
]
[[package]]
name = "tauri-codegen"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a2105f807c6f50b2fa2ce5abd62ef207bc6f14c9fcc6b8caec437f6fb13bde"
+checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a"
dependencies = [
"base64 0.21.0",
"brotli",
@@ -4045,9 +4048,9 @@ dependencies = [
[[package]]
name = "tauri-macros"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8784cfe6f5444097e93c69107d1ac5e8f13d02850efa8d8f2a40fe79674cef46"
+checksum = "8eb12a2454e747896929338d93b0642144bb51e0dddbb36e579035731f0d76b7"
dependencies = [
"heck 0.4.1",
"proc-macro2",
@@ -4071,9 +4074,9 @@ dependencies = [
[[package]]
name = "tauri-runtime"
-version = "0.13.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3b80ea3fcd5fefb60739a3b577b277e8fc30434538a2f5bba82ad7d4368c422"
+checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769"
dependencies = [
"gtk",
"http",
@@ -4092,9 +4095,9 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
-version = "0.13.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1c396950b1ba06aee1b4ffe6c7cd305ff433ca0e30acbc5fa1a2f92a4ce70f1"
+checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b"
dependencies = [
"cocoa",
"gtk",
@@ -4112,12 +4115,13 @@ dependencies = [
[[package]]
name = "tauri-utils"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6f9c2dafef5cbcf52926af57ce9561bd33bb41d7394f8bb849c0330260d864"
+checksum = "03fc02bb6072bb397e1d473c6f76c953cda48b4a2d0cce605df284aa74a12e84"
dependencies = [
"brotli",
"ctor",
+ "dunce",
"glob",
"heck 0.4.1",
"html5ever",
@@ -4733,6 +4737,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
+name = "wasm-streams"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
name = "web-sys"
version = "0.3.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 755b178b..ed3e09fd 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -18,12 +18,12 @@ rust-version = "1.66"
debug = 1
[build-dependencies]
-tauri-build = { version = "1.3", features = [] }
+tauri-build = { version = "1.4", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.3", features = ["api-all", "updater"] }
+tauri = { version = "1.4", features = ["api-all", "updater"] }
tokio = { version = "1", features = ["full"] }
# Sentry (crash) logging
sentry = "0.30"