Skip to content

Commit

Permalink
fix: schemars 0.8.18 compatibility (#9676)
Browse files Browse the repository at this point in the history
* fix: schemars 0.8.18 compatibility

* fix cli cargo issue

* update tauri-utils v1

---------

Co-authored-by: FabianLars <fabianlars@fabianlars.de>
  • Loading branch information
Hankung7183 and FabianLars committed May 6, 2024
1 parent 8385733 commit 3fbc170
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 35 deletions.
5 changes: 5 additions & 0 deletions .changes/fix-schemars-compatibility.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
tauri-utils: "patch:bug"
---

Fixes `schemars` compilation issue.
18 changes: 9 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/tauri-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ semver = "1"
dirs-next = "2"
glob = "0.3"
toml = "0.8"
schemars = { version = "0.8", features = [ "preserve_order" ] }
schemars = { version = "0.8.18", features = [ "preserve_order" ] }

[features]
default = [ "config-json" ]
Expand Down
2 changes: 1 addition & 1 deletion core/tauri-config-schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[build-dependencies]
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_json = "1.0"
url = { version = "2.3", features = ["serde"] }
2 changes: 1 addition & 1 deletion core/tauri-plugin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tauri-utils = { version = "2.0.0-beta.13", default-features = false, features =
serde_json = { version = "1", optional = true }
glob = { version = "0.3", 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 }

[target."cfg(target_os = \"macos\")".dependencies]
Expand Down
2 changes: 1 addition & 1 deletion core/tauri-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ html5ever = "0.26"
kuchiki = { package = "kuchikiki", version = "0.8" }
proc-macro2 = { 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"
aes-gcm = { version = "0.10", optional = true }
getrandom = { version = "0.2", optional = true, features = [ "std" ] }
Expand Down
14 changes: 4 additions & 10 deletions core/tauri-utils/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,19 +213,13 @@ impl schemars::JsonSchema for BundleTarget {
..Default::default()
}
.into(),
schemars::_private::apply_metadata(
schemars::_private::metadata::add_description(
gen.subschema_for::<Vec<BundleType>>(),
schemars::schema::Metadata {
description: Some("A list of bundle targets.".to_owned()),
..Default::default()
},
"A list of bundle targets.",
),
schemars::_private::apply_metadata(
schemars::_private::metadata::add_description(
gen.subschema_for::<BundleType>(),
schemars::schema::Metadata {
description: Some("A single bundle target.".to_owned()),
..Default::default()
},
"A single bundle target.",
),
];

Expand Down
24 changes: 12 additions & 12 deletions tooling/cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3fbc170

Please sign in to comment.