Merge branch 'main' into serena/orient-to-face

KittyCAD · Jan 23, 2025 · 9584301 · 9584301
2 parents a6d5b16 + 7b155c1
commit 9584301
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bumper/Cargo.toml b/bumper/Cargo.toml
@@ -11,8 +11,8 @@ publish = false
 
 [dependencies]
 anyhow = "1.0.95"
-clap = { version = "4.5.26", features = ["derive"] }
-semver = "1.0.24"
+clap = { version = "4.5.27", features = ["derive"] }
+semver = "1.0.25"
 serde = "1.0.217"
 toml_edit = "0.22.16"
 

diff --git a/modeling-cmds/Cargo.toml b/modeling-cmds/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kittycad-modeling-cmds"
-version = "0.2.91"
+version = "0.2.92"
 edition = "2021"
 authors = ["KittyCAD, Inc."]
 description = "Commands in the KittyCAD Modeling API"
@@ -33,15 +33,15 @@ schemars = { version = "0.8.16", features = [
 ] }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_bytes = "0.11.15"
-serde_json = { version = "1.0.135", optional = true }
+serde_json = { version = "1.0.137", optional = true }
 slog = { version = "2.7.0", optional = true }
 tabled = { version = "0.17", optional = true }
 ts-rs = { version = "10.1.0", optional = true, features = [
     "uuid-impl",
     "no-serde-warnings",
     "serde-json-impl",
 ] }
-uuid = { version = "1.12.0", features = ["serde", "v4", "js"] }
+uuid = { version = "1.12.1", features = ["serde", "v4", "js"] }
 webrtc = { version = "0.11", optional = true }
 
 [lints]

diff --git a/modeling-cmds/src/def_enum.rs b/modeling-cmds/src/def_enum.rs
@@ -477,7 +477,7 @@ define_modeling_cmd_enum! {
         #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
         pub struct EntityMakeHelixFromParams {
             /// Radius of the helix.
-            pub radius: f64,
+            pub radius: LengthUnit,
             /// Length of the helix.
             pub length: LengthUnit,
             /// Number of revolutions.
@@ -499,7 +499,7 @@ define_modeling_cmd_enum! {
         #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
         pub struct EntityMakeHelixFromEdge {
             /// Radius of the helix.
-            pub radius: f64,
+            pub radius: LengthUnit,
             /// Length of the helix. If None, the length of the edge will be used instead.
             pub length: Option<LengthUnit>,
             /// Number of revolutions.

diff --git a/modeling-session/Cargo.toml b/modeling-session/Cargo.toml
@@ -16,11 +16,11 @@ kittycad = { workspace = true }
 kittycad-modeling-cmds = { workspace = true, features = ["websocket"] }
 lsystem = "0.2.1"
 reqwest = "0.12.12"
-serde_json = "1.0.135"
+serde_json = "1.0.137"
 thiserror = "2.0.11"
 tokio = { version = "1", features = ["sync"] }
 tokio-tungstenite = "0.24.0"
-uuid = { version = "1.12.0", features = ["v4"] }
+uuid = { version = "1.12.1", features = ["v4"] }
 
 [dev-dependencies]
 color-eyre = "0.6"