Skip to content

Commit 3fbc170

Browse files
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>
1 parent 8385733 commit 3fbc170

8 files changed

Lines changed: 34 additions & 35 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
tauri-utils: "patch:bug"
3+
---
4+
5+
Fixes `schemars` compilation issue.

‎Cargo.lock‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/tauri-build/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ semver = "1"
4141
dirs-next = "2"
4242
glob = "0.3"
4343
toml = "0.8"
44-
schemars = { version = "0.8", features = [ "preserve_order" ] }
44+
schemars = { version = "0.8.18", features = [ "preserve_order" ] }
4545

4646
[features]
4747
default = [ "config-json" ]

‎core/tauri-config-schema/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ publish = false
66

77
[build-dependencies]
88
tauri-utils = { features = [ "schema" ], path = "../tauri-utils" }
9-
schemars = { version = "0.8", features = ["url", "preserve_order"] }
9+
schemars = { version = "0.8.18", features = ["url", "preserve_order"] }
1010
serde = { version = "1.0", features = ["derive"] }
1111
serde_json = "1.0"
1212
url = { version = "2.3", features = ["serde"] }

‎core/tauri-plugin/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ tauri-utils = { version = "2.0.0-beta.13", default-features = false, features =
3434
serde_json = { version = "1", optional = true }
3535
glob = { version = "0.3", optional = true }
3636
toml = { version = "0.8", optional = true }
37-
schemars = { version = "0.8", features = [ "preserve_order" ] }
37+
schemars = { version = "0.8.18", features = [ "preserve_order" ] }
3838
walkdir = { version = "2", optional = true }
3939

4040
[target."cfg(target_os = \"macos\")".dependencies]

‎core/tauri-utils/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ html5ever = "0.26"
2323
kuchiki = { package = "kuchikiki", version = "0.8" }
2424
proc-macro2 = { version = "1", optional = true }
2525
quote = { version = "1", optional = true }
26-
schemars = { version = "0.8", features = [ "url" ], optional = true }
26+
schemars = { version = "0.8.18", features = [ "url" ], optional = true }
2727
serde_with = "3"
2828
aes-gcm = { version = "0.10", optional = true }
2929
getrandom = { version = "0.2", optional = true, features = [ "std" ] }

‎core/tauri-utils/src/config.rs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,19 +213,13 @@ impl schemars::JsonSchema for BundleTarget {
213213
..Default::default()
214214
}
215215
.into(),
216-
schemars::_private::apply_metadata(
216+
schemars::_private::metadata::add_description(
217217
gen.subschema_for::<Vec<BundleType>>(),
218-
schemars::schema::Metadata {
219-
description: Some("A list of bundle targets.".to_owned()),
220-
..Default::default()
221-
},
218+
"A list of bundle targets.",
222219
),
223-
schemars::_private::apply_metadata(
220+
schemars::_private::metadata::add_description(
224221
gen.subschema_for::<BundleType>(),
225-
schemars::schema::Metadata {
226-
description: Some("A single bundle target.".to_owned()),
227-
..Default::default()
228-
},
222+
"A single bundle target.",
229223
),
230224
];
231225

‎tooling/cli/Cargo.lock‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)