From 7ab2649df5d4cc4a8b9f72ab2d59f7c85006f6c1 Mon Sep 17 00:00:00 2001 From: Jan Orend <56254096+3dJan@users.noreply.github.com> Date: Tue, 9 Jul 2024 14:32:14 +0200 Subject: [PATCH] Update interface version to 2.4.0 --- .github/workflows/build.yml | 20 ++----------------- .../Bindings/CppDynamic/lib3mf_abi.hpp | 2 +- Autogenerated/Bindings/Go/lib3mf_impl.go | 2 +- Autogenerated/Source/lib3mf_abi.hpp | 2 +- .../Source/lib3mf_interfaceexception.cpp | 2 +- SDK/Examples/CSharp/Lib3MF_Example.cs | 2 +- SDK/Examples/Pascal/Lib3MF_Example.lpr | 2 +- SDK/Examples/Python/3mf_convert.py | 2 +- SDK/Examples/Python/Lib3MF_Example.py | 2 +- SDK/Examples/Python/add_triangle.py | 2 +- SDK/Examples/Python/beam_lattice.py | 2 +- SDK/Examples/Python/color_cube.py | 2 +- SDK/Examples/Python/create_components.py | 2 +- SDK/Examples/Python/create_cube.py | 2 +- SDK/Examples/Python/extract_info.py | 2 +- SDK/Examples/Python/lib3mf_common.py | 2 +- Source/API/lib3mf.cpp | 2 +- submodules/zlib | 2 +- 18 files changed, 19 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72f1bf534..7f98691c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -506,29 +506,13 @@ jobs: cmake --build . ./Example_ExtractInfo ../../../Examples/Files/Helix.3mf - deploy-source-code-with-submodules: - runs-on: ubuntu-20.04 - needs: [ set-lib3mf-version, assemble-sdk ] - env: - LIB3MF_VERSION: ${{ needs.set-lib3mf-version.outputs.lib3mf-version }} - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - run: | - mkdir -p lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules - rsync -av --progress . ./lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules --exclude .git --exclude .gitignore --exclude .github --exclude .gitmodules --exclude *.yml --exclude lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules - - name: Upload Artifact - uses: actions/upload-artifact@v4 - with: - name: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules - path: lib3mf-${{ env.LIB3MF_VERSION }}-source-with-submodules + set-integration-tests-status: runs-on: ubuntu-20.04 - needs: [ deploy-linux, deploy-windows, deploy-macos, deploy-source-code-with-submodules ] + needs: [ deploy-linux, deploy-windows, deploy-macos ] outputs: run_integration_tests: ${{ steps.set-status.outputs.run_integration_tests }} steps: diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_abi.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_abi.hpp index 6b1dac4a1..c9fe364e8 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_abi.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_abi.hpp @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1. Abstract: This is an autogenerated C++-Header file in order to allow an easy use of the 3MF Library -Interface version: 2.3.2 +Interface version: 2.4.0 */ diff --git a/Autogenerated/Bindings/Go/lib3mf_impl.go b/Autogenerated/Bindings/Go/lib3mf_impl.go index 552faf054..a01a2f902 100644 --- a/Autogenerated/Bindings/Go/lib3mf_impl.go +++ b/Autogenerated/Bindings/Go/lib3mf_impl.go @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1. Abstract: This is an autogenerated Go implementation file in order to allow an easy use of the 3MF Library -Interface version: 2.3.2 +Interface version: 2.4.0 */ diff --git a/Autogenerated/Source/lib3mf_abi.hpp b/Autogenerated/Source/lib3mf_abi.hpp index f1340326e..5c4790230 100644 --- a/Autogenerated/Source/lib3mf_abi.hpp +++ b/Autogenerated/Source/lib3mf_abi.hpp @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1. Abstract: This is an autogenerated C++-Header file in order to allow an easy use of the 3MF Library -Interface version: 2.3.2 +Interface version: 2.4.0 */ diff --git a/Autogenerated/Source/lib3mf_interfaceexception.cpp b/Autogenerated/Source/lib3mf_interfaceexception.cpp index 308a29e1c..c93e0cf1c 100644 --- a/Autogenerated/Source/lib3mf_interfaceexception.cpp +++ b/Autogenerated/Source/lib3mf_interfaceexception.cpp @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1. Abstract: This is an autogenerated C++ Implementation file with the basic internal exception type in order to allow an easy use of the 3MF Library -Interface version: 2.3.2 +Interface version: 2.4.0 */ diff --git a/SDK/Examples/CSharp/Lib3MF_Example.cs b/SDK/Examples/CSharp/Lib3MF_Example.cs index a5b5b9dcc..c98dfdd31 100644 --- a/SDK/Examples/CSharp/Lib3MF_Example.cs +++ b/SDK/Examples/CSharp/Lib3MF_Example.cs @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1. Abstract: This is an autogenerated CSharp application that demonstrates the usage of the CSharp bindings of the 3MF Library -Interface version: 2.3.2 +Interface version: 2.4.0 */ diff --git a/SDK/Examples/Pascal/Lib3MF_Example.lpr b/SDK/Examples/Pascal/Lib3MF_Example.lpr index 22d95d28e..1fa94bbb9 100644 --- a/SDK/Examples/Pascal/Lib3MF_Example.lpr +++ b/SDK/Examples/Pascal/Lib3MF_Example.lpr @@ -29,7 +29,7 @@ Abstract: This is an autogenerated Pascal application that demonstrates the usage of the Pascal bindings of the 3MF Library -Interface version: 2.3.2 +Interface version: 2.4.0 *) diff --git a/SDK/Examples/Python/3mf_convert.py b/SDK/Examples/Python/3mf_convert.py index 10e10e264..428afe7eb 100644 --- a/SDK/Examples/Python/3mf_convert.py +++ b/SDK/Examples/Python/3mf_convert.py @@ -26,7 +26,7 @@ Abstract: An example to convert between 3MF and STL -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/SDK/Examples/Python/Lib3MF_Example.py b/SDK/Examples/Python/Lib3MF_Example.py index b656b5ac3..00a022f79 100644 --- a/SDK/Examples/Python/Lib3MF_Example.py +++ b/SDK/Examples/Python/Lib3MF_Example.py @@ -29,7 +29,7 @@ Abstract: This is an autogenerated Python application that demonstrates the usage of the Python bindings of the 3MF Library -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/SDK/Examples/Python/add_triangle.py b/SDK/Examples/Python/add_triangle.py index 80e335d32..6093235a8 100644 --- a/SDK/Examples/Python/add_triangle.py +++ b/SDK/Examples/Python/add_triangle.py @@ -26,7 +26,7 @@ Abstract: Simplest 3mf example that just includes a single triangle -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/SDK/Examples/Python/beam_lattice.py b/SDK/Examples/Python/beam_lattice.py index c2fbce2d6..71baccca6 100644 --- a/SDK/Examples/Python/beam_lattice.py +++ b/SDK/Examples/Python/beam_lattice.py @@ -26,7 +26,7 @@ Abstract: Beam Lattice example -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/SDK/Examples/Python/color_cube.py b/SDK/Examples/Python/color_cube.py index 704b15248..dc4e505aa 100644 --- a/SDK/Examples/Python/color_cube.py +++ b/SDK/Examples/Python/color_cube.py @@ -26,7 +26,7 @@ Abstract: Color cube example -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/SDK/Examples/Python/create_components.py b/SDK/Examples/Python/create_components.py index f0bf17c0f..363e0d3c4 100644 --- a/SDK/Examples/Python/create_components.py +++ b/SDK/Examples/Python/create_components.py @@ -26,7 +26,7 @@ Abstract: An example that creates multiple components using transformations -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/SDK/Examples/Python/create_cube.py b/SDK/Examples/Python/create_cube.py index 5a5aa007e..f7ac427d1 100644 --- a/SDK/Examples/Python/create_cube.py +++ b/SDK/Examples/Python/create_cube.py @@ -26,7 +26,7 @@ Abstract: Create a simple cube -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/SDK/Examples/Python/extract_info.py b/SDK/Examples/Python/extract_info.py index 0aa1be623..cbec134b4 100644 --- a/SDK/Examples/Python/extract_info.py +++ b/SDK/Examples/Python/extract_info.py @@ -26,7 +26,7 @@ Abstract: Extract info from a 3MF model -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/SDK/Examples/Python/lib3mf_common.py b/SDK/Examples/Python/lib3mf_common.py index c9296d1f1..2aac42422 100644 --- a/SDK/Examples/Python/lib3mf_common.py +++ b/SDK/Examples/Python/lib3mf_common.py @@ -26,7 +26,7 @@ Abstract: Common set of functions that are used across all examples -Interface version: 2.3.2 +Interface version: 2.4.0 ''' diff --git a/Source/API/lib3mf.cpp b/Source/API/lib3mf.cpp index 4b309cab2..19a7094d0 100644 --- a/Source/API/lib3mf.cpp +++ b/Source/API/lib3mf.cpp @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1. Abstract: This is an autogenerated C++ implementation file in order to allow easy development of the 3MF Library. It needs to be generated only once. -Interface version: 2.3.2 +Interface version: 2.4.0 */ diff --git a/submodules/zlib b/submodules/zlib index 51b7f2abd..09155eaa2 160000 --- a/submodules/zlib +++ b/submodules/zlib @@ -1 +1 @@ -Subproject commit 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf +Subproject commit 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851