Skip to content
Merged

v3.5 #1730

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ include(CMakeDependentOption)

# Define Manifold version
set(MANIFOLD_VERSION_MAJOR 3)
set(MANIFOLD_VERSION_MINOR 4)
set(MANIFOLD_VERSION_PATCH 1)
set(MANIFOLD_VERSION_MINOR 5)
set(MANIFOLD_VERSION_PATCH 0)
set(
MANIFOLD_VERSION
"${MANIFOLD_VERSION_MAJOR}.${MANIFOLD_VERSION_MINOR}.${MANIFOLD_VERSION_PATCH}"
Expand Down
3 changes: 2 additions & 1 deletion bindings/wasm/examples/editor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion bindings/wasm/examples/make-manifold/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion bindings/wasm/examples/model-viewer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion bindings/wasm/examples/three/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bindings/wasm/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/wasm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "manifold-3d",
"version": "3.4.1",
"version": "3.5.0",
"description": "Geometry library for topological robustness",
"main": "manifold.js",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
flake-utils.lib.eachDefaultSystem
(system:
let
manifold-version = "3.4.1";
manifold-version = "3.5.0";
pkgs = import nixpkgs {
inherit system;
overlays = [
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "manifold3d"
version = "3.4.1"
version = "3.5.0"
authors = [
{ name="Emmett Lalish", email="elalish@gmail.com" },
]
Expand Down
4 changes: 2 additions & 2 deletions scripts/test-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd cmake-consumer
cat <<EOT > CMakeLists.txt
cmake_minimum_required(VERSION 3.18)
project(testing LANGUAGES CXX)
find_package(manifold "3.4.1" REQUIRED)
find_package(manifold "3.5.0" REQUIRED)
add_executable(testing test.cpp)
target_link_libraries(testing PRIVATE manifold::manifold)
EOT
Expand All @@ -14,7 +14,7 @@ cat <<EOT > test.cpp
#include <manifold/manifold.h>
#include <manifold/version.h>

#if MANIFOLD_VERSION < MANIFOLD_VERSION_NUMBER(3, 4, 0)
#if MANIFOLD_VERSION < MANIFOLD_VERSION_NUMBER(3, 5, 0)
# error "Unexpected: minimum version number not available"
#endif

Expand Down
Loading