diff --git a/Cargo.lock b/Cargo.lock index 7cd923f..a3f690c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -373,7 +373,7 @@ dependencies = [ "glob-match", "graphql-parser", "graphql_client", - "ndc-sdk", + "ndc-models", "reqwest 0.12.7", "schemars", "serde", @@ -956,9 +956,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -969,7 +969,6 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] @@ -1221,7 +1220,7 @@ dependencies = [ "graphql-parser", "graphql_client", "insta", - "ndc-sdk", + "ndc-models", "schemars", "serde", "serde_json", diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index 1158a26..1b2c1df 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -8,10 +8,8 @@ async-trait = "0.1.78" glob-match = "0.2.1" graphql_client = "0.14.0" graphql-parser = "0.4.0" -ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs", tag = "v0.1.5", package = "ndc-sdk", features = [ - "rustls", -], default-features = false } -reqwest = { version = "0.12.3", features = [ +ndc-models = { git = "http://github.com/hasura/ndc-spec.git", tag = "v0.1.4" } +reqwest = { version = "0.12.7", features = [ "json", "rustls-tls", ], default-features = false } diff --git a/crates/common/src/capabilities_response.rs b/crates/common/src/capabilities_response.rs index b7151da..753d09a 100644 --- a/crates/common/src/capabilities_response.rs +++ b/crates/common/src/capabilities_response.rs @@ -1,4 +1,4 @@ -use ndc_sdk::models; +use ndc_models as models; pub fn capabilities_response() -> models::CapabilitiesResponse { models::CapabilitiesResponse { diff --git a/crates/common/src/schema_response.rs b/crates/common/src/schema_response.rs index 2a5e068..138ca66 100644 --- a/crates/common/src/schema_response.rs +++ b/crates/common/src/schema_response.rs @@ -5,7 +5,7 @@ use crate::config::{ }, RequestConfig, ResponseConfig, }; -use ndc_sdk::models; +use ndc_models as models; use std::{collections::BTreeMap, iter}; pub fn schema_response( diff --git a/crates/ndc-graphql-cli/Cargo.toml b/crates/ndc-graphql-cli/Cargo.toml index ed522e7..4f07c6e 100644 --- a/crates/ndc-graphql-cli/Cargo.toml +++ b/crates/ndc-graphql-cli/Cargo.toml @@ -9,9 +9,7 @@ common = { path = "../common" } graphql_client = "0.14.0" graphql-introspection-query = "0.2.0" graphql-parser = "0.4.0" -ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs", tag = "v0.1.5", package = "ndc-sdk", features = [ - "rustls", -], default-features = false } +ndc-models = { git = "http://github.com/hasura/ndc-spec.git", tag = "v0.1.4" } schemars = "0.8.16" serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" diff --git a/crates/ndc-graphql-cli/src/main.rs b/crates/ndc-graphql-cli/src/main.rs index 84c27ae..4d6e7a0 100644 --- a/crates/ndc-graphql-cli/src/main.rs +++ b/crates/ndc-graphql-cli/src/main.rs @@ -14,7 +14,7 @@ use common::{ use graphql::{execute_graphql_introspection, schema_from_introspection}; use graphql_parser::schema; use ndc_graphql_cli::graphql; -use ndc_sdk::models; +use ndc_models as models; use schemars::schema_for; use serde::Serialize; use std::{