diff --git a/Cargo.lock b/Cargo.lock index 6131648df..fbde38c8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1130,6 +1130,7 @@ dependencies = [ [[package]] name = "filter-parser" version = "0.29.3" +source = "git+https://github.com/meilisearch/milli?branch=jayson-integration#6c8d2a5c2f368c67bacf849f6e47134d9347508a" dependencies = [ "nom", "nom_locate", @@ -1154,6 +1155,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" version = "0.29.3" +source = "git+https://github.com/meilisearch/milli?branch=jayson-integration#6c8d2a5c2f368c67bacf849f6e47134d9347508a" dependencies = [ "serde_json", ] @@ -1639,6 +1641,7 @@ checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "jayson" version = "0.1.0" +source = "git+https://github.com/meilisearch/jayson?branch=main#5088e9744eae5125a0da870a34f4fb6365963c07" dependencies = [ "jayson-internal", "serde_json", @@ -1647,6 +1650,7 @@ dependencies = [ [[package]] name = "jayson-internal" version = "0.1.0" +source = "git+https://github.com/meilisearch/jayson?branch=main#5088e9744eae5125a0da870a34f4fb6365963c07" dependencies = [ "convert_case 0.5.0", "proc-macro2 1.0.40", @@ -1690,6 +1694,7 @@ dependencies = [ [[package]] name = "json-depth-checker" version = "0.29.3" +source = "git+https://github.com/meilisearch/milli?branch=jayson-integration#6c8d2a5c2f368c67bacf849f6e47134d9347508a" dependencies = [ "serde_json", ] @@ -2222,6 +2227,7 @@ dependencies = [ [[package]] name = "milli" version = "0.29.3" +source = "git+https://github.com/meilisearch/milli?branch=jayson-integration#6c8d2a5c2f368c67bacf849f6e47134d9347508a" dependencies = [ "bimap", "bincode", diff --git a/meilisearch-auth/Cargo.toml b/meilisearch-auth/Cargo.toml index 9f930cb94..b6f8372b9 100644 --- a/meilisearch-auth/Cargo.toml +++ b/meilisearch-auth/Cargo.toml @@ -8,7 +8,7 @@ base64 = "0.13.0" enum-iterator = "0.7.0" hmac = "0.12.1" meilisearch-types = { path = "../meilisearch-types" } -milli = { path = "../../milli/milli" } +milli = { git = "https://github.com/meilisearch/milli", branch = "jayson-integration" } rand = "0.8.4" serde = { version = "1.0.136", features = ["derive"] } serde_json = { version = "1.0.79", features = ["preserve_order"] } diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml index 4ed999118..2536e8aa6 100644 --- a/meilisearch-http/Cargo.toml +++ b/meilisearch-http/Cargo.toml @@ -42,13 +42,13 @@ futures-util = "0.3.21" http = "0.2.6" indexmap = { version = "1.8.0", features = ["serde-1"] } itertools = "0.10.3" -jayson = { path = "../../jayson", features = ["serde-json"] } +jayson = { git = "https://github.com/meilisearch/jayson", branch = "main" } jsonwebtoken = "8.0.1" log = "0.4.14" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } meilisearch-lib = { path = "../meilisearch-lib" } -milli = { path = "../../milli/milli" } +milli = { git = "https://github.com/meilisearch/milli", branch = "jayson-integration" } mime = "0.3.16" num_cpus = "1.13.1" obkv = "0.2.0" diff --git a/meilisearch-lib/Cargo.toml b/meilisearch-lib/Cargo.toml index 89952995a..424ccddc1 100644 --- a/meilisearch-lib/Cargo.toml +++ b/meilisearch-lib/Cargo.toml @@ -30,8 +30,8 @@ lazy_static = "1.4.0" log = "0.4.14" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -milli = { path = "../../milli/milli" } -jayson = { path = "../../jayson" } +milli = { git = "https://github.com/meilisearch/milli", branch = "jayson-integration" } +jayson = { git = "https://github.com/meilisearch/jayson", branch = "main" } mime = "0.3.16" num_cpus = "1.13.1" obkv = "0.2.0" diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml index 2ee1e1ae3..1863cd1dc 100644 --- a/meilisearch-types/Cargo.toml +++ b/meilisearch-types/Cargo.toml @@ -10,8 +10,8 @@ proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.79" -jayson = { path = "../../jayson" } -milli = { path = "../../milli/milli" } +jayson = { git = "https://github.com/meilisearch/jayson", branch = "main" } +milli = { git = "https://github.com/meilisearch/milli", branch = "jayson-integration" } [features] test-traits = ["proptest", "proptest-derive"]