Merge branch 'main' into manual-rewrite-poc

conjure-cp · Jan 26, 2024 · f0eb6d9 · f0eb6d9
2 parents 2691030 + 90e1835
commit f0eb6d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,13 @@
 [workspace]
 resolver = "2"
+
+default-members = [
+    "conjure_oxide",
+    "crates/conjure_core",
+    "solvers/kissat",
+    "solvers/minion",
+]
+
 members = [
     "conjure_oxide",
     "crates/conjure_core",

diff --git a/conjure_oxide/Cargo.toml b/conjure_oxide/Cargo.toml
@@ -14,11 +14,11 @@ conjure_rules = {path = "../crates/conjure_rules" }
 
 serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111"
-serde_with = "3.4.0"
+serde_with = "3.5.0"
 thiserror = "1.0.56"
 minion_rs = {path = "../solvers/minion" }
 anyhow = "1.0.79"
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.4.18", features = ["derive"] }
 strum_macros = "0.25.3"
 strum = "0.25.0"
 versions = "6.1.0"

diff --git a/crates/conjure_core/Cargo.toml b/crates/conjure_core/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 serde = { version = "1.0.192", features = ["derive"] }
 serde_json = "1.0.108"
-serde_with = "3.4.0"
+serde_with = "3.5.0"
 strum = "0.25.0"
 strum_macros = "0.25.3"
 thiserror = "1.0.50"