mirror of
https://github.com/tauri-apps/tauri.git
synced 2024-09-11 16:08:21 +03:00
fix: schemars 0.8.18 compatibility (#9676)
* fix: schemars 0.8.18 compatibility * fix cli cargo issue * update tauri-utils v1 --------- Co-authored-by: FabianLars <fabianlars@fabianlars.de>
This commit is contained in:
parent
8385733a69
commit
3fbc1703f1
5
.changes/fix-schemars-compatibility.md
Normal file
5
.changes/fix-schemars-compatibility.md
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
tauri-utils: "patch:bug"
|
||||||
|
---
|
||||||
|
|
||||||
|
Fixes `schemars` compilation issue.
|
18
Cargo.lock
generated
18
Cargo.lock
generated
@ -1765,7 +1765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
|
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"windows-targets 0.48.5",
|
"windows-targets 0.52.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2989,9 +2989,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "schemars"
|
name = "schemars"
|
||||||
version = "0.8.16"
|
version = "0.8.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
|
checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dyn-clone",
|
"dyn-clone",
|
||||||
"indexmap 1.9.3",
|
"indexmap 1.9.3",
|
||||||
@ -3003,14 +3003,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "schemars_derive"
|
name = "schemars_derive"
|
||||||
version = "0.8.16"
|
version = "0.8.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
|
checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"serde_derive_internals",
|
"serde_derive_internals",
|
||||||
"syn 1.0.109",
|
"syn 2.0.57",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3099,13 +3099,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive_internals"
|
name = "serde_derive_internals"
|
||||||
version = "0.26.0"
|
version = "0.29.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
|
checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 1.0.109",
|
"syn 2.0.57",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
@ -41,7 +41,7 @@ semver = "1"
|
|||||||
dirs-next = "2"
|
dirs-next = "2"
|
||||||
glob = "0.3"
|
glob = "0.3"
|
||||||
toml = "0.8"
|
toml = "0.8"
|
||||||
schemars = { version = "0.8", features = [ "preserve_order" ] }
|
schemars = { version = "0.8.18", features = [ "preserve_order" ] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = [ "config-json" ]
|
default = [ "config-json" ]
|
||||||
|
@ -6,7 +6,7 @@ publish = false
|
|||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tauri-utils = { features = [ "schema" ], path = "../tauri-utils" }
|
tauri-utils = { features = [ "schema" ], path = "../tauri-utils" }
|
||||||
schemars = { version = "0.8", features = ["url", "preserve_order"] }
|
schemars = { version = "0.8.18", features = ["url", "preserve_order"] }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
url = { version = "2.3", features = ["serde"] }
|
url = { version = "2.3", features = ["serde"] }
|
||||||
|
@ -34,7 +34,7 @@ tauri-utils = { version = "2.0.0-beta.13", default-features = false, features =
|
|||||||
serde_json = { version = "1", optional = true }
|
serde_json = { version = "1", optional = true }
|
||||||
glob = { version = "0.3", optional = true }
|
glob = { version = "0.3", optional = true }
|
||||||
toml = { version = "0.8", optional = true }
|
toml = { version = "0.8", optional = true }
|
||||||
schemars = { version = "0.8", features = [ "preserve_order" ] }
|
schemars = { version = "0.8.18", features = [ "preserve_order" ] }
|
||||||
walkdir = { version = "2", optional = true }
|
walkdir = { version = "2", optional = true }
|
||||||
|
|
||||||
[target."cfg(target_os = \"macos\")".dependencies]
|
[target."cfg(target_os = \"macos\")".dependencies]
|
||||||
|
@ -23,7 +23,7 @@ html5ever = "0.26"
|
|||||||
kuchiki = { package = "kuchikiki", version = "0.8" }
|
kuchiki = { package = "kuchikiki", version = "0.8" }
|
||||||
proc-macro2 = { version = "1", optional = true }
|
proc-macro2 = { version = "1", optional = true }
|
||||||
quote = { version = "1", optional = true }
|
quote = { version = "1", optional = true }
|
||||||
schemars = { version = "0.8", features = [ "url" ], optional = true }
|
schemars = { version = "0.8.18", features = [ "url" ], optional = true }
|
||||||
serde_with = "3"
|
serde_with = "3"
|
||||||
aes-gcm = { version = "0.10", optional = true }
|
aes-gcm = { version = "0.10", optional = true }
|
||||||
getrandom = { version = "0.2", optional = true, features = [ "std" ] }
|
getrandom = { version = "0.2", optional = true, features = [ "std" ] }
|
||||||
|
@ -213,19 +213,13 @@ impl schemars::JsonSchema for BundleTarget {
|
|||||||
..Default::default()
|
..Default::default()
|
||||||
}
|
}
|
||||||
.into(),
|
.into(),
|
||||||
schemars::_private::apply_metadata(
|
schemars::_private::metadata::add_description(
|
||||||
gen.subschema_for::<Vec<BundleType>>(),
|
gen.subschema_for::<Vec<BundleType>>(),
|
||||||
schemars::schema::Metadata {
|
"A list of bundle targets.",
|
||||||
description: Some("A list of bundle targets.".to_owned()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
schemars::_private::apply_metadata(
|
schemars::_private::metadata::add_description(
|
||||||
gen.subschema_for::<BundleType>(),
|
gen.subschema_for::<BundleType>(),
|
||||||
schemars::schema::Metadata {
|
"A single bundle target.",
|
||||||
description: Some("A single bundle target.".to_owned()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
24
tooling/cli/Cargo.lock
generated
24
tooling/cli/Cargo.lock
generated
@ -4165,9 +4165,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "schemars"
|
name = "schemars"
|
||||||
version = "0.8.16"
|
version = "0.8.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
|
checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dyn-clone",
|
"dyn-clone",
|
||||||
"schemars_derive",
|
"schemars_derive",
|
||||||
@ -4178,14 +4178,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "schemars_derive"
|
name = "schemars_derive"
|
||||||
version = "0.8.16"
|
version = "0.8.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
|
checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"serde_derive_internals",
|
"serde_derive_internals",
|
||||||
"syn 1.0.109",
|
"syn 2.0.52",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -4300,13 +4300,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive_internals"
|
name = "serde_derive_internals"
|
||||||
version = "0.26.0"
|
version = "0.29.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
|
checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 1.0.109",
|
"syn 2.0.52",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -4945,7 +4945,7 @@ dependencies = [
|
|||||||
"sublime_fuzzy",
|
"sublime_fuzzy",
|
||||||
"tauri-bundler",
|
"tauri-bundler",
|
||||||
"tauri-icns",
|
"tauri-icns",
|
||||||
"tauri-utils 1.5.3",
|
"tauri-utils 1.5.4",
|
||||||
"tauri-utils 2.0.0-beta.13",
|
"tauri-utils 2.0.0-beta.13",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
"tokio",
|
||||||
@ -4981,15 +4981,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-utils"
|
name = "tauri-utils"
|
||||||
version = "1.5.3"
|
version = "1.5.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "75ad0bbb31fccd1f4c56275d0a5c3abdf1f59999f72cb4ef8b79b4ed42082a21"
|
checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes-gcm",
|
"aes-gcm",
|
||||||
"ctor",
|
"ctor",
|
||||||
"dunce",
|
"dunce",
|
||||||
"getrandom 0.2.12",
|
"getrandom 0.2.12",
|
||||||
"heck 0.4.1",
|
"heck 0.5.0",
|
||||||
"html5ever",
|
"html5ever",
|
||||||
"infer 0.13.0",
|
"infer 0.13.0",
|
||||||
"json-patch",
|
"json-patch",
|
||||||
|
Loading…
Reference in New Issue
Block a user