fix: schemars 0.8.18 compatibility

backport of #9676 Co-authored-by: Hankung <73242257+Hankung7183@users.noreply.github.com>
tauri-apps · May 6, 2024 · 86326e4 · 86326e4
1 parent b8fd8e1
commit 86326e4
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 30 deletions.
diff --git a/.changes/schemars-comp.md b/.changes/schemars-comp.md
@@ -0,0 +1,5 @@
+---
+tauri-utils: "patch:bug"
+---
+
+Fixes `schemars` compilation issue.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/tauri-config-schema/Cargo.toml b/core/tauri-config-schema/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 tauri-utils = { version = "1.0.0", 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"] }
diff --git a/core/tauri-config-schema/schema.json b/core/tauri-config-schema/schema.json
@@ -226,7 +226,6 @@
         },
         "version": {
           "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field. If removed the version number from `Cargo.toml` is used.",
-          "default": null,
           "type": [
             "string",
             "null"

diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml
@@ -22,7 +22,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" ] }

diff --git a/core/tauri-utils/src/config.rs b/core/tauri-utils/src/config.rs
@@ -166,19 +166,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.",
       ),
     ];
 

diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock
diff --git a/tooling/cli/schema.json b/tooling/cli/schema.json
@@ -226,7 +226,6 @@
         },
         "version": {
           "description": "App version. It is a semver version number or a path to a `package.json` file containing the `version` field. If removed the version number from `Cargo.toml` is used.",
-          "default": null,
           "type": [
             "string",
             "null"