V2.3.0

.github/workflows/build_cmake.yml

@@ -24,7 +24,7 @@ jobs:
         cxx: [g++-11, clang++-15]
         cxx_version: [17, 20]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install dependencies
         run: sudo apt-get install ${{ matrix.cxx }} ninja-build lcov doxygen
       - name: Check Coverage
@@ -62,7 +62,7 @@ jobs:
           genhtml coverage_filtered.info --output-directory html
       - name: Archive code coverage results
         if: ${{ env.COVERAGE == 'ON' && matrix.cxx_version == '17' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: code-coverage-report
           path: html
@@ -84,7 +84,7 @@ jobs:
           echo "VERSION=$version" >> "$GITHUB_ENV"
       - name: Upload rexsapi package
         if: ${{ matrix.build_type == 'Release' && matrix.cxx == 'g++-11' && matrix.cxx_version == '17' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: rexsapi-linux-${{env.VERSION}}
           path: build/rexsapi-linux-*.zip
@@ -99,9 +99,9 @@ jobs:
         build_type: [Debug, Release]
         cxx_version: [17, 20]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install dependencies
-        run: brew install --cask doxygen
+        run: brew install doxygen
       - name: Configure
         run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_STANDARD=${{matrix.cxx_version}} ..
       - name: Build
@@ -120,7 +120,7 @@ jobs:
           echo "VERSION=$version" >> "$GITHUB_ENV"
       - name: Upload rexsapi package
         if: ${{ matrix.build_type == 'Release' && matrix.cxx_version == 17 }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: rexsapi-darwin-${{env.VERSION}}
           path: build/rexsapi-darwin-*.zip
@@ -135,7 +135,7 @@ jobs:
         build_type: [Debug, Release]
         cxx_version: [17, 20]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install dependencies
         run: choco install doxygen.install
       - name: Configure
@@ -169,7 +169,7 @@ jobs:
         shell: python
       - name: Upload rexsapi package
         if: ${{ matrix.build_type == 'Release' && matrix.cxx_version == 17 }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: rexsapi-windows-${{env.VERSION}}
           path: build/rexsapi-*.zip
@@ -181,17 +181,17 @@ jobs:
     runs-on: ubuntu-22.04
     needs: [build-linux, build-windows, build-macos]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Extract release notes
         id: extract-release-notes
-        uses: ffurrer2/extract-release-notes@v2
+        uses: ffurrer2/extract-release-notes@v3
         with:
           changelog_file: CHANGELOG.md
       - name: Get release name
         run: |
           version=$(grep "project(" CMakeLists.txt | cut -d ' ' -f3)
           echo "VERSION=$version" >> "$GITHUB_ENV"
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           path: artifacts
       - name: Create release

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.0]
+
+### Changed
+
+- REXS schema version 2.0.0 added
+- Updated ThirdParty components
+
 ## [2.2.0]
 
 ### Fixed

CMakeLists.txt

@@ -52,7 +52,7 @@ if(NOT APPLE AND UNIX)
     message(FATAL_ERROR "unsupported compiler")
   endif()
 elseif(WIN32)
-  set(REXSAPI_COMPILE_OPTIONS /W4 /WX)
+  set(REXSAPI_COMPILE_OPTIONS /W4 /WX /DFMT_UNICODE=0)
 elseif(APPLE)
   set(REXSAPI_COMPILE_OPTIONS -g -Wall -Wheader-hygiene -Wcast-align -Wconversion -Wfloat-equal -Wformat=2 -Wmissing-declarations -Woverlength-strings -Wshadow -Wextra -Wpedantic -Wnon-virtual-dtor -Werror -Wno-nested-anon-types -Wdelete-non-virtual-dtor -Wdeprecated -Wfloat-conversion -Wfloat-overflow-conversion -Wmove -Wredundant-move -Wshadow-all -Wsign-compare -Wsign-conversion -Wunreachable-code -Wunused-value -Wignored-qualifiers -Wno-unused-private-field)
 else()

README.md

@@ -15,7 +15,7 @@ The project is now released and is already used in production.
 
 # Supported REXS Versions
 
-The library uses REXS database model files in order to validate REXS model files. Database model files can be downloaded from the [REXS database page](https://database.rexs.info/). Currently, the implementation supports versions 1.0 to 1.7, but newer database files should also work. Version 1.0 to 1.7 database model files in english and german can also be found in the models directory of this project.
+The library uses REXS database model files in order to validate REXS model files. Database model files can be downloaded from the [REXS database page](https://database.rexs.info/). Currently, the implementation supports versions 1.0 to 2.0.0, but newer database files should also work. Version 1.0 to 2.0.0 database model files in english and german can also be found in the models directory of this project.
 
 The library supports REXS model files in xml and json format. Compressed REXS zip archives can also be loaded. The loading and storing mechanism can be easily extended to support other sources besides files for model loading and storing.
 
@@ -288,14 +288,14 @@ The library is header only. A build is only necessary if you want to run the tes
 
 REXSapi uses the following thirdparty open source software
 
-- [cli11 2.5.0](https://github.com/CLIUtils/CLI11)
-- [date 3.0.3](https://github.com/HowardHinnant/date)
-- [doctest 2.4.11](https://github.com/doctest/doctest)
-- [fmt 10.2.1](https://github.com/fmtlib/fmt)
+- [cli11 2.6.2](https://github.com/CLIUtils/CLI11)
+- [date 3.0.4](https://github.com/HowardHinnant/date)
+- [doctest 2.4.12](https://github.com/doctest/doctest)
+- [fmt 12.1.0](https://github.com/fmtlib/fmt)
 - [nlohmann json 3.12.0](https://github.com/nlohmann/json)
-- [miniz 3.0.2](https://github.com/richgel999/miniz)
+- [miniz 3.1.1](https://github.com/richgel999/miniz)
 - [pugixml 1.15](https://github.com/zeux/pugixml)
-- [valijson 1.0.5](https://github.com/tristanpenman/valijson)
+- [valijson 1.1.0](https://github.com/tristanpenman/valijson)
 
 # License
 

cmake/fetch_cli11.cmake

@@ -1,6 +1,6 @@
 FetchContent_Declare(
   cli11
-  URL https://github.com/CLIUtils/CLI11/archive/refs/tags/v2.5.0.tar.gz
+  URL https://github.com/CLIUtils/CLI11/archive/refs/tags/v2.6.2.tar.gz
 )
 
 FetchContent_MakeAvailable(cli11)

cmake/fetch_date.cmake

@@ -1,6 +1,6 @@
 FetchContent_Declare(
   date
-  URL https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.3.tar.gz
+  URL https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.4.tar.gz
 )
 
 FetchContent_GetProperties(date)

cmake/fetch_doctest.cmake

@@ -1,7 +1,7 @@
 FetchContent_Declare(
   doctest
   GIT_REPOSITORY https://github.com/doctest/doctest
-  GIT_TAG v2.4.11
+  GIT_TAG v2.4.12
 )
 
 FetchContent_GetProperties(doctest)

cmake/fetch_fmt.cmake

@@ -1,6 +1,6 @@
 FetchContent_Declare(
   fmt
-  URL https://github.com/fmtlib/fmt/archive/refs/tags/10.2.1.tar.gz
+  URL https://github.com/fmtlib/fmt/archive/refs/tags/12.1.0.tar.gz
 )
 
 FetchContent_GetProperties(fmt)

cmake/fetch_miniz.cmake

@@ -1,6 +1,6 @@
 FetchContent_Declare(
   miniz
-  URL https://github.com/richgel999/miniz/archive/refs/tags/3.0.2.tar.gz
+  URL https://github.com/richgel999/miniz/archive/refs/tags/3.1.1.tar.gz
 )
 
 FetchContent_GetProperties(miniz)
@@ -32,9 +32,6 @@ if(NOT miniz_POPULATED)
     string(REPLACE "#include \"${REPLACE_STRING}.h\"" "" AMAL_MINIZ_C "${AMAL_MINIZ_C}")
   endforeach()
 
-  string(REPLACE "static const mz_uint s_tdefl_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };" "" AMAL_MINIZ_C "${AMAL_MINIZ_C}")
-  string(REPLACE "static const mz_uint s_tdefl_num_probes[11];" "static inline const mz_uint s_tdefl_num_probes[11] = {0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500};" AMAL_MINIZ_C "${AMAL_MINIZ_C}")
-
   string(CONCAT AMAL_MINIZ_H "#define MINIZ_EXPORT\n" "${AMAL_MINIZ_H}")
 
   string(CONCAT AMAL_MINIZ_H "${AMAL_MINIZ_H}" "\n#ifndef MINIZ_HEADER_FILE_ONLY\n"

cmake/fetch_valijson.cmake

@@ -1,6 +1,6 @@
 FetchContent_Declare(
   valijson
-  URL https://github.com/tristanpenman/valijson/archive/refs/tags/v1.0.5.tar.gz
+  URL https://github.com/tristanpenman/valijson/archive/refs/tags/v1.1.0.tar.gz
 )
 
 FetchContent_GetProperties(valijson)