diff --git a/Cargo.lock b/Cargo.lock index 1952ce7c2..5729ee364 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -525,7 +525,7 @@ dependencies = [ "riff", "ring", "rsa", - "schemars 0.8.22", + "schemars 1.0.4", "serde", "serde-transcode", "serde-wasm-bindgen", @@ -1356,7 +1356,7 @@ version = "0.67.1" dependencies = [ "anyhow", "c2pa", - "schemars 0.8.22", + "schemars 1.0.4", "serde_json", ] @@ -3707,18 +3707,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "schemars" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - [[package]] name = "schemars" version = "0.9.0" @@ -3739,15 +3727,16 @@ checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" dependencies = [ "dyn-clone", "ref-cast", + "schemars_derive", "serde", "serde_json", ] [[package]] name = "schemars_derive" -version = "0.8.22" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" +checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80" dependencies = [ "proc-macro2", "quote", diff --git a/export_schema/Cargo.toml b/export_schema/Cargo.toml index 08e66e899..858843257 100644 --- a/export_schema/Cargo.toml +++ b/export_schema/Cargo.toml @@ -13,5 +13,5 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(test)'] } [dependencies] anyhow = "1.0.40" c2pa = { path = "../sdk", features = ["json_schema"], default-features = false } -schemars = "0.8.21" +schemars = "1.0.4" serde_json = "1.0.117" diff --git a/export_schema/src/main.rs b/export_schema/src/main.rs index 9d8dd75eb..79a60d233 100644 --- a/export_schema/src/main.rs +++ b/export_schema/src/main.rs @@ -2,9 +2,9 @@ use std::{fs, path::Path}; use anyhow::Result; use c2pa::{settings::Settings, Builder, ManifestDefinition, Reader}; -use schemars::{schema::RootSchema, schema_for}; +use schemars::{schema_for, Schema}; -fn write_schema(schema: &RootSchema, name: &str) { +fn write_schema(schema: &Schema, name: &str) { println!("Exporting JSON schema for {name}"); let output = serde_json::to_string_pretty(schema).expect("Failed to serialize schema"); let output_dir = Path::new("./target/schema"); diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index dc5c0a5e6..1848fb312 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -153,7 +153,7 @@ rasn-pkix = "0.26.0" regex = "1.11" riff = "2.0.0" rsa = { version = "0.9.7", features = ["pem", "sha2", "std"], optional = true } -schemars = { version = "0.8.21", optional = true } +schemars = { version = "1.0.4", optional = true } serde = { version = "1.0.225", features = ["derive"] } serde_bytes = "0.11.14" serde_cbor = "0.11.1"