diff --git a/Cargo.lock b/Cargo.lock index c7dc227..95fe285 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1514,9 +1514,9 @@ dependencies = [ [[package]] name = "preserves-schema" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "880d6d65090867b191fee800c41d98b1076d2fd70121b2a5fe0001f5cd41c77d" +checksum = "78f139390067c0b67ccb0cb2498eba0e1576f4df8897d78d0e22dd8b2aeb39f1" dependencies = [ "convert_case", "glob", diff --git a/syndicate-server/Cargo.toml b/syndicate-server/Cargo.toml index f92ebd9..b1c2123 100644 --- a/syndicate-server/Cargo.toml +++ b/syndicate-server/Cargo.toml @@ -10,11 +10,11 @@ repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs" license = "Apache-2.0" [build-dependencies] -preserves-schema = "3.1" +preserves-schema = "3.2" syndicate = { path = "../syndicate", version = "0.26.0"} [dependencies] -preserves-schema = "3.1" +preserves-schema = "3.2" syndicate = { path = "../syndicate", version = "0.26.0"} syndicate-macros = { path = "../syndicate-macros", version = "0.21.0"} diff --git a/syndicate-server/build.rs b/syndicate-server/build.rs index c4bbca6..230f212 100644 --- a/syndicate-server/build.rs +++ b/syndicate-server/build.rs @@ -181,7 +181,7 @@ fn main() -> std::io::Result<()> { ); let inputs = expand_inputs(&vec!["protocols/schema-bundle.bin".to_owned()])?; - let xref = expand_inputs(&vec!["../syndicate/protocols/schema-bundle.bin".to_owned()])?; - c.load_schemas_and_bundles(&inputs, &xref)?; + c.load_schemas_and_bundles(&inputs, &vec![])?; + c.load_xref_bin("syndicate", syndicate::schemas::_bundle())?; compile(&c) } diff --git a/syndicate/Cargo.toml b/syndicate/Cargo.toml index 0cd0c72..2cd8be1 100644 --- a/syndicate/Cargo.toml +++ b/syndicate/Cargo.toml @@ -13,11 +13,11 @@ license = "Apache-2.0" vendored-openssl = ["openssl/vendored"] [build-dependencies] -preserves-schema = "3.1" +preserves-schema = "3.2" [dependencies] preserves = "3.0" -preserves-schema = "3.1" +preserves-schema = "3.2" tokio = { version = "1.10", features = ["io-util", "macros", "rt", "rt-multi-thread", "time"] } tokio-util = "0.6"