Merge pull request #1852 from hannobraun/core

Rename `fj-kernel` to `fj-core`
hannobraun · May 30, 2023 · 135841d · 135841d
2 parents 41774c2 + 2b33f55
commit 135841d
Show file tree

Hide file tree

Showing 100 changed files with 33 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,9 @@
 [workspace]
 resolver = "2"
 members = [
+    "crates/fj-core",
     "crates/fj-export",
     "crates/fj-interop",
-    "crates/fj-kernel",
     "crates/fj-math",
     "crates/fj-viewer",
     "crates/fj-window",
@@ -17,9 +17,9 @@ members = [
     "tools/release-operator",
 ]
 default-members = [
+    "crates/fj-core",
     "crates/fj-export",
     "crates/fj-interop",
-    "crates/fj-kernel",
     "crates/fj-math",
     "crates/fj-viewer",
 ]
@@ -42,6 +42,10 @@ categories = ["encoding", "mathematics", "rendering"]
 version = "0.46.0"
 path = "crates/fj"
 
+[workspace.dependencies.fj-core]
+version = "0.46.0"
+path = "crates/fj-core"
+
 [workspace.dependencies.fj-export]
 version = "0.46.0"
 path = "crates/fj-export"
@@ -54,10 +58,6 @@ path = "crates/fj-host"
 version = "0.46.0"
 path = "crates/fj-interop"
 
-[workspace.dependencies.fj-kernel]
-version = "0.46.0"
-path = "crates/fj-kernel"
-
 [workspace.dependencies.fj-math]
 version = "0.46.0"
 path = "crates/fj-math"

diff --git a/crates/fj-kernel/Cargo.toml → crates/fj-core/Cargo.toml b/crates/fj-kernel/Cargo.toml → crates/fj-core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "fj-kernel"
+name = "fj-core"
 version.workspace = true
 edition.workspace = true
 description.workspace = true

diff --git a/.../fj-kernel/src/algorithms/approx/cycle.rs → ...es/fj-core/src/algorithms/approx/cycle.rs b/.../fj-kernel/src/algorithms/approx/cycle.rs → ...es/fj-core/src/algorithms/approx/cycle.rs
diff --git a/...s/fj-kernel/src/algorithms/approx/edge.rs → crates/fj-core/src/algorithms/approx/edge.rs b/...s/fj-kernel/src/algorithms/approx/edge.rs → crates/fj-core/src/algorithms/approx/edge.rs
diff --git a/...s/fj-kernel/src/algorithms/approx/face.rs → crates/fj-core/src/algorithms/approx/face.rs b/...s/fj-kernel/src/algorithms/approx/face.rs → crates/fj-core/src/algorithms/approx/face.rs
diff --git a/...es/fj-kernel/src/algorithms/approx/mod.rs → crates/fj-core/src/algorithms/approx/mod.rs b/...es/fj-kernel/src/algorithms/approx/mod.rs → crates/fj-core/src/algorithms/approx/mod.rs
diff --git a/...s/fj-kernel/src/algorithms/approx/path.rs → crates/fj-core/src/algorithms/approx/path.rs b/...s/fj-kernel/src/algorithms/approx/path.rs → crates/fj-core/src/algorithms/approx/path.rs
diff --git a/.../fj-kernel/src/algorithms/approx/shell.rs → ...es/fj-core/src/algorithms/approx/shell.rs b/.../fj-kernel/src/algorithms/approx/shell.rs → ...es/fj-core/src/algorithms/approx/shell.rs
diff --git a/...fj-kernel/src/algorithms/approx/sketch.rs → ...s/fj-core/src/algorithms/approx/sketch.rs b/...fj-kernel/src/algorithms/approx/sketch.rs → ...s/fj-core/src/algorithms/approx/sketch.rs
diff --git a/.../fj-kernel/src/algorithms/approx/solid.rs → ...es/fj-core/src/algorithms/approx/solid.rs b/.../fj-kernel/src/algorithms/approx/solid.rs → ...es/fj-core/src/algorithms/approx/solid.rs
diff --git a/...kernel/src/algorithms/approx/tolerance.rs → ...j-core/src/algorithms/approx/tolerance.rs b/...kernel/src/algorithms/approx/tolerance.rs → ...j-core/src/algorithms/approx/tolerance.rs
diff --git a/...el/src/algorithms/intersect/curve_edge.rs → ...re/src/algorithms/intersect/curve_edge.rs b/...el/src/algorithms/intersect/curve_edge.rs → ...re/src/algorithms/intersect/curve_edge.rs
diff --git a/...el/src/algorithms/intersect/curve_face.rs → ...re/src/algorithms/intersect/curve_face.rs b/...el/src/algorithms/intersect/curve_face.rs → ...re/src/algorithms/intersect/curve_face.rs
diff --git a/...nel/src/algorithms/intersect/face_face.rs → ...ore/src/algorithms/intersect/face_face.rs b/...nel/src/algorithms/intersect/face_face.rs → ...ore/src/algorithms/intersect/face_face.rs
diff --git a/...el/src/algorithms/intersect/face_point.rs → ...re/src/algorithms/intersect/face_point.rs b/...el/src/algorithms/intersect/face_point.rs → ...re/src/algorithms/intersect/face_point.rs
diff --git a/.../src/algorithms/intersect/line_segment.rs → .../src/algorithms/intersect/line_segment.rs b/.../src/algorithms/intersect/line_segment.rs → .../src/algorithms/intersect/line_segment.rs
diff --git a/...fj-kernel/src/algorithms/intersect/mod.rs → ...s/fj-core/src/algorithms/intersect/mod.rs b/...fj-kernel/src/algorithms/intersect/mod.rs → ...s/fj-core/src/algorithms/intersect/mod.rs
diff --git a/...rnel/src/algorithms/intersect/ray_edge.rs → ...core/src/algorithms/intersect/ray_edge.rs b/...rnel/src/algorithms/intersect/ray_edge.rs → ...core/src/algorithms/intersect/ray_edge.rs
diff --git a/...rnel/src/algorithms/intersect/ray_face.rs → ...core/src/algorithms/intersect/ray_face.rs b/...rnel/src/algorithms/intersect/ray_face.rs → ...core/src/algorithms/intersect/ray_face.rs
diff --git a/...l/src/algorithms/intersect/ray_segment.rs → ...e/src/algorithms/intersect/ray_segment.rs b/...l/src/algorithms/intersect/ray_segment.rs → ...e/src/algorithms/intersect/ray_segment.rs
diff --git a/...c/algorithms/intersect/surface_surface.rs → ...c/algorithms/intersect/surface_surface.rs b/...c/algorithms/intersect/surface_surface.rs → ...c/algorithms/intersect/surface_surface.rs
diff --git a/crates/fj-kernel/src/algorithms/mod.rs → crates/fj-core/src/algorithms/mod.rs b/crates/fj-kernel/src/algorithms/mod.rs → crates/fj-core/src/algorithms/mod.rs
diff --git a/...fj-kernel/src/algorithms/reverse/cycle.rs → ...s/fj-core/src/algorithms/reverse/cycle.rs b/...fj-kernel/src/algorithms/reverse/cycle.rs → ...s/fj-core/src/algorithms/reverse/cycle.rs
diff --git a/.../fj-kernel/src/algorithms/reverse/face.rs → ...es/fj-core/src/algorithms/reverse/face.rs b/.../fj-kernel/src/algorithms/reverse/face.rs → ...es/fj-core/src/algorithms/reverse/face.rs
diff --git a/...s/fj-kernel/src/algorithms/reverse/mod.rs → crates/fj-core/src/algorithms/reverse/mod.rs b/...s/fj-kernel/src/algorithms/reverse/mod.rs → crates/fj-core/src/algorithms/reverse/mod.rs
diff --git a/...s/fj-kernel/src/algorithms/sweep/curve.rs → crates/fj-core/src/algorithms/sweep/curve.rs b/...s/fj-kernel/src/algorithms/sweep/curve.rs → crates/fj-core/src/algorithms/sweep/curve.rs
diff --git a/...es/fj-kernel/src/algorithms/sweep/edge.rs → crates/fj-core/src/algorithms/sweep/edge.rs b/...es/fj-kernel/src/algorithms/sweep/edge.rs → crates/fj-core/src/algorithms/sweep/edge.rs
diff --git a/...es/fj-kernel/src/algorithms/sweep/face.rs → crates/fj-core/src/algorithms/sweep/face.rs b/...es/fj-kernel/src/algorithms/sweep/face.rs → crates/fj-core/src/algorithms/sweep/face.rs
diff --git a/crates/fj-kernel/src/algorithms/sweep/mod.rs → crates/fj-core/src/algorithms/sweep/mod.rs b/crates/fj-kernel/src/algorithms/sweep/mod.rs → crates/fj-core/src/algorithms/sweep/mod.rs
diff --git a/.../fj-kernel/src/algorithms/sweep/sketch.rs → ...es/fj-core/src/algorithms/sweep/sketch.rs b/.../fj-kernel/src/algorithms/sweep/sketch.rs → ...es/fj-core/src/algorithms/sweep/sketch.rs
diff --git a/.../fj-kernel/src/algorithms/sweep/vertex.rs → ...es/fj-core/src/algorithms/sweep/vertex.rs b/.../fj-kernel/src/algorithms/sweep/vertex.rs → ...es/fj-core/src/algorithms/sweep/vertex.rs
diff --git a/...-kernel/src/algorithms/transform/cycle.rs → ...fj-core/src/algorithms/transform/cycle.rs b/...-kernel/src/algorithms/transform/cycle.rs → ...fj-core/src/algorithms/transform/cycle.rs
diff --git a/...j-kernel/src/algorithms/transform/edge.rs → .../fj-core/src/algorithms/transform/edge.rs b/...j-kernel/src/algorithms/transform/edge.rs → .../fj-core/src/algorithms/transform/edge.rs
diff --git a/...j-kernel/src/algorithms/transform/face.rs → .../fj-core/src/algorithms/transform/face.rs b/...j-kernel/src/algorithms/transform/face.rs → .../fj-core/src/algorithms/transform/face.rs
diff --git a/...fj-kernel/src/algorithms/transform/mod.rs → ...s/fj-core/src/algorithms/transform/mod.rs b/...fj-kernel/src/algorithms/transform/mod.rs → ...s/fj-core/src/algorithms/transform/mod.rs
diff --git a/...-kernel/src/algorithms/transform/shell.rs → ...fj-core/src/algorithms/transform/shell.rs b/...-kernel/src/algorithms/transform/shell.rs → ...fj-core/src/algorithms/transform/shell.rs
diff --git a/...-kernel/src/algorithms/transform/solid.rs → ...fj-core/src/algorithms/transform/solid.rs b/...-kernel/src/algorithms/transform/solid.rs → ...fj-core/src/algorithms/transform/solid.rs
diff --git a/...ernel/src/algorithms/transform/surface.rs → ...-core/src/algorithms/transform/surface.rs b/...ernel/src/algorithms/transform/surface.rs → ...-core/src/algorithms/transform/surface.rs
diff --git a/...kernel/src/algorithms/transform/vertex.rs → ...j-core/src/algorithms/transform/vertex.rs b/...kernel/src/algorithms/transform/vertex.rs → ...j-core/src/algorithms/transform/vertex.rs
diff --git a/...el/src/algorithms/triangulate/delaunay.rs → ...re/src/algorithms/triangulate/delaunay.rs b/...el/src/algorithms/triangulate/delaunay.rs → ...re/src/algorithms/triangulate/delaunay.rs
diff --git a/...-kernel/src/algorithms/triangulate/mod.rs → ...fj-core/src/algorithms/triangulate/mod.rs b/...-kernel/src/algorithms/triangulate/mod.rs → ...fj-core/src/algorithms/triangulate/mod.rs
diff --git a/...nel/src/algorithms/triangulate/polygon.rs → ...ore/src/algorithms/triangulate/polygon.rs b/...nel/src/algorithms/triangulate/polygon.rs → ...ore/src/algorithms/triangulate/polygon.rs
diff --git a/crates/fj-kernel/src/geometry/curve.rs → crates/fj-core/src/geometry/curve.rs b/crates/fj-kernel/src/geometry/curve.rs → crates/fj-core/src/geometry/curve.rs
diff --git a/crates/fj-kernel/src/geometry/mod.rs → crates/fj-core/src/geometry/mod.rs b/crates/fj-kernel/src/geometry/mod.rs → crates/fj-core/src/geometry/mod.rs
diff --git a/crates/fj-kernel/src/geometry/region.rs → crates/fj-core/src/geometry/region.rs b/crates/fj-kernel/src/geometry/region.rs → crates/fj-core/src/geometry/region.rs
diff --git a/crates/fj-kernel/src/geometry/surface.rs → crates/fj-core/src/geometry/surface.rs b/crates/fj-kernel/src/geometry/surface.rs → crates/fj-core/src/geometry/surface.rs
diff --git a/crates/fj-kernel/src/lib.rs → crates/fj-core/src/lib.rs b/crates/fj-kernel/src/lib.rs → crates/fj-core/src/lib.rs
@@ -1,4 +1,4 @@
-//! # Fornjot CAD Kernel
+//! # Fornjot Core
 //!
 //! [Fornjot] is an early-stage b-rep CAD kernel written in Rust. The kernel is
 //! split into multiple libraries that can be used semi-independently, and this

diff --git a/crates/fj-kernel/src/objects/kinds/cycle.rs → crates/fj-core/src/objects/kinds/cycle.rs b/crates/fj-kernel/src/objects/kinds/cycle.rs → crates/fj-core/src/objects/kinds/cycle.rs
diff --git a/crates/fj-kernel/src/objects/kinds/edge.rs → crates/fj-core/src/objects/kinds/edge.rs b/crates/fj-kernel/src/objects/kinds/edge.rs → crates/fj-core/src/objects/kinds/edge.rs
diff --git a/crates/fj-kernel/src/objects/kinds/face.rs → crates/fj-core/src/objects/kinds/face.rs b/crates/fj-kernel/src/objects/kinds/face.rs → crates/fj-core/src/objects/kinds/face.rs
diff --git a/crates/fj-kernel/src/objects/kinds/mod.rs → crates/fj-core/src/objects/kinds/mod.rs b/crates/fj-kernel/src/objects/kinds/mod.rs → crates/fj-core/src/objects/kinds/mod.rs
diff --git a/crates/fj-kernel/src/objects/kinds/shell.rs → crates/fj-core/src/objects/kinds/shell.rs b/crates/fj-kernel/src/objects/kinds/shell.rs → crates/fj-core/src/objects/kinds/shell.rs
diff --git a/crates/fj-kernel/src/objects/kinds/sketch.rs → crates/fj-core/src/objects/kinds/sketch.rs b/crates/fj-kernel/src/objects/kinds/sketch.rs → crates/fj-core/src/objects/kinds/sketch.rs
diff --git a/crates/fj-kernel/src/objects/kinds/solid.rs → crates/fj-core/src/objects/kinds/solid.rs b/crates/fj-kernel/src/objects/kinds/solid.rs → crates/fj-core/src/objects/kinds/solid.rs
diff --git a/...es/fj-kernel/src/objects/kinds/surface.rs → crates/fj-core/src/objects/kinds/surface.rs b/...es/fj-kernel/src/objects/kinds/surface.rs → crates/fj-core/src/objects/kinds/surface.rs
diff --git a/crates/fj-kernel/src/objects/kinds/vertex.rs → crates/fj-core/src/objects/kinds/vertex.rs b/crates/fj-kernel/src/objects/kinds/vertex.rs → crates/fj-core/src/objects/kinds/vertex.rs
diff --git a/crates/fj-kernel/src/objects/mod.rs → crates/fj-core/src/objects/mod.rs b/crates/fj-kernel/src/objects/mod.rs → crates/fj-core/src/objects/mod.rs
diff --git a/crates/fj-kernel/src/objects/object.rs → crates/fj-core/src/objects/object.rs b/crates/fj-kernel/src/objects/object.rs → crates/fj-core/src/objects/object.rs
diff --git a/crates/fj-kernel/src/objects/set.rs → crates/fj-core/src/objects/set.rs b/crates/fj-kernel/src/objects/set.rs → crates/fj-core/src/objects/set.rs
diff --git a/crates/fj-kernel/src/objects/stores.rs → crates/fj-core/src/objects/stores.rs b/crates/fj-kernel/src/objects/stores.rs → crates/fj-core/src/objects/stores.rs
diff --git a/...s/fj-kernel/src/operations/build/cycle.rs → crates/fj-core/src/operations/build/cycle.rs b/...s/fj-kernel/src/operations/build/cycle.rs → crates/fj-core/src/operations/build/cycle.rs
diff --git a/...es/fj-kernel/src/operations/build/edge.rs → crates/fj-core/src/operations/build/edge.rs b/...es/fj-kernel/src/operations/build/edge.rs → crates/fj-core/src/operations/build/edge.rs
diff --git a/...es/fj-kernel/src/operations/build/face.rs → crates/fj-core/src/operations/build/face.rs b/...es/fj-kernel/src/operations/build/face.rs → crates/fj-core/src/operations/build/face.rs
diff --git a/crates/fj-kernel/src/operations/build/mod.rs → crates/fj-core/src/operations/build/mod.rs b/crates/fj-kernel/src/operations/build/mod.rs → crates/fj-core/src/operations/build/mod.rs
diff --git a/...s/fj-kernel/src/operations/build/shell.rs → crates/fj-core/src/operations/build/shell.rs b/...s/fj-kernel/src/operations/build/shell.rs → crates/fj-core/src/operations/build/shell.rs
diff --git a/.../fj-kernel/src/operations/build/sketch.rs → ...es/fj-core/src/operations/build/sketch.rs b/.../fj-kernel/src/operations/build/sketch.rs → ...es/fj-core/src/operations/build/sketch.rs
diff --git a/...s/fj-kernel/src/operations/build/solid.rs → crates/fj-core/src/operations/build/solid.rs b/...s/fj-kernel/src/operations/build/solid.rs → crates/fj-core/src/operations/build/solid.rs
diff --git a/...fj-kernel/src/operations/build/surface.rs → ...s/fj-core/src/operations/build/surface.rs b/...fj-kernel/src/operations/build/surface.rs → ...s/fj-core/src/operations/build/surface.rs
diff --git a/crates/fj-kernel/src/operations/insert.rs → crates/fj-core/src/operations/insert.rs b/crates/fj-kernel/src/operations/insert.rs → crates/fj-core/src/operations/insert.rs
diff --git a/...es/fj-kernel/src/operations/join/cycle.rs → crates/fj-core/src/operations/join/cycle.rs b/...es/fj-kernel/src/operations/join/cycle.rs → crates/fj-core/src/operations/join/cycle.rs
diff --git a/crates/fj-kernel/src/operations/join/mod.rs → crates/fj-core/src/operations/join/mod.rs b/crates/fj-kernel/src/operations/join/mod.rs → crates/fj-core/src/operations/join/mod.rs
diff --git a/crates/fj-kernel/src/operations/mod.rs → crates/fj-core/src/operations/mod.rs b/crates/fj-kernel/src/operations/mod.rs → crates/fj-core/src/operations/mod.rs
diff --git a/.../fj-kernel/src/operations/update/cycle.rs → ...es/fj-core/src/operations/update/cycle.rs b/.../fj-kernel/src/operations/update/cycle.rs → ...es/fj-core/src/operations/update/cycle.rs
diff --git a/...s/fj-kernel/src/operations/update/edge.rs → crates/fj-core/src/operations/update/edge.rs b/...s/fj-kernel/src/operations/update/edge.rs → crates/fj-core/src/operations/update/edge.rs
diff --git a/...s/fj-kernel/src/operations/update/face.rs → crates/fj-core/src/operations/update/face.rs b/...s/fj-kernel/src/operations/update/face.rs → crates/fj-core/src/operations/update/face.rs
diff --git a/...es/fj-kernel/src/operations/update/mod.rs → crates/fj-core/src/operations/update/mod.rs b/...es/fj-kernel/src/operations/update/mod.rs → crates/fj-core/src/operations/update/mod.rs
diff --git a/.../fj-kernel/src/operations/update/shell.rs → ...es/fj-core/src/operations/update/shell.rs b/.../fj-kernel/src/operations/update/shell.rs → ...es/fj-core/src/operations/update/shell.rs
diff --git a/.../fj-kernel/src/operations/update/solid.rs → ...es/fj-core/src/operations/update/solid.rs b/.../fj-kernel/src/operations/update/solid.rs → ...es/fj-core/src/operations/update/solid.rs
diff --git a/crates/fj-kernel/src/services/mod.rs → crates/fj-core/src/services/mod.rs b/crates/fj-kernel/src/services/mod.rs → crates/fj-core/src/services/mod.rs
diff --git a/crates/fj-kernel/src/services/objects.rs → crates/fj-core/src/services/objects.rs b/crates/fj-kernel/src/services/objects.rs → crates/fj-core/src/services/objects.rs
diff --git a/crates/fj-kernel/src/services/service.rs → crates/fj-core/src/services/service.rs b/crates/fj-kernel/src/services/service.rs → crates/fj-core/src/services/service.rs
diff --git a/crates/fj-kernel/src/services/validation.rs → crates/fj-core/src/services/validation.rs b/crates/fj-kernel/src/services/validation.rs → crates/fj-core/src/services/validation.rs
diff --git a/crates/fj-kernel/src/storage/blocks.rs → crates/fj-core/src/storage/blocks.rs b/crates/fj-kernel/src/storage/blocks.rs → crates/fj-core/src/storage/blocks.rs
diff --git a/crates/fj-kernel/src/storage/handle.rs → crates/fj-core/src/storage/handle.rs b/crates/fj-kernel/src/storage/handle.rs → crates/fj-core/src/storage/handle.rs
diff --git a/crates/fj-kernel/src/storage/mod.rs → crates/fj-core/src/storage/mod.rs b/crates/fj-kernel/src/storage/mod.rs → crates/fj-core/src/storage/mod.rs
diff --git a/crates/fj-kernel/src/storage/store.rs → crates/fj-core/src/storage/store.rs b/crates/fj-kernel/src/storage/store.rs → crates/fj-core/src/storage/store.rs
diff --git a/crates/fj-kernel/src/validate/cycle.rs → crates/fj-core/src/validate/cycle.rs b/crates/fj-kernel/src/validate/cycle.rs → crates/fj-core/src/validate/cycle.rs
diff --git a/crates/fj-kernel/src/validate/edge.rs → crates/fj-core/src/validate/edge.rs b/crates/fj-kernel/src/validate/edge.rs → crates/fj-core/src/validate/edge.rs
diff --git a/crates/fj-kernel/src/validate/face.rs → crates/fj-core/src/validate/face.rs b/crates/fj-kernel/src/validate/face.rs → crates/fj-core/src/validate/face.rs
diff --git a/crates/fj-kernel/src/validate/mod.rs → crates/fj-core/src/validate/mod.rs b/crates/fj-kernel/src/validate/mod.rs → crates/fj-core/src/validate/mod.rs
diff --git a/crates/fj-kernel/src/validate/shell.rs → crates/fj-core/src/validate/shell.rs b/crates/fj-kernel/src/validate/shell.rs → crates/fj-core/src/validate/shell.rs
diff --git a/crates/fj-kernel/src/validate/sketch.rs → crates/fj-core/src/validate/sketch.rs b/crates/fj-kernel/src/validate/sketch.rs → crates/fj-core/src/validate/sketch.rs
diff --git a/crates/fj-kernel/src/validate/solid.rs → crates/fj-core/src/validate/solid.rs b/crates/fj-kernel/src/validate/solid.rs → crates/fj-core/src/validate/solid.rs
diff --git a/crates/fj-kernel/src/validate/surface.rs → crates/fj-core/src/validate/surface.rs b/crates/fj-kernel/src/validate/surface.rs → crates/fj-core/src/validate/surface.rs
diff --git a/crates/fj-kernel/src/validate/vertex.rs → crates/fj-core/src/validate/vertex.rs b/crates/fj-kernel/src/validate/vertex.rs → crates/fj-core/src/validate/vertex.rs
diff --git a/models/cuboid/Cargo.toml b/models/cuboid/Cargo.toml
@@ -12,12 +12,12 @@ itertools = "0.10.5"
 version = "4.3.0"
 features = ["derive"]
 
+[dependencies.fj-core]
+path = "../../crates/fj-core"
+
 [dependencies.fj-export]
 path = "../../crates/fj-export"
 
-[dependencies.fj-kernel]
-path = "../../crates/fj-kernel"
-
 [dependencies.fj-math]
 path = "../../crates/fj-math"
 

diff --git a/models/cuboid/src/lib.rs b/models/cuboid/src/lib.rs
@@ -1,4 +1,4 @@
-use fj_kernel::{
+use fj_core::{
     algorithms::sweep::Sweep,
     objects::{Sketch, Solid},
     operations::{BuildSketch, Insert},

diff --git a/models/cuboid/src/main.rs b/models/cuboid/src/main.rs
@@ -1,6 +1,6 @@
 use std::{ops::Deref, path::PathBuf};
 
-use fj_kernel::algorithms::{approx::Tolerance, triangulate::Triangulate};
+use fj_core::algorithms::{approx::Tolerance, triangulate::Triangulate};
 
 fn main() -> anyhow::Result<()> {
     let args = Args::parse();

diff --git a/tools/cross-compiler/src/main.rs b/tools/cross-compiler/src/main.rs
@@ -13,18 +13,18 @@ fn main() -> anyhow::Result<()> {
     let targets = [
         Target {
             triple: "aarch64-apple-ios",
-            crates: &["fj-export", "fj-interop", "fj-kernel", "fj-math"],
+            crates: &["fj-core", "fj-export", "fj-interop", "fj-math"],
         },
         Target {
             triple: "aarch64-linux-android",
-            crates: &["fj-export", "fj-interop", "fj-kernel", "fj-math"],
+            crates: &["fj-core", "fj-export", "fj-interop", "fj-math"],
         },
         Target {
             triple: "wasm32-unknown-unknown",
             crates: &[
+                "fj-core",
                 "fj-export",
                 "fj-interop",
-                "fj-kernel",
                 "fj-math",
                 "fj-viewer",
             ],