Remove example (no one uses this)

Simplify CMakeLists.txt
2024-07-10 13:25:25 +02:00 · 2024-07-10 12:51:46 +02:00
1361 changed files with 126383 additions and 53484 deletions
--- a/.gitea/workflows/publish-container.yaml
+++ b/.gitea/workflows/publish-container.yaml
@ -1,65 +0,0 @@
-name: Build and Publish Docker Image
-
-on:
-  release:
-    types: [published, prereleased]
-
-env:
-  IMAGE_NAME: openharbor/osrm-backend
-
-jobs:
-  publish:
-    strategy:
-      matrix:
-        docker-base-image: ["debian", "alpine"]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.IMAGE_NAME }}
-
-      - name: Docker meta - debug
-        id: metadebug
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=true
-            suffix=-debug,onlatest=true
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
-
-      - name: Build and push debug image
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
-          tags: ${{ steps.metadebug.outputs.tags }}
-          build-args: |
-            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags) }}-${{ matrix.docker-base-image }}
-
-      - name: Build and push normal image
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
-          tags: ${{ steps.meta.outputs.tags }}
-          build-args: |
-            DOCKER_TAG=${{ join(steps.meta.outputs.tags) }}-${{ matrix.docker-base-image }}
--- a/.github/workflows/osrm-backend.yml
+++ b/.github/workflows/osrm-backend.yml
@ -170,7 +170,6 @@ jobs:
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Debug
            CCOMPILER: gcc-13
            CUCUMBER_TIMEOUT: 20000
@ -181,7 +180,6 @@ jobs:
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Debug
            CCOMPILER: clang-18
            CUCUMBER_TIMEOUT: 20000
@ -195,7 +193,6 @@ jobs:
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
@ -206,7 +203,6 @@ jobs:
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Debug
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
@ -217,7 +213,6 @@ jobs:
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Debug
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
@ -229,7 +224,6 @@ jobs:
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-17
            CXXCOMPILER: clang++-17
@ -240,7 +234,6 @@ jobs:
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-16
            CXXCOMPILER: clang++-16
@ -251,7 +244,6 @@ jobs:
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
@ -263,7 +255,6 @@ jobs:
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
@ -274,7 +265,6 @@ jobs:
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: gcc-14
            CXXCOMPILER: g++-14
@ -284,7 +274,6 @@ jobs:
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: gcc-13
            CXXCOMPILER: g++-13
@ -294,7 +283,6 @@ jobs:
            continue-on-error: false
            node: 20
            runs-on: ubuntu-22.04
-            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: gcc-12
            CXXCOMPILER: g++-12
@ -350,7 +338,6 @@ jobs:
    continue-on-error: ${{ matrix.continue-on-error }}
    runs-on: ${{ matrix.runs-on }}
    env:
-      BUILD_TOOLS: ${{ matrix.BUILD_TOOLS }}
      BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
      BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }}
      CCOMPILER: ${{ matrix.CCOMPILER }}
@ -446,14 +433,14 @@ jobs:
      if: steps.cache-boost.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
      run: |
        BOOST_VERSION="1.85.0"
-        BOOST_VERSION_FLAVOR="${BOOST_VERSION}-b2-nodocs"
-        wget -q https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION_FLAVOR}.tar.gz
-        tar xzf boost-${BOOST_VERSION_FLAVOR}.tar.gz
-        cd boost-${BOOST_VERSION}
+        BOOST_VERSION_UNDERSCORE="${BOOST_VERSION//./_}"
+        wget -q https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERSCORE}.tar.gz
+        tar xzf boost_${BOOST_VERSION_UNDERSCORE}.tar.gz
+        cd boost_${BOOST_VERSION_UNDERSCORE}
        sudo ./bootstrap.sh
        sudo ./b2 install
        cd ..
-        sudo rm -rf boost-${BOOST_VERSION}*
+        sudo rm -rf boost_${BOOST_VERSION_UNDERSCORE}*
    
    - name: Install dev dependencies
      run: |
@ -502,13 +489,6 @@ jobs:

        conan config init
        yq eval '.compiler.clang.version += ["18"]' -i "$HOME/.conan/settings.yml"
-    - name: Add Apple-clang 16 to list of Conan compilers # workaround for the issue that Conan 1.x doesn't know about Apple-clang 16
-      if: ${{ matrix.ENABLE_CONAN == 'ON' && matrix.runs-on == 'macos-14' }}
-      run: |
-        sudo wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_darwin_arm64 -O /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq
-
-        conan config init
-        yq eval '.compiler.apple-clang.version += ["16.0"]' -i "$HOME/.conan/settings.yml"
    - name: Prepare build
      run: |
        mkdir ${OSRM_BUILD_DIR}
@ -540,7 +520,6 @@ jobs:
                 -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} \
                 -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
                 -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \
-                 -DBUILD_TOOLS=${BUILD_TOOLS:-OFF} \
                 -DENABLE_CCACHE=ON \
                 -DENABLE_LTO=${ENABLE_LTO:-ON} \
                 -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
@ -557,13 +536,6 @@ jobs:
          echo "PKG_CONFIG_PATH=${OSRM_INSTALL_DIR}/lib/pkgconfig" >> $GITHUB_ENV
        fi
        popd
-    - name: Build example
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
-      run: |
-        mkdir example/build && pushd example/build
-        cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
-        make --jobs=${JOBS}
-        popd
    - name: Run all tests
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
      run: |
@ -571,7 +543,6 @@ jobs:

        # macOS SIP strips the linker path. Reset this inside the running shell
        export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}
-        ./example/build/osrm-example test/data/mld/monaco.osrm

        # All tests assume to be run from the build directory
        pushd ${OSRM_BUILD_DIR}
@ -660,7 +631,7 @@ jobs:
  benchmarks:
    if: github.event_name == 'pull_request'
    needs: [format-taginfo-docs]
-    runs-on: self-hosted
+    runs-on: ubuntu-24.04
    env:
      CCOMPILER: clang-16
      CXXCOMPILER: clang++-16
@ -671,17 +642,37 @@ jobs:
      GITHUB_REPOSITORY: ${{ github.repository }}
      RUN_BIG_BENCHMARK: ${{ contains(github.event.pull_request.labels.*.name, 'Performance') }}
    steps: 
+      - name: Enable data.osm.pbf cache
+        if: ${{ ! env.RUN_BIG_BENCHMARK }}        
+        uses: actions/cache@v4
+        with:
+          path: ~/data.osm.pbf
+          key: v1-data-osm-pbf
+          restore-keys: |
+            v1-data-osm-pbf
+      - name: Enable compiler cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.ccache
+          key: v1-ccache-benchmarks-${{ github.sha }}
+          restore-keys: |
+            v1-ccache-benchmarks-
+      - name: Enable Conan cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.conan
+          key: v1-conan-benchmarks-${{ github.sha }}
+          restore-keys: |
+            v1-conan-benchmarks-
      - name: Checkout PR Branch
        uses: actions/checkout@v4
        with:
          ref: ${{ github.head_ref }}
          path: pr
-      - name: Activate virtualenv
+      - name: Install dependencies
        run: | 
-          python3 -m venv .venv
-          source .venv/bin/activate
-          echo PATH=$PATH >> $GITHUB_ENV
-          pip install "conan<2.0.0" "requests==2.31.0" "numpy==1.26.4" 
+          python3 -m pip install "conan<2.0.0" "requests==2.31.0" "numpy==1.26.4" --break-system-packages
+          sudo apt-get update -y && sudo apt-get install ccache
      - name: Prepare data
        run: |
          if [ "$RUN_BIG_BENCHMARK" = "true" ]; then
@ -709,67 +700,50 @@ jobs:
          path: base
      - name: Build Base Branch
        run: |
-          cd base
-          npm ci --ignore-scripts
-          cd ..
          mkdir base/build
          cd base/build
-          cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
+          cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release ..
          make -j$(nproc)
          make -j$(nproc) benchmarks
          cd ..
          make -C test/data 
      - name: Build PR Branch
        run: |
-          cd pr
-          npm ci --ignore-scripts
-          cd ..
          mkdir -p pr/build
          cd pr/build
-          cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
+          cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release ..
          make -j$(nproc) 
          make -j$(nproc) benchmarks
          cd ..
          make -C test/data 
      # we run benchmarks in tmpfs to avoid impact of disk IO
      - name: Create folder for tmpfs 
-        run: |
-          # if by any chance it was mounted before(e.g. due to previous job failed), unmount it
-          sudo umount ~/benchmarks | true
-          rm -rf ~/benchmarks 
-          mkdir -p ~/benchmarks
-      # see https://llvm.org/docs/Benchmarking.html
+        run: mkdir -p /opt/benchmarks
      - name: Run PR Benchmarks 
        run: |
-          sudo cset shield -c 2-3 -k on
-          sudo mount -t tmpfs -o size=4g none ~/benchmarks
-          cp -rf pr/build ~/benchmarks/build
-          cp -rf pr/lib ~/benchmarks/lib
-          mkdir -p ~/benchmarks/test
-          cp -rf pr/test/data ~/benchmarks/test/data
-          cp -rf pr/profiles ~/benchmarks/profiles
+          sudo mount -t tmpfs -o size=4g none /opt/benchmarks
+          cp -rf pr/build /opt/benchmarks/build
+          mkdir -p /opt/benchmarks/test
+          cp -rf pr/test/data /opt/benchmarks/test/data
+          cp -rf pr/profiles /opt/benchmarks/profiles

-          sudo cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/pr_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
-          sudo umount ~/benchmarks
-          sudo cset shield --reset
+          ./pr/scripts/ci/run_benchmarks.sh -f /opt/benchmarks -r $(pwd)/pr_results -s $(pwd)/pr -b /opt/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
+          sudo umount /opt/benchmarks
      - name: Run Base Benchmarks
        run: |
-          sudo cset shield -c 2-3 -k on
-          sudo mount -t tmpfs -o size=4g none ~/benchmarks
-          cp -rf base/build ~/benchmarks/build
-          cp -rf base/lib ~/benchmarks/lib
-          mkdir -p ~/benchmarks/test
-          cp -rf base/test/data ~/benchmarks/test/data
-          cp -rf base/profiles ~/benchmarks/profiles
+          sudo mount -t tmpfs -o size=4g none /opt/benchmarks
+          cp -rf base/build /opt/benchmarks/build
+          mkdir -p /opt/benchmarks/test
+          cp -rf base/test/data /opt/benchmarks/test/data
+          cp -rf base/profiles /opt/benchmarks/profiles

          # TODO: remove it when base branch will have this file at needed location
-          if [ ! -f ~/benchmarks/test/data/portugal_to_korea.json ]; then
-            cp base/src/benchmarks/portugal_to_korea.json ~/benchmarks/test/data/portugal_to_korea.json
+          if [ ! -f /opt/benchmarks/test/data/portugal_to_korea.json ]; then
+            cp base/src/benchmarks/portugal_to_korea.json /opt/benchmarks/test/data/portugal_to_korea.json
          fi
          # we intentionally use scripts from PR branch to be able to update them and see results in the same PR
-          sudo cset shield --exec -- cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/base_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
-          sudo umount ~/benchmarks
-          sudo cset shield --reset
+          ./pr/scripts/ci/run_benchmarks.sh -f /opt/benchmarks -r $(pwd)/base_results -s $(pwd)/pr -b /opt/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
+          sudo umount /opt/benchmarks
      - name: Post Benchmark Results
        run: |
          python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results
--- a/.gitignore
+++ b/.gitignore
@ -43,9 +43,9 @@ Thumbs.db
 #######################
 /_build*
 /build/
-/example/build/
 /test/data/monaco.osrm*
 /test/data/ch
+/test/data/corech
 /test/data/mld
 /cmake/postinst

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,7 +1,6 @@
 # Unreleased
  - Changes from 5.27.1
    - Features
-      - ADDED: Route pedestrians over highway=platform [#6993](https://github.com/Project-OSRM/osrm-backend/pull/6993)
      - REMOVED: Remove all core-CH left-overs [#6920](https://github.com/Project-OSRM/osrm-backend/pull/6920)
      - ADDED: Add support for a keepalive_timeout flag. [#6674](https://github.com/Project-OSRM/osrm-backend/pull/6674)
      - ADDED: Add support for a default_radius flag. [#6575](https://github.com/Project-OSRM/osrm-backend/pull/6575)
@ -25,9 +24,6 @@
    - NodeJS:
      - CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452)
    - Misc:
-      - CHANGED: Use std::string_view for key type in json::Object. [#7062](https://github.com/Project-OSRM/osrm-backend/pull/7062)
-      - CHANGED: Use thread_local instead of boost::thread_specific_ptr. [#6991](https://github.com/Project-OSRM/osrm-backend/pull/6991)
-      - CHANGED: Bump flatbuffers to v24.3.25 version. [#6988](https://github.com/Project-OSRM/osrm-backend/pull/6988)
      - CHANGED: Add .reserve(...) to assembleGeometry function. [#6983](https://github.com/Project-OSRM/osrm-backend/pull/6983)
      - CHANGED: Get rid of boost::optional leftovers. [#6977](https://github.com/Project-OSRM/osrm-backend/pull/6977)
      - CHANGED: Use Link Time Optimisation whenever possible. [#6967](https://github.com/Project-OSRM/osrm-backend/pull/6967)
@ -80,7 +76,6 @@
      - ADDED: Extract prerelease/build information from package semver [#6839](https://github.com/Project-OSRM/osrm-backend/pull/6839)
    - Profiles:
      - FIXED: Bicycle and foot profiles now don't route on proposed ways [#6615](https://github.com/Project-OSRM/osrm-backend/pull/6615)
-      - ADDED: Add optional support of cargo bike exclusion and width to bicyle profile [#7044](https://github.com/Project-OSRM/osrm-backend/pull/7044)
    - Routing:
      - FIXED: Fix adding traffic signal penalties during compression [#6419](https://github.com/Project-OSRM/osrm-backend/pull/6419)
      - FIXED: Correctly handle compressed traffic signals. [#6724](https://github.com/Project-OSRM/osrm-backend/pull/6724)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.18)
-
+project(OSRM C CXX)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
@ -10,6 +10,12 @@ Please create a directory and run cmake from there, passing the path to this sou
 This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.")
 endif()

+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  message(STATUS "Building on a 64 bit system")
+else()
+  message(FATAL_ERROR "Building on a 32 bit system is not supported")
+endif()
+
 # detect if this is included as subproject and if so expose
 # some variables to its parent scope
 get_directory_property(BUILD_AS_SUBPROJECT PARENT_DIRECTORY)
@ -22,45 +28,25 @@ if (NOT WIN32 AND NOT DEFINED ENV{OSRM_BUILD_DIR})
  set(ENV{OSRM_BUILD_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 endif()

-option(ENABLE_CONAN "Use conan for dependencies" OFF)
-option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
-option(BUILD_TOOLS "Build OSRM tools" OFF)
-option(BUILD_PACKAGE "Build OSRM package" OFF)
-option(BUILD_ROUTED "Build osrm-routed HTTP server" ON)
-option(ENABLE_ASSERTIONS "Use assertions in release mode" OFF)
-option(ENABLE_DEBUG_LOGGING "Use debug logging in release mode" OFF)
-option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF)
-option(ENABLE_SANITIZER "Use memory sanitizer for Debug build" OFF)
-option(ENABLE_LTO "Use Link Time Optimisation" ON)
-option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
-option(ENABLE_NODE_BINDINGS "Build NodeJs bindings" OFF)
-option(ENABLE_CLANG_TIDY "Enables clang-tidy checks" OFF)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

+option(BUILD_PACKAGE "Build OSRM package" OFF)
+option(ENABLE_ASSERTIONS "Use assertions in release mode" OFF)
+option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
+option(ENABLE_CLANG_TIDY "Enables clang-tidy checks" OFF)
+option(ENABLE_CONAN "Use conan for dependencies" OFF)
+option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF)
+option(ENABLE_DEBUG_LOGGING "Use debug logging in release mode" OFF)
+option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
+option(ENABLE_LTO "Use Link Time Optimisation" ON)
+option(ENABLE_NODE_BINDINGS "Build NodeJs bindings" OFF)
+option(ENABLE_SANITIZER "Use memory sanitizer for Debug build" OFF)

 if (ENABLE_CLANG_TIDY)
-  find_program(CLANG_TIDY_COMMAND NAMES clang-tidy)
-  if(NOT CLANG_TIDY_COMMAND)
-    message(FATAL_ERROR "ENABLE_CLANG_TIDY is ON but clang-tidy is not found!")
-  else()
+  find_program(CLANG_TIDY_COMMAND NAMES clang-tidy REQUIRED)
  message(STATUS "Found clang-tidy at ${CLANG_TIDY_COMMAND}")
  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND};--warnings-as-errors=*;--header-filter=.*")
 endif()
-endif()
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-# be compatible with version handling before cmake 3.x
-if (POLICY CMP0057)
-  cmake_policy(SET CMP0057 NEW)
-endif()
-if (POLICY CMP0074)
-  cmake_policy(SET CMP0074 NEW)
-endif()
-if (POLICY CMP0167)
-  cmake_policy(SET CMP0167 NEW)
-endif()
-project(OSRM C CXX)
-

 if(ENABLE_LTO AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo))
  include(CheckIPOSupported)
@ -128,15 +114,8 @@ include(CheckCXXCompilerFlag)
 include(FindPackageHandleStandardArgs)
 include(GNUInstallDirs)

-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  message(STATUS "Building on a 64 bit system")
-else()
-  message(FATAL_ERROR "Building on a 32 bit system is not supported")
-endif()
-
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/generated/include/)
 include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2/include)

 set(BOOST_COMPONENTS date_time iostreams program_options thread unit_test_framework)
@ -155,7 +134,6 @@ file(GLOB UpdaterGlob src/updater/*.cpp)
 file(GLOB StorageGlob src/storage/*.cpp)
 file(GLOB ServerGlob src/server/*.cpp src/server/**/*.cpp)
 file(GLOB EngineGlob src/engine/*.cpp src/engine/**/*.cpp)
-file(GLOB ErrorcodesGlob src/osrm/errorcodes.cpp)

 add_library(UTIL OBJECT ${UtilGlob})
 add_library(EXTRACTOR OBJECT ${ExtractorGlob})
@ -166,14 +144,11 @@ add_library(CONTRACTOR OBJECT ${ContractorGlob})
 add_library(UPDATER OBJECT ${UpdaterGlob})
 add_library(STORAGE OBJECT ${StorageGlob})
 add_library(ENGINE OBJECT ${EngineGlob})
-
-if (BUILD_ROUTED)
 add_library(SERVER OBJECT ${ServerGlob})
-  add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGET_OBJECTS:UTIL>)
-endif()

 set_target_properties(UTIL PROPERTIES LINKER_LANGUAGE CXX)

+add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGET_OBJECTS:UTIL>)
 add_executable(osrm-extract src/tools/extract.cpp)
 add_executable(osrm-partition src/tools/partition.cpp)
 add_executable(osrm-customize src/tools/customize.cpp)
@ -483,9 +458,7 @@ target_link_libraries(osrm-extract osrm_extract ${Boost_PROGRAM_OPTIONS_LIBRARY}
 target_link_libraries(osrm-partition osrm_partition ${Boost_PROGRAM_OPTIONS_LIBRARY})
 target_link_libraries(osrm-customize osrm_customize ${Boost_PROGRAM_OPTIONS_LIBRARY})
 target_link_libraries(osrm-contract osrm_contract ${Boost_PROGRAM_OPTIONS_LIBRARY})
-if (BUILD_ROUTED)
 target_link_libraries(osrm-routed osrm ${Boost_PROGRAM_OPTIONS_LIBRARY} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY})
-endif()

 set(EXTRACTOR_LIBRARIES
    ${BZIP2_LIBRARIES}
@ -559,18 +532,13 @@ target_link_libraries(osrm_partition ${PARTITIONER_LIBRARIES})
 target_link_libraries(osrm_customize ${CUSTOMIZER_LIBRARIES} osrm_update osrm_store)
 target_link_libraries(osrm_store ${STORAGE_LIBRARIES})

-# BUILD_COMPONENTS
 add_executable(osrm-components src/tools/components.cpp $<TARGET_OBJECTS:MICROTAR> $<TARGET_OBJECTS:UTIL>)
 target_link_libraries(osrm-components ${TBB_LIBRARIES} ${BOOST_BASE_LIBRARIES} ${UTIL_LIBRARIES})
 install(TARGETS osrm-components DESTINATION bin)

-if(BUILD_TOOLS)
-  message(STATUS "Activating OSRM internal tools")
 add_executable(osrm-io-benchmark src/tools/io-benchmark.cpp $<TARGET_OBJECTS:UTIL>)
 target_link_libraries(osrm-io-benchmark ${BOOST_BASE_LIBRARIES} ${TBB_LIBRARIES})
-
 install(TARGETS osrm-io-benchmark DESTINATION bin)
-endif()

 if (ENABLE_ASSERTIONS)
  message(STATUS "Enabling assertions")
@ -589,47 +557,14 @@ set_property(TARGET osrm-extract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_property(TARGET osrm-partition PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_property(TARGET osrm-contract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
-if (BUILD_ROUTED)
 set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
-endif()

-file(GLOB FlatbuffersGlob third_party/flatbuffers/include/flatbuffers/*.h)
-file(GLOB LibraryGlob include/osrm/*.hpp)
-file(GLOB ParametersGlob include/engine/api/*_parameters.hpp)
-set(ApiHeader include/engine/api/base_result.hpp)
-set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/approach.hpp include/engine/phantom_node.hpp)
-set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/alias.hpp include/util/exception.hpp include/util/bearing.hpp)
-set(ExtractorHeader include/extractor/extractor.hpp include/storage/io_config.hpp include/extractor/extractor_config.hpp include/extractor/travel_mode.hpp)
-set(PartitionerHeader include/partitioner/partitioner.hpp include/partitioner/partitioner_config.hpp)
-set(ContractorHeader include/contractor/contractor.hpp include/contractor/contractor_config.hpp)
-set(StorageHeader include/storage/storage.hpp include/storage/io_config.hpp include/storage/storage_config.hpp)
-install(FILES ${EngineHeader} DESTINATION include/osrm/engine)
-install(FILES ${UtilHeader} DESTINATION include/osrm/util)
-install(FILES ${StorageHeader} DESTINATION include/osrm/storage)
-install(FILES ${ExtractorHeader} DESTINATION include/osrm/extractor)
-install(FILES ${PartitionerHeader} DESTINATION include/osrm/partitioner)
-install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor)
-install(FILES ${LibraryGlob} DESTINATION include/osrm)
-install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api)
-install(FILES ${ApiHeader} DESTINATION include/osrm/engine/api)
-install(FILES ${FlatbuffersGlob} DESTINATION include/flatbuffers)
 install(TARGETS osrm-extract DESTINATION bin)
 install(TARGETS osrm-partition DESTINATION bin)
 install(TARGETS osrm-customize DESTINATION bin)
 install(TARGETS osrm-contract DESTINATION bin)
 install(TARGETS osrm-datastore DESTINATION bin)
-if (BUILD_ROUTED)
 install(TARGETS osrm-routed DESTINATION bin)
-endif()
-install(TARGETS osrm DESTINATION lib)
-install(TARGETS osrm_extract DESTINATION lib)
-install(TARGETS osrm_partition DESTINATION lib)
-install(TARGETS osrm_customize DESTINATION lib)
-install(TARGETS osrm_update DESTINATION lib)
-install(TARGETS osrm_contract DESTINATION lib)
-install(TARGETS osrm_store DESTINATION lib)
-install(TARGETS osrm_guidance DESTINATION lib)
-

 # Install profiles and support library to /usr/local/share/osrm/profiles by default
 set(DefaultProfilesDir profiles)
@ -640,8 +575,6 @@ set(DefaultProfilesDir data)
 install(DIRECTORY ${DefaultProfilesDir} DESTINATION share/osrm)

 # Setup exporting variables for pkgconfig and subproject
-#
-
 if(BUILD_PACKAGE)
  include(CPackConfig)
  include(CPack)
@ -718,7 +651,6 @@ if (ENABLE_NODE_BINDINGS)
  add_subdirectory(src/nodejs)
 endif()

-
 if (ENABLE_FUZZING)
  # Requires libosrm being built with sanitizers; make configurable and default to ubsan
  set(FUZZ_SANITIZER "undefined" CACHE STRING "Sanitizer to be used for Fuzz testing")
@ -752,4 +684,3 @@ foreach(header ${headers_to_check})
 endforeach()
 add_library(check-headers STATIC EXCLUDE_FROM_ALL ${sources})
 set_target_properties(check-headers PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${check_headers_dir})
-
--- a/docker/Dockerfile-alpine
+++ b/docker/Dockerfile-alpine
@ -1,34 +1,20 @@
-FROM alpine:3.21.2 AS alpine-mimalloc
+FROM alpine:3.20.0 as alpine-mimalloc

-RUN apk update && \
-    apk upgrade && \
-    apk add --no-cache \
-        boost-iostreams \
-        boost-program_options \
-        boost-thread \
-        mimalloc
+RUN apk add --no-cache mimalloc

 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2
 ENV MIMALLOC_LARGE_OS_PAGES=1


-FROM alpine-mimalloc AS builder
+FROM alpine-mimalloc as builder
 ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
+RUN mkdir -p /src  && mkdir -p /opt

-RUN mkdir -p /src /opt && \
-    apk add --no-cache \
-    boost-dev \
-    boost-filesystem \
-    clang \
-    cmake \
-    expat-dev \
-    git \
-    libbz2 \
-    libxml2 \
-    lua5.4-dev \
-    make \
-    onetbb-dev
+RUN apk add --no-cache \
+    cmake make git clang libbz2 libxml2 \
+    boost-dev boost-program_options boost-filesystem boost-iostreams boost-thread \
+    lua5.4-dev onetbb-dev expat-dev

 COPY . /src
 WORKDIR /src
@ -41,11 +27,10 @@ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    cd build && \
    BUILD_TYPE="Release" && \
    ENABLE_ASSERTIONS="Off" && \
-    BUILD_TOOLS="Off" && \
    case ${DOCKER_TAG} in *"-debug"*) BUILD_TYPE="Debug";; esac && \
-    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On" && BUILD_TOOLS="On";; esac && \
-    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} BUILD_TOOLS=${BUILD_TOOLS}" && \
-    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=OFF && \
+    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On";; esac && \
+    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} && \
+    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DENABLE_LTO=OFF && \
    make -j${NPROC} install && \
    cd ../profiles && \
    cp -r * /opt && \
@ -53,18 +38,16 @@ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    rm -rf /src


-# Multistage build to reduce image size - https://docs.docker.com/build/building/multi-stage/#use-multi-stage-builds
+# Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
 # Only the content below ends up in the image, this helps remove /src from the image (which is large)
-FROM alpine-mimalloc AS runstage
+FROM alpine-mimalloc as runstage

 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt

 RUN apk add --no-cache \
-    boost-date_time \
-    expat \
-    lua5.4 \
-    onetbb && \
+    boost-program_options boost-date_time boost-iostreams boost-thread \
+    expat lua5.4 onetbb && \
    ldconfig /usr/local/lib

 RUN /usr/local/bin/osrm-extract --help && \
@ -76,4 +59,3 @@ RUN /usr/local/bin/osrm-extract --help && \
 WORKDIR /opt

 EXPOSE 5000
-
--- a/docker/Dockerfile-debian
+++ b/docker/Dockerfile-debian
@ -1,24 +1,21 @@
-FROM debian:bookworm-slim AS builder
+FROM debian:bookworm-slim as builder
 ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
+RUN mkdir -p /src  && mkdir -p /opt

-RUN mkdir -p /src /opt && \
-    apt-get update && \
-    apt-get -y --no-install-recommends --no-install-suggests install \
-        ca-certificates \
-        cmake \
-        g++ \
-        gcc \
-        git \
-        libboost1.81-all-dev \
-        libbz2-dev \
-        liblua5.4-dev \
-        libtbb-dev \
-        libxml2-dev \
-        libzip-dev \
-        lua5.4 \
-        make \
-        pkg-config
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install ca-certificates cmake make git gcc g++ libbz2-dev libxml2-dev wget \
+    libzip-dev libboost1.81-all-dev lua5.4 liblua5.4-dev pkg-config -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
+
+RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
+    ldconfig /usr/local/lib && \
+    git clone --branch v2021.12.0 --single-branch https://github.com/oneapi-src/oneTBB.git && \
+    cd oneTBB && \
+    mkdir build && \
+    cd build && \
+    cmake -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=Release ..  && \
+    cmake --build . && \
+    cmake --install .

 COPY . /src
 WORKDIR /src
@ -32,11 +29,10 @@ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    cd build && \
    BUILD_TYPE="Release" && \
    ENABLE_ASSERTIONS="Off" && \
-    BUILD_TOOLS="Off" && \
    case ${DOCKER_TAG} in *"-debug"*) BUILD_TYPE="Debug";; esac && \
-    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On" && BUILD_TOOLS="On";; esac && \
-    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} BUILD_TOOLS=${BUILD_TOOLS}" && \
-    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=On && \
+    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On";; esac && \
+    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} && \
+    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DENABLE_LTO=On && \
    make -j${NPROC} install && \
    cd ../profiles && \
    cp -r * /opt && \
@ -44,24 +40,19 @@ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    rm -rf /src


-# Multistage build to reduce image size - https://docs.docker.com/build/building/multi-stage/#use-multi-stage-builds
+# Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
 # Only the content below ends up in the image, this helps remove /src from the image (which is large)
-FROM debian:bookworm-slim AS runstage
+FROM debian:bookworm-slim as runstage

 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt

 RUN apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests \
-        expat \
-        libboost-date-time1.81.0 \
-        libboost-iostreams1.81.0 \
-        libboost-program-options1.81.0 \
-        libboost-thread1.81.0 \
-        liblua5.4-0 \
-        libtbb12 && \
+    apt-get install -y --no-install-recommends \
+        libboost-program-options1.81.0 libboost-date-time1.81.0 libboost-iostreams1.81.0 libboost-thread1.81.0 \
+        expat liblua5.4-0 && \
    rm -rf /var/lib/apt/lists/* && \
-# Add /usr/local/lib to ldconfig to allow loading libraries from there
+# add /usr/local/lib to ldconfig to allow loading libraries from there
    ldconfig /usr/local/lib

 RUN /usr/local/bin/osrm-extract --help && \
@ -73,4 +64,3 @@ RUN /usr/local/bin/osrm-extract --help && \
 WORKDIR /opt

 EXPOSE 5000
-
--- a/docs/libosrm.md
+++ b/docs/libosrm.md
@ -1,33 +0,0 @@
-## Introduction
-
-OSRM can be used as a library (libosrm) via C++ instead of using it through the HTTP interface and `osrm-routed`. This allows for fine-tuning OSRM and has much less overhead. Here is a quick introduction into how to use `libosrm` in the upcoming v5 release.
-
-Take a look at the example code that lives in the [example directory](https://github.com/Project-OSRM/osrm-backend/tree/master/example). Here is all you ever wanted to know about `libosrm`, that is a short description of what the types do and where to find documentation on it:
-
-## Important interface objects
-
- [`EngineConfig`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/engine_config.hpp) - for initializing an OSRM instance we can configure certain properties and constraints. E.g. the storage config is the base path such as `france.osm.osrm` from which we derive and load `france.osm.osrm.*` auxiliary files. This also lets you set constraints such as the maximum number of locations allowed for specific services.
-
- [`OSRM`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/osrm/osrm.hpp) - this is the main Routing Machine type with functions such as `Route` and `Table`. You initialize it with a `EngineConfig`. It does all the heavy lifting for you. Each function takes its own parameters, e.g. the `Route` function takes `RouteParameters`, and a out-reference to a JSON result that gets filled. The return value is a `Status`, indicating error or success.
-
- [`Status`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/status.hpp) - this is a type wrapping `Error` or `Ok` for indicating error or success, respectively.
-
- [`TableParameters`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/api/table_parameters.hpp) - this is an example of parameter types the Routing Machine functions expect. In this case `Table` expects its own parameters as `TableParameters`. You can see it wrapping two vectors, sources and destinations --- these are indices into your coordinates for the table service to construct a matrix from (empty sources or destinations means: use all of them). If you ask yourself where coordinates come from, you can see `TableParameters` inheriting from `BaseParameters`.
-
- [`BaseParameter`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/api/base_parameters.hpp) - this most importantly holds coordinates (and a few other optional properties that you don't need for basic usage); the specific parameter types inherit from `BaseParameters` to get these member attributes. That means your `TableParameters` type has `coordinates`, `sources` and `destination` member attributes (and a few other that we ignore for now).
-
- [`Coordinate`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/coordinate.hpp) - this is a wrapper around a (longitude, latitude) pair. We really don't care about (lon,lat) vs (lat, lon) but we don't want you to accidentally mix them up, so both latitude and longitude are strictly typed wrappers around integers (fixed notation such as `13423240`) and floating points (floating notation such as `13.42324`).
-
- [Parameters for other services](https://github.com/Project-OSRM/osrm-backend/tree/master/include/engine/api) - here are all other `*Parameters` you need for other Routing Machine services.
-
- [JSON](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/json_container.hpp) - this is a sum type resembling JSON. The Routing Machine service functions take a out-ref to a JSON result and fill it accordingly. It is currently implemented using [mapbox/variant](https://github.com/mapbox/variant) which is similar to [Boost.Variant](http://www.boost.org/doc/libs/1_55_0/doc/html/variant.html). There are two ways to work with this sum type: either provide a visitor that acts on each type on visitation or use the `get` function in case you're sure about the structure. The JSON structure is written down in the [HTTP API](#http-api).
-
-## Example
-
-See [the example folder](https://github.com/Project-OSRM/osrm-backend/tree/master/example) in the OSRM repository.
-
-## Workflow
-
- - Create an `OSRM` instance initialized with a `EngineConfig`
- - Call the service function on the `OSRM` object providing service specific `*Parameters`
- - Check the return code and use the JSON result
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@ -1,34 +0,0 @@
-cmake_minimum_required(VERSION 3.18)
-
-if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
-  message(FATAL_ERROR "In-source builds are not allowed.
-Please create a directory and run cmake from there, passing the path to this source directory as the last argument.
-This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.")
-endif()
-
-if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
-  set(CMAKE_BUILD_TYPE Release)
-endif()
-
-project(osrm-example C CXX)
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  message(STATUS "Building on a 64 bit system")
-else()
-  message(STATUS "Building on a 32 bit system")
-endif()
-
-link_directories(${LibOSRM_LIBRARY_DIRS})
-add_executable(osrm-example example.cpp)
-
-find_package(LibOSRM REQUIRED)
-
-target_link_libraries(osrm-example ${LibOSRM_LIBRARIES} ${LibOSRM_DEPENDENT_LIBRARIES})
-include_directories(SYSTEM ${LibOSRM_INCLUDE_DIRS})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LibOSRM_CXXFLAGS}")
--- a/example/cmake/FindLibOSRM.cmake
+++ b/example/cmake/FindLibOSRM.cmake
@ -1,63 +0,0 @@
-# - Try to find LibOSRM
-# Once done this will define
-#  LibOSRM_FOUND - System has LibOSRM
-#  LibOSRM_LIBRARIES - The libraries and ldflags needed to use LibOSRM
-#  LibOSRM_DEPENDENT_LIBRARIES - The libraries and ldflags need to link LibOSRM dependencies
-#  LibOSRM_LIBRARY_DIRS - The libraries paths needed to find LibOSRM
-#  LibOSRM_CXXFLAGS - Compiler switches required for using LibOSRM
-
-find_package(PkgConfig)
-pkg_search_module(PC_LibOSRM QUIET libosrm)
-
-function(JOIN VALUES GLUE OUTPUT)
-  string (REPLACE ";" "${GLUE}" _TMP_STR "${VALUES}")
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
-
-list(REMOVE_ITEM PC_LibOSRM_CFLAGS " ")
-JOIN("${PC_LibOSRM_CFLAGS}" " " output)
-
-set(LibOSRM_CXXFLAGS ${output})
-set(LibOSRM_LIBRARY_DIRS ${PC_LibOSRM_LIBRARY_DIRS})
-
-find_path(LibOSRM_INCLUDE_DIR osrm/osrm.hpp
-  PATH_SUFFIXES osrm include/osrm include
-  HINTS ${PC_LibOSRM_INCLUDEDIR} ${PC_LibOSRM_INCLUDE_DIRS}
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /opt/local
-  /opt)
-
-find_library(TEST_LibOSRM_STATIC_LIBRARY Names osrm.lib libosrm.a
-  PATH_SUFFIXES osrm lib/osrm lib
-  HINTS ${PC_LibOSRM_LIBDIR} ${PC_LibOSRM_LIBRARY_DIRS}
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /opt/local
-  /opt)
-find_library(TEST_LibOSRM_DYNAMIC_LIBRARY Names libosrm.dylib libosrm.so
-  PATH_SUFFIXES osrm lib/osrm lib
-  HINTS ${PC_LibOSRM_LIBDIR} ${PC_LibOSRM_LIBRARY_DIRS}
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /opt/local
-  /opt)
-
-set(LibOSRM_DEPENDENT_LIBRARIES ${PC_LibOSRM_STATIC_LDFLAGS})
-set(LibOSRM_LIBRARIES ${PC_LibOSRM_LDFLAGS})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBOSRM_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(LibOSRM DEFAULT_MSG
-                                LibOSRM_LIBRARY_DIRS
-                                LibOSRM_CXXFLAGS
-                                LibOSRM_LIBRARIES
-                                LibOSRM_DEPENDENT_LIBRARIES
-                                LibOSRM_INCLUDE_DIR)
--- a/example/cmake/FindTBB.cmake
+++ b/example/cmake/FindTBB.cmake
@ -1 +0,0 @@
-../../cmake/FindTBB.cmake
--- a/example/example.cpp
+++ b/example/example.cpp
@ -1,90 +0,0 @@
-#include "osrm/match_parameters.hpp"
-#include "osrm/nearest_parameters.hpp"
-#include "osrm/route_parameters.hpp"
-#include "osrm/table_parameters.hpp"
-#include "osrm/trip_parameters.hpp"
-
-#include "osrm/coordinate.hpp"
-#include "osrm/engine_config.hpp"
-#include "osrm/json_container.hpp"
-
-#include "osrm/osrm.hpp"
-#include "osrm/status.hpp"
-
-#include <exception>
-#include <iostream>
-#include <string>
-#include <utility>
-
-#include <cstdlib>
-
-int main(int argc, const char *argv[])
-{
-    if (argc < 2)
-    {
-        std::cerr << "Usage: " << argv[0] << " data.osrm\n";
-        return EXIT_FAILURE;
-    }
-
-    using namespace osrm;
-
-    // Configure based on a .osrm base path, and no datasets in shared mem from osrm-datastore
-    EngineConfig config;
-
-    config.storage_config = {argv[1]};
-    config.use_shared_memory = false;
-
-    // We support two routing speed up techniques:
-    // - Contraction Hierarchies (CH): requires extract+contract pre-processing
-    // - Multi-Level Dijkstra (MLD): requires extract+partition+customize pre-processing
-    //
-    // config.algorithm = EngineConfig::Algorithm::CH;
-    config.algorithm = EngineConfig::Algorithm::MLD;
-
-    // Routing machine with several services (such as Route, Table, Nearest, Trip, Match)
-    const OSRM osrm{config};
-
-    // The following shows how to use the Route service; configure this service
-    RouteParameters params;
-
-    // Route in monaco
-    params.coordinates.push_back({util::FloatLongitude{7.419758}, util::FloatLatitude{43.731142}});
-    params.coordinates.push_back({util::FloatLongitude{7.419505}, util::FloatLatitude{43.736825}});
-
-    // Response is in JSON format
-    engine::api::ResultT result = json::Object();
-
-    // Execute routing request, this does the heavy lifting
-    const auto status = osrm.Route(params, result);
-
-    auto &json_result = std::get<json::Object>(result);
-    if (status == Status::Ok)
-    {
-        auto &routes = std::get<json::Array>(json_result.values["routes"]);
-
-        // Let's just use the first route
-        auto &route = std::get<json::Object>(routes.values.at(0));
-        const auto distance = std::get<json::Number>(route.values["distance"]).value;
-        const auto duration = std::get<json::Number>(route.values["duration"]).value;
-
-        // Warn users if extract does not contain the default coordinates from above
-        if (distance == 0 || duration == 0)
-        {
-            std::cout << "Note: distance or duration is zero. ";
-            std::cout << "You are probably doing a query outside of the OSM extract.\n\n";
-        }
-
-        std::cout << "Distance: " << distance << " meter\n";
-        std::cout << "Duration: " << duration << " seconds\n";
-        return EXIT_SUCCESS;
-    }
-    else if (status == Status::Error)
-    {
-        const auto code = std::get<json::String>(json_result.values["code"]).value;
-        const auto message = std::get<json::String>(json_result.values["message"]).value;
-
-        std::cout << "Code: " << code << "\n";
-        std::cout << "Message: " << code << "\n";
-        return EXIT_FAILURE;
-    }
-}
--- a/third_party/flatbuffers/grpc/BUILD.bazel
+++ b/third_party/flatbuffers/grpc/BUILD.bazel
--- a/features/foot/access.feature
+++ b/features/foot/access.feature
@ -26,15 +26,7 @@ Feature: Foot - Access tags on ways
            | motorway | no     |      |       |
            | motorway | no     | yes  | x     |
            | motorway | no     | no   |       |
-            | platform |        |      | x     |
-            | platform |        | yes  | x     |
-            | platform |        | no   |       |
-            | platform | yes    |      | x     |
-            | platform | yes    | yes  | x     |
-            | platform | yes    | no   |       |
-            | platform | no     |      |       |
-            | platform | no     | yes  | x     |
-            | platform | no     | no   |       |
+

    Scenario: Foot - Overwriting implied acccess on ways
        Then routability should be
--- a/features/guidance/collapse.feature
+++ b/features/guidance/collapse.feature
@ -1061,7 +1061,7 @@ Feature: Collapse
        #    i
        #    """

-        Given the node locations
+        And the node locations
          | node |         lat |         lon |        #id |
          | a    | -33.9644254 | 151.1378673 |   33226063 |
          | b    | -33.9644373 | 151.1377172 | 1072787030 |
--- a/features/guidance/roundabout-left-sided.feature
+++ b/features/guidance/roundabout-left-sided.feature
@ -9,7 +9,7 @@ Feature: Basic Roundabout
            """

    Scenario: Roundabout exit counting for left sided driving
-        Given a grid size of 10 meters
+        And a grid size of 10 meters
        And the node map
            """
                a
@ -33,7 +33,7 @@ Feature: Basic Roundabout
           | a,h       | ab,gh,gh | depart,roundabout turn right exit-3,arrive    |

    Scenario: Mixed Entry and Exit
-        Given a grid size of 10 meters
+        And a grid size of 10 meters
        And the node map
           """
             c   a
--- a/features/options/contract/help.feature
+++ b/features/options/contract/help.feature
@ -0,0 +1,44 @@
+@prepare @options @help
+Feature: osrm-contract command line options: help
+
+    Scenario: osrm-contract - Help should be shown when no options are passed
+        When I try to run "osrm-contract"
+        Then stderr should be empty
+        And stdout should contain /osrm-contract(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And stdout should contain "--core"
+        And stdout should contain "--segment-speed-file"
+        And it should exit with an error
+
+    Scenario: osrm-contract - Help, short
+        When I run "osrm-contract -h"
+        Then stderr should be empty
+        And stdout should contain /osrm-contract(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And stdout should contain "--core"
+        And stdout should contain "--segment-speed-file"
+        And it should exit successfully
+
+    Scenario: osrm-contract - Help, long
+        When I run "osrm-contract --help"
+        Then stderr should be empty
+        And stdout should contain /osrm-contract(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And stdout should contain "--core"
+        And stdout should contain "--segment-speed-file"
+        And it should exit successfully
--- a/features/options/customize/help.feature
+++ b/features/options/customize/help.feature
@ -0,0 +1,38 @@
+@contract @options @help
+Feature: osrm-customize command line options: help
+
+    Scenario: osrm-customize - Help should be shown when no options are passed
+        When I try to run "osrm-customize"
+        Then stderr should be empty
+        And stdout should contain /osrm-customize(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And it should exit with an error
+
+    Scenario: osrm-customize - Help, short
+        When I run "osrm-customize -h"
+        Then stderr should be empty
+        And stdout should contain /osrm-customize(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And it should exit successfully
+
+    Scenario: osrm-customize - Help, long
+        When I run "osrm-customize --help"
+        Then stderr should be empty
+        And stdout should contain /osrm-customize(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And it should exit successfully
--- a/features/options/datastore/datastore.feature
+++ b/features/options/datastore/datastore.feature
@ -33,6 +33,10 @@ Feature: osrm-datastore command line options
        When I try to run "osrm-datastore {processed_file} --dataset-name cucumber/only_metric_test --only-metric"
        Then it should exit successfully

+    Scenario: osrm-datastore - Displaying help should work
+        When I try to run "osrm-datastore {processed_file} --help"
+        Then it should exit successfully
+
    Scenario: osrm-datastore - Errors on invalid path
        When I try to run "osrm-datastore invalid_path.osrm"
        Then stderr should contain "[error] Config contains invalid file paths."
--- a/features/options/extract/help.feature
+++ b/features/options/extract/help.feature
@ -0,0 +1,47 @@
+@extract @options @help
+Feature: osrm-extract command line options: help
+
+    Background:
+        Given the profile "testbot"
+
+    Scenario: osrm-extract - Help should be shown when no options are passed
+        When I run "osrm-extract"
+        Then stderr should be empty
+        And stdout should contain /osrm-extract(.exe)? <input.osm/.osm.bz2/.osm.pbf> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--profile"
+        And stdout should contain "--threads"
+        And stdout should contain "--small-component-size"
+        And it should exit successfully
+
+    Scenario: osrm-extract - Help, short
+        When I run "osrm-extract -h"
+        Then stderr should be empty
+        And stdout should contain /osrm-extract(.exe)? <input.osm/.osm.bz2/.osm.pbf> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--profile"
+        And stdout should contain "--threads"
+        And stdout should contain "--small-component-size"
+        And it should exit successfully
+
+    Scenario: osrm-extract - Help, long
+        When I run "osrm-extract --help"
+        Then stderr should be empty
+        And stdout should contain /osrm-extract(.exe)? <input.osm/.osm.bz2/.osm.pbf> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--profile"
+        And stdout should contain "--threads"
+        And stdout should contain "--small-component-size"
+        And it should exit successfully
--- a/features/options/partition/help.feature
+++ b/features/options/partition/help.feature
@ -0,0 +1,53 @@
+@partition @options @help
+Feature: osrm-partition command line options: help
+
+    Scenario: osrm-partition - Help should be shown when no options are passed
+        When I try to run "osrm-partition"
+        Then stderr should be empty
+        And stdout should contain /osrm-partition(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And stdout should contain "--balance"
+        And stdout should contain "--boundary"
+        And stdout should contain "--optimizing-cuts"
+        And stdout should contain "--small-component-size"
+        And stdout should contain "--max-cell-sizes"
+        And it should exit with an error
+
+    Scenario: osrm-partition - Help, short
+        When I run "osrm-partition -h"
+        Then stderr should be empty
+        And stdout should contain /osrm-partition(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And stdout should contain "--balance"
+        And stdout should contain "--boundary"
+        And stdout should contain "--optimizing-cuts"
+        And stdout should contain "--small-component-size"
+        And stdout should contain "--max-cell-sizes"
+        And it should exit successfully
+
+    Scenario: osrm-partition - Help, long
+        When I run "osrm-partition --help"
+        Then stderr should be empty
+        And stdout should contain /osrm-partition(.exe)? <input.osrm> \[options\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--threads"
+        And stdout should contain "--balance"
+        And stdout should contain "--boundary"
+        And stdout should contain "--optimizing-cuts"
+        And stdout should contain "--small-component-size"
+        And stdout should contain "--max-cell-sizes"
+        And it should exit successfully
--- a/features/options/routed/help.feature
+++ b/features/options/routed/help.feature
@ -0,0 +1,71 @@
+@routed @options @help
+Feature: osrm-routed command line options: help
+
+    Background:
+        Given the profile "testbot"
+
+    Scenario: osrm-routed - Help should be shown when no options are passed
+        When I run "osrm-routed"
+        Then stderr should be empty
+        And stdout should contain /osrm-routed(.exe)? <base.osrm> \[<options>\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "--trial"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--ip"
+        And stdout should contain "--port"
+        And stdout should contain "--threads"
+        And stdout should contain "--shared-memory"
+        And stdout should contain "--max-viaroute-size"
+        And stdout should contain "--max-trip-size"
+        And stdout should contain "--max-table-size"
+        And stdout should contain "--max-matching-size"
+        And stdout should contain "--default-radius"
+        And stdout should contain "--keepalive-timeout"
+        And it should exit successfully
+
+    Scenario: osrm-routed - Help, short
+        When I run "osrm-routed -h"
+        Then stderr should be empty
+        And stdout should contain /osrm-routed(.exe)? <base.osrm> \[<options>\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "--trial"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--ip"
+        And stdout should contain "--port"
+        And stdout should contain "--threads"
+        And stdout should contain "--shared-memory"
+        And stdout should contain "--max-viaroute-size"
+        And stdout should contain "--max-trip-size"
+        And stdout should contain "--max-table-size"
+        And stdout should contain "--max-matching-size"
+        And stdout should contain "--default-radius"
+        And stdout should contain "--keepalive-timeout"
+        And it should exit successfully
+
+    Scenario: osrm-routed - Help, long
+        When I run "osrm-routed --help"
+        Then stderr should be empty
+        And stdout should contain /osrm-routed(.exe)? <base.osrm> \[<options>\]:/
+        And stdout should contain "Options:"
+        And stdout should contain "--version"
+        And stdout should contain "--help"
+        And stdout should contain "--verbosity"
+        And stdout should contain "--trial"
+        And stdout should contain "Configuration:"
+        And stdout should contain "--ip"
+        And stdout should contain "--port"
+        And stdout should contain "--threads"
+        And stdout should contain "--shared-memory"
+        And stdout should contain "--max-trip-size"
+        And stdout should contain "--max-table-size"
+        And stdout should contain "--max-table-size"
+        And stdout should contain "--max-matching-size"
+        And stdout should contain "--default-radius"
+        And stdout should contain "--keepalive-timeout"
+        And it should exit successfully
--- a/features/testbot/loop.feature
+++ b/features/testbot/loop.feature
@ -75,7 +75,7 @@ Feature: Avoid weird loops caused by rounding errors

    @412 @via
    Scenario: Avoid weird loops 3
-        Given the node map
+        And the node map
            """
            a
            b e
--- a/features/testbot/matching.feature
+++ b/features/testbot/matching.feature
@ -136,6 +136,22 @@ Feature: Basic Map Matching
            | trace | matchings |
            | abcbd | abbd      |

+    Scenario: Testbot - Map matching with core factor
+        Given the contract extra arguments "--core 0.8"
+        Given the node map
+            """
+            a b c d
+                e
+            """
+
+        And the ways
+            | nodes | oneway |
+            | abcd  | no     |
+
+        When I match I should get
+            | trace | timestamps | matchings |
+            | abcd  | 0 1 2 3    | abcd      |
+
    Scenario: Testbot - Map matching with small distortion
        Given the node map
            """
--- a/features/testbot/snap_intersection.feature
+++ b/features/testbot/snap_intersection.feature
@ -401,12 +401,12 @@ Feature: Snapping at intersections
        Given the extract extra arguments "--small-component-size=4"

        And the ways
-            | nodes | oneway | # comment  |
-            | ab    | no     |            |
-            | bc    | no     |            |
-            | cd    | no     |            |
-            | fed   | no     |            |
-            | bg    | yes    | small SCC  |
+            | nodes | oneway |
+            | ab    | no     |
+            | bc    | no     |
+            | cd    | no     |
+            | fed   | no     |
+            | bg    | yes    | # small SCC

        And the relations
            | type        | way:from | way:to | node:via | restriction   |
@ -437,14 +437,14 @@ Feature: Snapping at intersections
        Given the extract extra arguments "--small-component-size=4"

        And the ways
-            | nodes | oneway | # comment |
-            | ab    | no     |           |
-            | bc    | no     |           |
-            | cd    | no     |           |
-            | fed   | no     |           |
-            | ghi   | no     |           |
-            | jkl   | no     |           |
-            | bm    | yes    | small SCC |
+            | nodes | oneway |
+            | ab    | no     |
+            | bc    | no     |
+            | cd    | no     |
+            | fed   | no     |
+            | ghi   | no     |
+            | jkl   | no     |
+            | bm    | yes    | # small SCC

        And the relations
            | type        | way:from | way:to | node:via | restriction   |
--- a/features/testbot/via.feature
+++ b/features/testbot/via.feature
@ -65,6 +65,32 @@ Feature: Via points
            | waypoints | route          | turns                                                      |
            | 1,2,3     | cd,ac,ab,bd,cd | depart,new name right,new name right,new name right,arrive |

+    Scenario: Simple via point with core factor
+        Given the contract extra arguments "--core 0.8"
+        Given the node map
+            """
+            a b c d
+              e f g
+                h i
+                  j
+            """
+
+        And the ways
+            | nodes |
+            | abcd  |
+            | efg   |
+            | hi    |
+            | be    |
+            | cfh   |
+            | dgij  |
+
+        When I route I should get
+            | waypoints | route               |
+            | a,b,c     | abcd,abcd,abcd,abcd |
+            | c,b,a     | abcd,abcd,abcd,abcd |
+            | a,d,j     | abcd,abcd,dgij,dgij |
+            | j,d,a     | dgij,dgij,abcd,abcd |
+
    Scenario: Via point at a dead end
        Given the node map
            """
--- a/generated/include/engine/api/flatbuffers/fbresult_generated.h
+++ b/generated/include/engine/api/flatbuffers/fbresult_generated.h
@ -1,249 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-
-
-#ifndef FLATBUFFERS_GENERATED_FBRESULT_OSRM_ENGINE_API_FBRESULT_H_
-#define FLATBUFFERS_GENERATED_FBRESULT_OSRM_ENGINE_API_FBRESULT_H_
-
-#include "flatbuffers/flatbuffers.h"
-
-// Ensure the included flatbuffers.h is the same version as when this file was
-// generated, otherwise it may not be compatible.
-static_assert(FLATBUFFERS_VERSION_MAJOR == 24 &&
-              FLATBUFFERS_VERSION_MINOR == 3 &&
-              FLATBUFFERS_VERSION_REVISION == 25,
-             "Non-compatible flatbuffers version included");
-
-#include "route_generated.h"
-#include "table_generated.h"
-
-namespace osrm {
-namespace engine {
-namespace api {
-namespace fbresult {
-
-struct Error;
-struct ErrorBuilder;
-
-struct FBResult;
-struct FBResultBuilder;
-
-struct Error FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef ErrorBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_CODE = 4,
-    VT_MESSAGE = 6
-  };
-  const ::flatbuffers::String *code() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_CODE);
-  }
-  const ::flatbuffers::String *message() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_MESSAGE);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_CODE) &&
-           verifier.VerifyString(code()) &&
-           VerifyOffset(verifier, VT_MESSAGE) &&
-           verifier.VerifyString(message()) &&
-           verifier.EndTable();
-  }
-};
-
-struct ErrorBuilder {
-  typedef Error Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_code(::flatbuffers::Offset<::flatbuffers::String> code) {
-    fbb_.AddOffset(Error::VT_CODE, code);
-  }
-  void add_message(::flatbuffers::Offset<::flatbuffers::String> message) {
-    fbb_.AddOffset(Error::VT_MESSAGE, message);
-  }
-  explicit ErrorBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<Error> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<Error>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<Error> CreateError(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> code = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> message = 0) {
-  ErrorBuilder builder_(_fbb);
-  builder_.add_message(message);
-  builder_.add_code(code);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<Error> CreateErrorDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *code = nullptr,
-    const char *message = nullptr) {
-  auto code__ = code ? _fbb.CreateString(code) : 0;
-  auto message__ = message ? _fbb.CreateString(message) : 0;
-  return osrm::engine::api::fbresult::CreateError(
-      _fbb,
-      code__,
-      message__);
-}
-
-struct FBResult FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef FBResultBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_ERROR = 4,
-    VT_CODE = 6,
-    VT_DATA_VERSION = 8,
-    VT_WAYPOINTS = 10,
-    VT_ROUTES = 12,
-    VT_TABLE = 14
-  };
-  bool error() const {
-    return GetField<uint8_t>(VT_ERROR, 0) != 0;
-  }
-  const osrm::engine::api::fbresult::Error *code() const {
-    return GetPointer<const osrm::engine::api::fbresult::Error *>(VT_CODE);
-  }
-  const ::flatbuffers::String *data_version() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_DATA_VERSION);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>> *waypoints() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>> *>(VT_WAYPOINTS);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *routes() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *>(VT_ROUTES);
-  }
-  const osrm::engine::api::fbresult::TableResult *table() const {
-    return GetPointer<const osrm::engine::api::fbresult::TableResult *>(VT_TABLE);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyField<uint8_t>(verifier, VT_ERROR, 1) &&
-           VerifyOffset(verifier, VT_CODE) &&
-           verifier.VerifyTable(code()) &&
-           VerifyOffset(verifier, VT_DATA_VERSION) &&
-           verifier.VerifyString(data_version()) &&
-           VerifyOffset(verifier, VT_WAYPOINTS) &&
-           verifier.VerifyVector(waypoints()) &&
-           verifier.VerifyVectorOfTables(waypoints()) &&
-           VerifyOffset(verifier, VT_ROUTES) &&
-           verifier.VerifyVector(routes()) &&
-           verifier.VerifyVectorOfTables(routes()) &&
-           VerifyOffset(verifier, VT_TABLE) &&
-           verifier.VerifyTable(table()) &&
-           verifier.EndTable();
-  }
-};
-
-struct FBResultBuilder {
-  typedef FBResult Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_error(bool error) {
-    fbb_.AddElement<uint8_t>(FBResult::VT_ERROR, static_cast<uint8_t>(error), 0);
-  }
-  void add_code(::flatbuffers::Offset<osrm::engine::api::fbresult::Error> code) {
-    fbb_.AddOffset(FBResult::VT_CODE, code);
-  }
-  void add_data_version(::flatbuffers::Offset<::flatbuffers::String> data_version) {
-    fbb_.AddOffset(FBResult::VT_DATA_VERSION, data_version);
-  }
-  void add_waypoints(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> waypoints) {
-    fbb_.AddOffset(FBResult::VT_WAYPOINTS, waypoints);
-  }
-  void add_routes(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>> routes) {
-    fbb_.AddOffset(FBResult::VT_ROUTES, routes);
-  }
-  void add_table(::flatbuffers::Offset<osrm::engine::api::fbresult::TableResult> table) {
-    fbb_.AddOffset(FBResult::VT_TABLE, table);
-  }
-  explicit FBResultBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<FBResult> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<FBResult>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<FBResult> CreateFBResult(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    bool error = false,
-    ::flatbuffers::Offset<osrm::engine::api::fbresult::Error> code = 0,
-    ::flatbuffers::Offset<::flatbuffers::String> data_version = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> waypoints = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>> routes = 0,
-    ::flatbuffers::Offset<osrm::engine::api::fbresult::TableResult> table = 0) {
-  FBResultBuilder builder_(_fbb);
-  builder_.add_table(table);
-  builder_.add_routes(routes);
-  builder_.add_waypoints(waypoints);
-  builder_.add_data_version(data_version);
-  builder_.add_code(code);
-  builder_.add_error(error);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<FBResult> CreateFBResultDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    bool error = false,
-    ::flatbuffers::Offset<osrm::engine::api::fbresult::Error> code = 0,
-    const char *data_version = nullptr,
-    const std::vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>> *waypoints = nullptr,
-    const std::vector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>> *routes = nullptr,
-    ::flatbuffers::Offset<osrm::engine::api::fbresult::TableResult> table = 0) {
-  auto data_version__ = data_version ? _fbb.CreateString(data_version) : 0;
-  auto waypoints__ = waypoints ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>(*waypoints) : 0;
-  auto routes__ = routes ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::RouteObject>>(*routes) : 0;
-  return osrm::engine::api::fbresult::CreateFBResult(
-      _fbb,
-      error,
-      code,
-      data_version__,
-      waypoints__,
-      routes__,
-      table);
-}
-
-inline const osrm::engine::api::fbresult::FBResult *GetFBResult(const void *buf) {
-  return ::flatbuffers::GetRoot<osrm::engine::api::fbresult::FBResult>(buf);
-}
-
-inline const osrm::engine::api::fbresult::FBResult *GetSizePrefixedFBResult(const void *buf) {
-  return ::flatbuffers::GetSizePrefixedRoot<osrm::engine::api::fbresult::FBResult>(buf);
-}
-
-inline bool VerifyFBResultBuffer(
-    ::flatbuffers::Verifier &verifier) {
-  return verifier.VerifyBuffer<osrm::engine::api::fbresult::FBResult>(nullptr);
-}
-
-inline bool VerifySizePrefixedFBResultBuffer(
-    ::flatbuffers::Verifier &verifier) {
-  return verifier.VerifySizePrefixedBuffer<osrm::engine::api::fbresult::FBResult>(nullptr);
-}
-
-inline void FinishFBResultBuffer(
-    ::flatbuffers::FlatBufferBuilder &fbb,
-    ::flatbuffers::Offset<osrm::engine::api::fbresult::FBResult> root) {
-  fbb.Finish(root);
-}
-
-inline void FinishSizePrefixedFBResultBuffer(
-    ::flatbuffers::FlatBufferBuilder &fbb,
-    ::flatbuffers::Offset<osrm::engine::api::fbresult::FBResult> root) {
-  fbb.FinishSizePrefixed(root);
-}
-
-}  // namespace fbresult
-}  // namespace api
-}  // namespace engine
-}  // namespace osrm
-
-#endif  // FLATBUFFERS_GENERATED_FBRESULT_OSRM_ENGINE_API_FBRESULT_H_
--- a/generated/include/engine/api/flatbuffers/position_generated.h
+++ b/generated/include/engine/api/flatbuffers/position_generated.h
@ -1,51 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-
-
-#ifndef FLATBUFFERS_GENERATED_POSITION_OSRM_ENGINE_API_FBRESULT_H_
-#define FLATBUFFERS_GENERATED_POSITION_OSRM_ENGINE_API_FBRESULT_H_
-
-#include "flatbuffers/flatbuffers.h"
-
-// Ensure the included flatbuffers.h is the same version as when this file was
-// generated, otherwise it may not be compatible.
-static_assert(FLATBUFFERS_VERSION_MAJOR == 24 &&
-              FLATBUFFERS_VERSION_MINOR == 3 &&
-              FLATBUFFERS_VERSION_REVISION == 25,
-             "Non-compatible flatbuffers version included");
-
-namespace osrm {
-namespace engine {
-namespace api {
-namespace fbresult {
-
-struct Position;
-
-FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Position FLATBUFFERS_FINAL_CLASS {
- private:
-  float longitude_;
-  float latitude_;
-
- public:
-  Position()
-      : longitude_(0),
-        latitude_(0) {
-  }
-  Position(float _longitude, float _latitude)
-      : longitude_(::flatbuffers::EndianScalar(_longitude)),
-        latitude_(::flatbuffers::EndianScalar(_latitude)) {
-  }
-  float longitude() const {
-    return ::flatbuffers::EndianScalar(longitude_);
-  }
-  float latitude() const {
-    return ::flatbuffers::EndianScalar(latitude_);
-  }
-};
-FLATBUFFERS_STRUCT_END(Position, 8);
-
-}  // namespace fbresult
-}  // namespace api
-}  // namespace engine
-}  // namespace osrm
-
-#endif  // FLATBUFFERS_GENERATED_POSITION_OSRM_ENGINE_API_FBRESULT_H_
--- a/generated/include/engine/api/flatbuffers/route_generated.h
+++ b/generated/include/engine/api/flatbuffers/route_generated.h
--- a/generated/include/engine/api/flatbuffers/table_generated.h
+++ b/generated/include/engine/api/flatbuffers/table_generated.h
@ -1,149 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-
-
-#ifndef FLATBUFFERS_GENERATED_TABLE_OSRM_ENGINE_API_FBRESULT_H_
-#define FLATBUFFERS_GENERATED_TABLE_OSRM_ENGINE_API_FBRESULT_H_
-
-#include "flatbuffers/flatbuffers.h"
-
-// Ensure the included flatbuffers.h is the same version as when this file was
-// generated, otherwise it may not be compatible.
-static_assert(FLATBUFFERS_VERSION_MAJOR == 24 &&
-              FLATBUFFERS_VERSION_MINOR == 3 &&
-              FLATBUFFERS_VERSION_REVISION == 25,
-             "Non-compatible flatbuffers version included");
-
-#include "waypoint_generated.h"
-
-namespace osrm {
-namespace engine {
-namespace api {
-namespace fbresult {
-
-struct TableResult;
-struct TableResultBuilder;
-
-struct TableResult FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef TableResultBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_DURATIONS = 4,
-    VT_ROWS = 6,
-    VT_COLS = 8,
-    VT_DISTANCES = 10,
-    VT_DESTINATIONS = 12,
-    VT_FALLBACK_SPEED_CELLS = 14
-  };
-  const ::flatbuffers::Vector<float> *durations() const {
-    return GetPointer<const ::flatbuffers::Vector<float> *>(VT_DURATIONS);
-  }
-  uint16_t rows() const {
-    return GetField<uint16_t>(VT_ROWS, 0);
-  }
-  uint16_t cols() const {
-    return GetField<uint16_t>(VT_COLS, 0);
-  }
-  const ::flatbuffers::Vector<float> *distances() const {
-    return GetPointer<const ::flatbuffers::Vector<float> *>(VT_DISTANCES);
-  }
-  const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>> *destinations() const {
-    return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>> *>(VT_DESTINATIONS);
-  }
-  const ::flatbuffers::Vector<uint32_t> *fallback_speed_cells() const {
-    return GetPointer<const ::flatbuffers::Vector<uint32_t> *>(VT_FALLBACK_SPEED_CELLS);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_DURATIONS) &&
-           verifier.VerifyVector(durations()) &&
-           VerifyField<uint16_t>(verifier, VT_ROWS, 2) &&
-           VerifyField<uint16_t>(verifier, VT_COLS, 2) &&
-           VerifyOffset(verifier, VT_DISTANCES) &&
-           verifier.VerifyVector(distances()) &&
-           VerifyOffset(verifier, VT_DESTINATIONS) &&
-           verifier.VerifyVector(destinations()) &&
-           verifier.VerifyVectorOfTables(destinations()) &&
-           VerifyOffset(verifier, VT_FALLBACK_SPEED_CELLS) &&
-           verifier.VerifyVector(fallback_speed_cells()) &&
-           verifier.EndTable();
-  }
-};
-
-struct TableResultBuilder {
-  typedef TableResult Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_durations(::flatbuffers::Offset<::flatbuffers::Vector<float>> durations) {
-    fbb_.AddOffset(TableResult::VT_DURATIONS, durations);
-  }
-  void add_rows(uint16_t rows) {
-    fbb_.AddElement<uint16_t>(TableResult::VT_ROWS, rows, 0);
-  }
-  void add_cols(uint16_t cols) {
-    fbb_.AddElement<uint16_t>(TableResult::VT_COLS, cols, 0);
-  }
-  void add_distances(::flatbuffers::Offset<::flatbuffers::Vector<float>> distances) {
-    fbb_.AddOffset(TableResult::VT_DISTANCES, distances);
-  }
-  void add_destinations(::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> destinations) {
-    fbb_.AddOffset(TableResult::VT_DESTINATIONS, destinations);
-  }
-  void add_fallback_speed_cells(::flatbuffers::Offset<::flatbuffers::Vector<uint32_t>> fallback_speed_cells) {
-    fbb_.AddOffset(TableResult::VT_FALLBACK_SPEED_CELLS, fallback_speed_cells);
-  }
-  explicit TableResultBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<TableResult> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<TableResult>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<TableResult> CreateTableResult(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::Vector<float>> durations = 0,
-    uint16_t rows = 0,
-    uint16_t cols = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<float>> distances = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>> destinations = 0,
-    ::flatbuffers::Offset<::flatbuffers::Vector<uint32_t>> fallback_speed_cells = 0) {
-  TableResultBuilder builder_(_fbb);
-  builder_.add_fallback_speed_cells(fallback_speed_cells);
-  builder_.add_destinations(destinations);
-  builder_.add_distances(distances);
-  builder_.add_durations(durations);
-  builder_.add_cols(cols);
-  builder_.add_rows(rows);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<TableResult> CreateTableResultDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const std::vector<float> *durations = nullptr,
-    uint16_t rows = 0,
-    uint16_t cols = 0,
-    const std::vector<float> *distances = nullptr,
-    const std::vector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>> *destinations = nullptr,
-    const std::vector<uint32_t> *fallback_speed_cells = nullptr) {
-  auto durations__ = durations ? _fbb.CreateVector<float>(*durations) : 0;
-  auto distances__ = distances ? _fbb.CreateVector<float>(*distances) : 0;
-  auto destinations__ = destinations ? _fbb.CreateVector<::flatbuffers::Offset<osrm::engine::api::fbresult::Waypoint>>(*destinations) : 0;
-  auto fallback_speed_cells__ = fallback_speed_cells ? _fbb.CreateVector<uint32_t>(*fallback_speed_cells) : 0;
-  return osrm::engine::api::fbresult::CreateTableResult(
-      _fbb,
-      durations__,
-      rows,
-      cols,
-      distances__,
-      destinations__,
-      fallback_speed_cells__);
-}
-
-}  // namespace fbresult
-}  // namespace api
-}  // namespace engine
-}  // namespace osrm
-
-#endif  // FLATBUFFERS_GENERATED_TABLE_OSRM_ENGINE_API_FBRESULT_H_
--- a/generated/include/engine/api/flatbuffers/waypoint_generated.h
+++ b/generated/include/engine/api/flatbuffers/waypoint_generated.h
@ -1,205 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-
-
-#ifndef FLATBUFFERS_GENERATED_WAYPOINT_OSRM_ENGINE_API_FBRESULT_H_
-#define FLATBUFFERS_GENERATED_WAYPOINT_OSRM_ENGINE_API_FBRESULT_H_
-
-#include "flatbuffers/flatbuffers.h"
-
-// Ensure the included flatbuffers.h is the same version as when this file was
-// generated, otherwise it may not be compatible.
-static_assert(FLATBUFFERS_VERSION_MAJOR == 24 &&
-              FLATBUFFERS_VERSION_MINOR == 3 &&
-              FLATBUFFERS_VERSION_REVISION == 25,
-             "Non-compatible flatbuffers version included");
-
-#include "position_generated.h"
-
-namespace osrm {
-namespace engine {
-namespace api {
-namespace fbresult {
-
-struct Uint64Pair;
-
-struct Waypoint;
-struct WaypointBuilder;
-
-FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Uint64Pair FLATBUFFERS_FINAL_CLASS {
- private:
-  uint64_t first_;
-  uint64_t second_;
-
- public:
-  Uint64Pair()
-      : first_(0),
-        second_(0) {
-  }
-  Uint64Pair(uint64_t _first, uint64_t _second)
-      : first_(::flatbuffers::EndianScalar(_first)),
-        second_(::flatbuffers::EndianScalar(_second)) {
-  }
-  uint64_t first() const {
-    return ::flatbuffers::EndianScalar(first_);
-  }
-  uint64_t second() const {
-    return ::flatbuffers::EndianScalar(second_);
-  }
-};
-FLATBUFFERS_STRUCT_END(Uint64Pair, 16);
-
-struct Waypoint FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef WaypointBuilder Builder;
-  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
-    VT_HINT = 4,
-    VT_DISTANCE = 6,
-    VT_NAME = 8,
-    VT_LOCATION = 10,
-    VT_NODES = 12,
-    VT_MATCHINGS_INDEX = 14,
-    VT_WAYPOINT_INDEX = 16,
-    VT_ALTERNATIVES_COUNT = 18,
-    VT_TRIPS_INDEX = 20
-  };
-  const ::flatbuffers::String *hint() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_HINT);
-  }
-  float distance() const {
-    return GetField<float>(VT_DISTANCE, 0.0f);
-  }
-  const ::flatbuffers::String *name() const {
-    return GetPointer<const ::flatbuffers::String *>(VT_NAME);
-  }
-  const osrm::engine::api::fbresult::Position *location() const {
-    return GetStruct<const osrm::engine::api::fbresult::Position *>(VT_LOCATION);
-  }
-  const osrm::engine::api::fbresult::Uint64Pair *nodes() const {
-    return GetStruct<const osrm::engine::api::fbresult::Uint64Pair *>(VT_NODES);
-  }
-  uint32_t matchings_index() const {
-    return GetField<uint32_t>(VT_MATCHINGS_INDEX, 0);
-  }
-  uint32_t waypoint_index() const {
-    return GetField<uint32_t>(VT_WAYPOINT_INDEX, 0);
-  }
-  uint32_t alternatives_count() const {
-    return GetField<uint32_t>(VT_ALTERNATIVES_COUNT, 0);
-  }
-  uint32_t trips_index() const {
-    return GetField<uint32_t>(VT_TRIPS_INDEX, 0);
-  }
-  bool Verify(::flatbuffers::Verifier &verifier) const {
-    return VerifyTableStart(verifier) &&
-           VerifyOffset(verifier, VT_HINT) &&
-           verifier.VerifyString(hint()) &&
-           VerifyField<float>(verifier, VT_DISTANCE, 4) &&
-           VerifyOffset(verifier, VT_NAME) &&
-           verifier.VerifyString(name()) &&
-           VerifyField<osrm::engine::api::fbresult::Position>(verifier, VT_LOCATION, 4) &&
-           VerifyField<osrm::engine::api::fbresult::Uint64Pair>(verifier, VT_NODES, 8) &&
-           VerifyField<uint32_t>(verifier, VT_MATCHINGS_INDEX, 4) &&
-           VerifyField<uint32_t>(verifier, VT_WAYPOINT_INDEX, 4) &&
-           VerifyField<uint32_t>(verifier, VT_ALTERNATIVES_COUNT, 4) &&
-           VerifyField<uint32_t>(verifier, VT_TRIPS_INDEX, 4) &&
-           verifier.EndTable();
-  }
-};
-
-struct WaypointBuilder {
-  typedef Waypoint Table;
-  ::flatbuffers::FlatBufferBuilder &fbb_;
-  ::flatbuffers::uoffset_t start_;
-  void add_hint(::flatbuffers::Offset<::flatbuffers::String> hint) {
-    fbb_.AddOffset(Waypoint::VT_HINT, hint);
-  }
-  void add_distance(float distance) {
-    fbb_.AddElement<float>(Waypoint::VT_DISTANCE, distance, 0.0f);
-  }
-  void add_name(::flatbuffers::Offset<::flatbuffers::String> name) {
-    fbb_.AddOffset(Waypoint::VT_NAME, name);
-  }
-  void add_location(const osrm::engine::api::fbresult::Position *location) {
-    fbb_.AddStruct(Waypoint::VT_LOCATION, location);
-  }
-  void add_nodes(const osrm::engine::api::fbresult::Uint64Pair *nodes) {
-    fbb_.AddStruct(Waypoint::VT_NODES, nodes);
-  }
-  void add_matchings_index(uint32_t matchings_index) {
-    fbb_.AddElement<uint32_t>(Waypoint::VT_MATCHINGS_INDEX, matchings_index, 0);
-  }
-  void add_waypoint_index(uint32_t waypoint_index) {
-    fbb_.AddElement<uint32_t>(Waypoint::VT_WAYPOINT_INDEX, waypoint_index, 0);
-  }
-  void add_alternatives_count(uint32_t alternatives_count) {
-    fbb_.AddElement<uint32_t>(Waypoint::VT_ALTERNATIVES_COUNT, alternatives_count, 0);
-  }
-  void add_trips_index(uint32_t trips_index) {
-    fbb_.AddElement<uint32_t>(Waypoint::VT_TRIPS_INDEX, trips_index, 0);
-  }
-  explicit WaypointBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
-        : fbb_(_fbb) {
-    start_ = fbb_.StartTable();
-  }
-  ::flatbuffers::Offset<Waypoint> Finish() {
-    const auto end = fbb_.EndTable(start_);
-    auto o = ::flatbuffers::Offset<Waypoint>(end);
-    return o;
-  }
-};
-
-inline ::flatbuffers::Offset<Waypoint> CreateWaypoint(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    ::flatbuffers::Offset<::flatbuffers::String> hint = 0,
-    float distance = 0.0f,
-    ::flatbuffers::Offset<::flatbuffers::String> name = 0,
-    const osrm::engine::api::fbresult::Position *location = nullptr,
-    const osrm::engine::api::fbresult::Uint64Pair *nodes = nullptr,
-    uint32_t matchings_index = 0,
-    uint32_t waypoint_index = 0,
-    uint32_t alternatives_count = 0,
-    uint32_t trips_index = 0) {
-  WaypointBuilder builder_(_fbb);
-  builder_.add_trips_index(trips_index);
-  builder_.add_alternatives_count(alternatives_count);
-  builder_.add_waypoint_index(waypoint_index);
-  builder_.add_matchings_index(matchings_index);
-  builder_.add_nodes(nodes);
-  builder_.add_location(location);
-  builder_.add_name(name);
-  builder_.add_distance(distance);
-  builder_.add_hint(hint);
-  return builder_.Finish();
-}
-
-inline ::flatbuffers::Offset<Waypoint> CreateWaypointDirect(
-    ::flatbuffers::FlatBufferBuilder &_fbb,
-    const char *hint = nullptr,
-    float distance = 0.0f,
-    const char *name = nullptr,
-    const osrm::engine::api::fbresult::Position *location = nullptr,
-    const osrm::engine::api::fbresult::Uint64Pair *nodes = nullptr,
-    uint32_t matchings_index = 0,
-    uint32_t waypoint_index = 0,
-    uint32_t alternatives_count = 0,
-    uint32_t trips_index = 0) {
-  auto hint__ = hint ? _fbb.CreateString(hint) : 0;
-  auto name__ = name ? _fbb.CreateString(name) : 0;
-  return osrm::engine::api::fbresult::CreateWaypoint(
-      _fbb,
-      hint__,
-      distance,
-      name__,
-      location,
-      nodes,
-      matchings_index,
-      waypoint_index,
-      alternatives_count,
-      trips_index);
-}
-
-}  // namespace fbresult
-}  // namespace api
-}  // namespace engine
-}  // namespace osrm
-
-#endif  // FLATBUFFERS_GENERATED_WAYPOINT_OSRM_ENGINE_API_FBRESULT_H_
--- a/include/engine/api/flatbuffers/fbresult.fbs
+++ b/include/engine/api/flatbuffers/fbresult.fbs
@ -14,7 +14,7 @@ table FBResult {
    data_version: string;
    waypoints: [Waypoint]; //Used as 'sources' waypoints for a 'Table' service
    routes: [RouteObject];
-    table: TableResult;
+    table: Table;
 }

 root_type FBResult;
--- a/include/engine/api/flatbuffers/fbresult_generated.h
+++ b/include/engine/api/flatbuffers/fbresult_generated.h
--- a/include/engine/api/flatbuffers/table.fbs
+++ b/include/engine/api/flatbuffers/table.fbs
@ -1,7 +1,7 @@
 include "waypoint.fbs";
 namespace osrm.engine.api.fbresult;

-table TableResult {
+table Table {
    durations: [float];
    rows: ushort;
    cols: ushort;
--- a/include/engine/api/table_api.hpp
+++ b/include/engine/api/table_api.hpp
@ -137,7 +137,7 @@ class TableAPI final : public BaseAPI
            speed_cells = MakeEstimatesTable(fb_result, fallback_speed_cells);
        }

-        fbresult::TableResultBuilder table(fb_result);
+        fbresult::TableBuilder table(fb_result);
        table.add_destinations(destinations);
        table.add_rows(number_of_sources);
        table.add_cols(number_of_destinations);
--- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp
@ -603,8 +603,6 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
        auto found_range = std::equal_range(
            m_maneuver_overrides.begin(), m_maneuver_overrides.end(), edge_based_node_id, Comp{});

-        results.reserve(std::distance(found_range.first, found_range.second));
-
        std::for_each(found_range.first,
                      found_range.second,
                      [&](const auto &override)
--- a/include/engine/search_engine_data.hpp
+++ b/include/engine/search_engine_data.hpp
@ -5,6 +5,8 @@
 #include "util/query_heap.hpp"
 #include "util/typedefs.hpp"

+#include <boost/thread/tss.hpp>
+
 namespace osrm::engine
 {

@ -43,19 +45,19 @@ template <> struct SearchEngineData<routing_algorithms::ch::Algorithm>
                                                ManyToManyHeapData,
                                                util::UnorderedMapStorage<NodeID, int>>;

-    using SearchEngineHeapPtr = std::unique_ptr<QueryHeap>;
+    using SearchEngineHeapPtr = boost::thread_specific_ptr<QueryHeap>;

-    using ManyToManyHeapPtr = std::unique_ptr<ManyToManyQueryHeap>;
+    using ManyToManyHeapPtr = boost::thread_specific_ptr<ManyToManyQueryHeap>;

-    static thread_local SearchEngineHeapPtr forward_heap_1;
-    static thread_local SearchEngineHeapPtr reverse_heap_1;
-    static thread_local SearchEngineHeapPtr forward_heap_2;
-    static thread_local SearchEngineHeapPtr reverse_heap_2;
-    static thread_local SearchEngineHeapPtr forward_heap_3;
-    static thread_local SearchEngineHeapPtr reverse_heap_3;
-    static thread_local ManyToManyHeapPtr many_to_many_heap;
-    static thread_local SearchEngineHeapPtr map_matching_forward_heap_1;
-    static thread_local SearchEngineHeapPtr map_matching_reverse_heap_1;
+    static SearchEngineHeapPtr forward_heap_1;
+    static SearchEngineHeapPtr reverse_heap_1;
+    static SearchEngineHeapPtr forward_heap_2;
+    static SearchEngineHeapPtr reverse_heap_2;
+    static SearchEngineHeapPtr forward_heap_3;
+    static SearchEngineHeapPtr reverse_heap_3;
+    static ManyToManyHeapPtr many_to_many_heap;
+    static SearchEngineHeapPtr map_matching_forward_heap_1;
+    static SearchEngineHeapPtr map_matching_reverse_heap_1;

    void InitializeOrClearMapMatchingThreadLocalStorage(unsigned number_of_nodes);

@ -125,16 +127,16 @@ template <> struct SearchEngineData<routing_algorithms::mld::Algorithm>
                                                 MapMatchingMultiLayerDijkstraHeapData,
                                                 util::TwoLevelStorage<NodeID, int>>;

-    using SearchEngineHeapPtr = std::unique_ptr<QueryHeap>;
-    using ManyToManyHeapPtr = std::unique_ptr<ManyToManyQueryHeap>;
-    using MapMatchingHeapPtr = std::unique_ptr<MapMatchingQueryHeap>;
+    using SearchEngineHeapPtr = boost::thread_specific_ptr<QueryHeap>;
+    using ManyToManyHeapPtr = boost::thread_specific_ptr<ManyToManyQueryHeap>;
+    using MapMatchingHeapPtr = boost::thread_specific_ptr<MapMatchingQueryHeap>;

-    static thread_local SearchEngineHeapPtr forward_heap_1;
-    static thread_local SearchEngineHeapPtr reverse_heap_1;
-    static thread_local MapMatchingHeapPtr map_matching_forward_heap_1;
-    static thread_local MapMatchingHeapPtr map_matching_reverse_heap_1;
+    static SearchEngineHeapPtr forward_heap_1;
+    static SearchEngineHeapPtr reverse_heap_1;
+    static MapMatchingHeapPtr map_matching_forward_heap_1;
+    static MapMatchingHeapPtr map_matching_reverse_heap_1;

-    static thread_local ManyToManyHeapPtr many_to_many_heap;
+    static ManyToManyHeapPtr many_to_many_heap;

    void InitializeOrClearFirstThreadLocalStorage(unsigned number_of_nodes,
                                                  unsigned number_of_boundary_nodes);
--- a/include/nodejs/json_v8_renderer.hpp
+++ b/include/nodejs/json_v8_renderer.hpp
@ -30,7 +30,7 @@ struct V8Renderer
        {
            Napi::Value child;
            std::visit(V8Renderer(env, child), keyValue.second);
-            obj.Set(keyValue.first.data(), child);
+            obj.Set(keyValue.first, child);
        }
        out = obj;
    }
--- a/include/util/bearing.hpp
+++ b/include/util/bearing.hpp
@ -11,6 +11,46 @@ namespace osrm::util
 namespace bearing
 {

+inline std::string get(const double heading)
+{
+    BOOST_ASSERT(heading >= 0);
+    BOOST_ASSERT(heading <= 360);
+
+    if (heading <= 22.5)
+    {
+        return "N";
+    }
+    if (heading <= 67.5)
+    {
+        return "NE";
+    }
+    if (heading <= 112.5)
+    {
+        return "E";
+    }
+    if (heading <= 157.5)
+    {
+        return "SE";
+    }
+    if (heading <= 202.5)
+    {
+        return "S";
+    }
+    if (heading <= 247.5)
+    {
+        return "SW";
+    }
+    if (heading <= 292.5)
+    {
+        return "W";
+    }
+    if (heading <= 337.5)
+    {
+        return "NW";
+    }
+    return "N";
+}
+
 // Checks whether A is between B-range and B+range, all modulo 360
 // e.g. A = 5, B = 5, range = 10 == true
 //      A = -6, B = 5, range = 10 == false
--- a/include/util/bit_range.hpp
+++ b/include/util/bit_range.hpp
@ -2,13 +2,43 @@
 #define OSRM_UTIL_BIT_RANGE_HPP

 #include "util/msb.hpp"
-#include <bit>
+
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/range/iterator_range.hpp>

 namespace osrm::util
 {

+namespace detail
+{
+template <typename T> std::size_t countOnes(T value)
+{
+    static_assert(std::is_unsigned<T>::value, "Only unsigned types allowed");
+    std::size_t number_of_ones = 0;
+    while (value > 0)
+    {
+        auto index = msb(value);
+        value = value & ~(T{1} << index);
+        number_of_ones++;
+    }
+    return number_of_ones;
+}
+
+#if (defined(__clang__) || defined(__GNUC__) || defined(__GNUG__))
+inline std::size_t countOnes(std::uint8_t value)
+{
+    return __builtin_popcount(std::uint32_t{value});
+}
+inline std::size_t countOnes(std::uint16_t value)
+{
+    return __builtin_popcount(std::uint32_t{value});
+}
+inline std::size_t countOnes(unsigned int value) { return __builtin_popcount(value); }
+inline std::size_t countOnes(unsigned long value) { return __builtin_popcountl(value); }
+inline std::size_t countOnes(unsigned long long value) { return __builtin_popcountll(value); }
+#endif
+} // namespace detail
+
 // Investigate if we can replace this with
 // http://www.boost.org/doc/libs/1_64_0/libs/dynamic_bitset/dynamic_bitset.html
 template <typename DataT>
@ -40,7 +70,7 @@ class BitIterator : public boost::iterator_facade<BitIterator<DataT>,

    difference_type distance_to(const BitIterator &other) const
    {
-        return std::popcount(m_value) - std::popcount(other.m_value);
+        return detail::countOnes(m_value) - detail::countOnes(other.m_value);
    }

    bool equal(const BitIterator &other) const { return m_value == other.m_value; }
--- a/include/util/json_container.hpp
+++ b/include/util/json_container.hpp
@ -104,7 +104,7 @@ using Value = std::variant<String, Number, Object, Array, True, False, Null>;
 */
 struct Object
 {
-    std::unordered_map<std::string_view, Value> values;
+    std::unordered_map<std::string, Value> values;
 };

 /**
--- a/include/util/json_deep_compare.hpp
+++ b/include/util/json_deep_compare.hpp
@ -44,13 +44,13 @@ struct Comparator

    bool operator()(const Object &lhs, const Object &rhs) const
    {
-        std::set<std::string_view> lhs_keys;
+        std::set<std::string> lhs_keys;
        for (const auto &key_value : lhs.values)
        {
            lhs_keys.insert(key_value.first);
        }

-        std::set<std::string_view> rhs_keys;
+        std::set<std::string> rhs_keys;
        for (const auto &key_value : rhs.values)
        {
            rhs_keys.insert(key_value.first);
@ -60,7 +60,7 @@ struct Comparator
        {
            if (rhs_keys.find(key) == rhs_keys.end())
            {
-                reason = rhs_path + " doesn't have key \"" + std::string(key) + "\"";
+                reason = rhs_path + " doesn't have key \"" + key + "\"";
                return false;
            }
        }
@ -69,7 +69,7 @@ struct Comparator
        {
            if (lhs_keys.find(key) == lhs_keys.end())
            {
-                reason = lhs_path + " doesn't have key \"" + std::string(key) + "\"";
+                reason = lhs_path + " doesn't have key \"" + key + "\"";
                return false;
            }
        }
@ -81,9 +81,8 @@ struct Comparator

            const auto &rhs_child = rhs.values.find(key)->second;
            const auto &lhs_child = lhs.values.find(key)->second;
-            auto is_same = std::visit(Comparator(reason,
-                                                 lhs_path + "." + std::string(key),
-                                                 rhs_path + "." + std::string(key)),
+            auto is_same =
+                std::visit(Comparator(reason, lhs_path + "." + key, rhs_path + "." + key),
                           lhs_child,
                           rhs_child);
            if (!is_same)
--- a/include/util/json_renderer.hpp
+++ b/include/util/json_renderer.hpp
@ -97,7 +97,7 @@ template <typename Out> struct Renderer
    void operator()(const Null &) { write<>("null"); }

  private:
-    void write(std::string_view str);
+    void write(const std::string &str);
    void write(const char *str, size_t size);
    void write(char ch);

@ -110,7 +110,7 @@ template <typename Out> struct Renderer
    Out &out;
 };

-template <> void Renderer<std::vector<char>>::write(std::string_view str)
+template <> void Renderer<std::vector<char>>::write(const std::string &str)
 {
    out.insert(out.end(), str.begin(), str.end());
 }
@ -122,7 +122,7 @@ template <> void Renderer<std::vector<char>>::write(const char *str, size_t size

 template <> void Renderer<std::vector<char>>::write(char ch) { out.push_back(ch); }

-template <> void Renderer<std::ostream>::write(std::string_view str) { out << str; }
+template <> void Renderer<std::ostream>::write(const std::string &str) { out << str; }

 template <> void Renderer<std::ostream>::write(const char *str, size_t size)
 {
@ -131,7 +131,7 @@ template <> void Renderer<std::ostream>::write(const char *str, size_t size)

 template <> void Renderer<std::ostream>::write(char ch) { out << ch; }

-template <> void Renderer<std::string>::write(std::string_view str) { out += str; }
+template <> void Renderer<std::string>::write(const std::string &str) { out += str; }

 template <> void Renderer<std::string>::write(const char *str, size_t size)
 {
--- a/include/util/meminfo.hpp
+++ b/include/util/meminfo.hpp
@ -2,7 +2,6 @@
 #define MEMINFO_HPP

 #include "util/log.hpp"
-#include <cstddef>

 #ifndef _WIN32
 #include <sys/resource.h>
@ -11,27 +10,18 @@
 namespace osrm::util
 {

-inline size_t PeakRAMUsedInBytes()
+inline void DumpMemoryStats()
 {
 #ifndef _WIN32
    rusage usage;
    getrusage(RUSAGE_SELF, &usage);
 #ifdef __linux__
    // Under linux, ru.maxrss is in kb
-    return usage.ru_maxrss * 1024;
+    util::Log() << "RAM: peak bytes used: " << usage.ru_maxrss * 1024;
 #else  // __linux__
    // Under BSD systems (OSX), it's in bytes
-    return usage.ru_maxrss;
+    util::Log() << "RAM: peak bytes used: " << usage.ru_maxrss;
 #endif // __linux__
-#else  // _WIN32
-    return 0;
-#endif // _WIN32
-}
-
-inline void DumpMemoryStats()
-{
-#ifndef _WIN32
-    util::Log() << "RAM: peak bytes used: " << PeakRAMUsedInBytes();
 #else  // _WIN32
    util::Log() << "RAM: peak bytes used: <not implemented on Windows>";
 #endif // _WIN32
--- a/include/util/msb.hpp
+++ b/include/util/msb.hpp
@ -1,24 +1,50 @@
 #ifndef OSRM_UTIL_MSB_HPP
 #define OSRM_UTIL_MSB_HPP

-#include <bit>
 #include <boost/assert.hpp>
+
+#include <climits>
 #include <cstdint>
-#include <limits>
+#include <utility>

 namespace osrm::util
 {

+// get the msb of an integer
+// return 0 for integers without msb
 template <typename T> std::size_t msb(T value)
 {
-    BOOST_ASSERT(value > 0);
-
    static_assert(std::is_integral<T>::value && !std::is_signed<T>::value, "Integer required.");
-    constexpr auto MSB_INDEX = std::numeric_limits<unsigned char>::digits * sizeof(T) - 1;
-
-    return MSB_INDEX - std::countl_zero(value);
+    std::size_t msb = 0;
+    while (value > 0)
+    {
+        value >>= 1u;
+        msb++;
+    }
+    BOOST_ASSERT(msb > 0);
+    return msb - 1;
 }

+#if (defined(__clang__) || defined(__GNUC__) || defined(__GNUG__))
+inline std::size_t msb(unsigned long long v)
+{
+    BOOST_ASSERT(v > 0);
+    constexpr auto MSB_INDEX = CHAR_BIT * sizeof(unsigned long long) - 1;
+    return MSB_INDEX - __builtin_clzll(v);
+}
+inline std::size_t msb(unsigned long v)
+{
+    BOOST_ASSERT(v > 0);
+    constexpr auto MSB_INDEX = CHAR_BIT * sizeof(unsigned long) - 1;
+    return MSB_INDEX - __builtin_clzl(v);
+}
+inline std::size_t msb(unsigned int v)
+{
+    BOOST_ASSERT(v > 0);
+    constexpr auto MSB_INDEX = CHAR_BIT * sizeof(unsigned int) - 1;
+    return MSB_INDEX - __builtin_clz(v);
+}
+#endif
 } // namespace osrm::util

 #endif
--- a/include/util/query_heap.hpp
+++ b/include/util/query_heap.hpp
@ -15,6 +15,48 @@
 namespace osrm::util
 {

+template <typename NodeID, typename Key> class GenerationArrayStorage
+{
+    using GenerationCounter = std::uint16_t;
+
+  public:
+    explicit GenerationArrayStorage(std::size_t size)
+        : positions(size, 0), generation(1), generations(size, 0)
+    {
+    }
+
+    Key &operator[](NodeID node)
+    {
+        generation[node] = generation;
+        return positions[node];
+    }
+
+    Key peek_index(const NodeID node) const
+    {
+        if (generations[node] < generation)
+        {
+            return std::numeric_limits<Key>::max();
+        }
+        return positions[node];
+    }
+
+    void Clear()
+    {
+        generation++;
+        // if generation overflows we end up at 0 again and need to clear the vector
+        if (generation == 0)
+        {
+            generation = 1;
+            std::fill(generations.begin(), generations.end(), 0);
+        }
+    }
+
+  private:
+    GenerationCounter generation;
+    std::vector<GenerationCounter> generations;
+    std::vector<Key> positions;
+};
+
 template <typename NodeID, typename Key> class ArrayStorage
 {
  public:
@ -30,6 +72,29 @@ template <typename NodeID, typename Key> class ArrayStorage
    std::vector<Key> positions;
 };

+template <typename NodeID, typename Key> class MapStorage
+{
+  public:
+    explicit MapStorage(std::size_t) {}
+
+    Key &operator[](NodeID node) { return nodes[node]; }
+
+    void Clear() { nodes.clear(); }
+
+    Key peek_index(const NodeID node) const
+    {
+        const auto iter = nodes.find(node);
+        if (nodes.end() != iter)
+        {
+            return iter->second;
+        }
+        return std::numeric_limits<Key>::max();
+    }
+
+  private:
+    std::map<NodeID, Key> nodes;
+};
+
 template <typename NodeID, typename Key> class UnorderedMapStorage
 {
  public:
--- a/package-lock.json
+++ b/package-lock.json
@ -10,8 +10,7 @@
      "hasInstallScript": true,
      "license": "BSD-2-Clause",
      "dependencies": {
-        "@mapbox/node-pre-gyp": "^1.0.11",
-        "seedrandom": "^3.0.5"
+        "@mapbox/node-pre-gyp": "^1.0.11"
      },
      "devDependencies": {
        "@babel/cli": "^7.18.10",
@ -14653,11 +14652,6 @@
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
      "devOptional": true
    },
-    "node_modules/seedrandom": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
-    },
    "node_modules/semver": {
      "version": "5.7.2",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
@ -30302,11 +30296,6 @@
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
      "devOptional": true
    },
-    "seedrandom": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
-    },
    "semver": {
      "version": "5.7.2",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
--- a/package.json
+++ b/package.json
@ -4,8 +4,7 @@
  "private": false,
  "description": "The Open Source Routing Machine is a high performance routing engine written in C++ designed to run on OpenStreetMap data.",
  "dependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.11",
-    "seedrandom": "^3.0.5"
+    "@mapbox/node-pre-gyp": "^1.0.11"
  },
  "browserify": {
    "transform": [
@ -58,7 +57,6 @@
    "jsonpath": "^1.1.1",
    "mkdirp": "^0.5.6",
    "node-addon-api": "^5.0.0",
-    "node-cmake": "^2.5.1",
    "node-timeout": "0.0.4",
    "polyline": "^0.2.0",
    "request": "^2.88.2",
@ -66,13 +64,12 @@
    "tape": "^4.16.0",
    "turf": "^3.0.14",
    "uglify-js": "^3.17.0",
-    "xmlbuilder": "^4.2.1"
+    "xmlbuilder": "^4.2.1",
+    "node-cmake": "^2.5.1"
  },
  "main": "lib/index.js",
  "binary": {
-    "napi_versions": [
-      8
-    ],
+    "napi_versions": [8],
    "module_name": "node_osrm",
    "module_path": "./lib/binding_napi_v{napi_build_version}/",
    "host": "https://github.com",
--- a/profiles/bicycle.lua
+++ b/profiles/bicycle.lua
@ -35,10 +35,6 @@ function setup()
    turn_bias                 = 1.4,
    use_public_transport      = true,

-    -- Exclude narrow ways, in particular to route with cargo bike
-    width                     = nil, -- Cargo bike could 0.5 width, in meters
-    exclude_cargo_bike        = false,
-
    allowed_start_modes = Set {
      mode.cycling,
      mode.pushing_bike
@ -247,27 +243,6 @@ function process_node(profile, node, result)
    end
  end

-  if profile.exclude_cargo_bike then
-    local cargo_bike = node:get_value_by_key("cargo_bike")
-    if cargo_bike and cargo_bike == "no" then
-      result.barrier = true
-    end
-  end
-
-  -- width
-  if profile.width then
-    -- From barrier=cycle_barrier or other barriers
-    local maxwidth_physical = node:get_value_by_key("maxwidth:physical")
-    local maxwidth_physical_meter = maxwidth_physical and Measure.parse_value_meters(maxwidth_physical) or 99
-    local opening = node:get_value_by_key("opening")
-    local opening_meter = opening and Measure.parse_value_meters(opening) or 99
-    local width_meter = math.min(maxwidth_physical_meter, opening_meter)
-
-    if width_meter and width_meter < profile.width then
-      result.barrier = true
-    end
-  end
-
  -- check if node is a traffic light
  result.traffic_lights = TrafficSignal.get_value(node)
 end
@ -324,8 +299,6 @@ function handle_bicycle_tags(profile,way,result,data)

  bike_push_handler(profile,way,result,data)

-  -- width should be after bike_push
-  width_handler(profile,way,result,data)

  -- maxspeed
  limit( result, data.maxspeed, data.maxspeed_forward, data.maxspeed_backward )
@ -480,27 +453,6 @@ function cycleway_handler(profile,way,result,data)
  end
 end

-function width_handler(profile,way,result,data)
-  if profile.exclude_cargo_bike then
-    local cargo_bike = way:get_value_by_key("cargo_bike")
-    if cargo_bike and cargo_bike == "no" then
-      result.forward_mode = mode.inaccessible
-      result.backward_mode = mode.inaccessible
-    end
-  end
-
-  if profile.width then
-    local width = way:get_value_by_key("width")
-    if width then
-      local width_meter = Measure.parse_value_meters(width)
-      if width_meter and width_meter < profile.width then
-        result.forward_mode = mode.inaccessible
-        result.backward_mode = mode.inaccessible
-      end
-    end
-  end
-end
-
 function bike_push_handler(profile,way,result,data)
  -- pushing bikes - if no other mode found
  if result.forward_mode == mode.inaccessible or result.backward_mode == mode.inaccessible or
--- a/profiles/foot.lua
+++ b/profiles/foot.lua
@ -90,7 +90,6 @@ function setup()
        path            = walking_speed,
        steps           = walking_speed,
        pedestrian      = walking_speed,
-        platform        = walking_speed,
        footway         = walking_speed,
        pier            = walking_speed,
      },
--- a/scripts/ci/bench.js
+++ b/scripts/ci/bench.js
@ -1,211 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const readline = require('readline');
-const seedrandom = require('seedrandom');
-
-
-let RNG;
-
-class GPSData {
-    constructor(gpsTracesFilePath) {
-        this.tracks = {};
-        this.coordinates = [];
-        this.trackIds = [];
-        this._loadGPSTraces(gpsTracesFilePath);
-    }
-
-    _loadGPSTraces(gpsTracesFilePath) {
-        const expandedPath = path.resolve(gpsTracesFilePath);
-        const data = fs.readFileSync(expandedPath, 'utf-8');
-        const lines = data.split('\n');
-        const headers = lines[0].split(',');
-
-        const latitudeIndex = headers.indexOf('Latitude');
-        const longitudeIndex = headers.indexOf('Longitude');
-        const trackIdIndex = headers.indexOf('TrackID');
-
-        for (let i = 1; i < lines.length; i++) {
-            if (lines[i].trim() === '') continue;
-            const row = lines[i].split(',');
-
-            const latitude = parseFloat(row[latitudeIndex]);
-            const longitude = parseFloat(row[longitudeIndex]);
-            const trackId = row[trackIdIndex];
-
-            const coord = [longitude, latitude];
-            this.coordinates.push(coord);
-
-            if (!this.tracks[trackId]) {
-                this.tracks[trackId] = [];
-            }
-            this.tracks[trackId].push(coord);
-        }
-
-        this.trackIds = Object.keys(this.tracks);
-    }
-
-    getRandomCoordinate() {
-        const randomIndex = Math.floor(RNG() * this.coordinates.length);
-        return this.coordinates[randomIndex];
-    }
-
-    getRandomTrack() {
-        const randomIndex = Math.floor(RNG() * this.trackIds.length);
-        const trackId = this.trackIds[randomIndex];
-        return this.tracks[trackId];
-    }
-};
-
-async function runOSRMMethod(osrm, method, coordinates) {
-    const time = await new Promise((resolve, reject) => {
-        const startTime = process.hrtime();
-        osrm[method]({coordinates}, (err, result) => {
-            if (err) {
-                if (['NoSegment', 'NoMatch', 'NoRoute', 'NoTrips'].includes(err.message)) {
-                    resolve(null);
-                } else {
-
-                reject(err);
-                }
-            } else {
-                const endTime = process.hrtime(startTime);
-                resolve(endTime[0] + endTime[1] / 1e9);
-            }
-        });
-    });
-    return time;
-}
-
-async function nearest(osrm, gpsData) {
-    const times = [];
-    for (let i = 0; i < 1000; i++) {
-        const coord = gpsData.getRandomCoordinate();
-        times.push(await runOSRMMethod(osrm, 'nearest', [coord]));
-    }
-    return times;
-}
-
-async function route(osrm, gpsData) {
-    const times = [];
-    for (let i = 0; i < 1000; i++) {
-        const from = gpsData.getRandomCoordinate();
-        const to = gpsData.getRandomCoordinate();
-
-        
-        times.push(await runOSRMMethod(osrm, 'route', [from, to]));
-    }
-    return times;
-}
-
-async function table(osrm, gpsData) {
-    const times = [];
-    for (let i = 0; i < 250; i++) {
-        const numPoints = Math.floor(RNG() * 3) + 15;
-        const coordinates = [];
-        for (let i = 0; i < numPoints; i++) {
-            coordinates.push(gpsData.getRandomCoordinate());
-        }
-
-        
-        times.push(await runOSRMMethod(osrm, 'table', coordinates));
-    }
-    return times;
-}
-
-async function match(osrm, gpsData) {
-    const times = [];
-    for (let i = 0; i < 1000; i++) {
-        const numPoints = Math.floor(RNG() * 50) + 50;
-        const coordinates = gpsData.getRandomTrack().slice(0, numPoints);
-
-        
-        times.push(await runOSRMMethod(osrm, 'match', coordinates));
-    }
-    return times;
-}
-
-async function trip(osrm, gpsData) {
-    const times = [];
-    for (let i = 0; i < 250; i++) {
-        const numPoints = Math.floor(RNG() * 2) + 5;
-        const coordinates = [];
-        for (let i = 0; i < numPoints; i++) {
-            coordinates.push(gpsData.getRandomCoordinate());
-        }
-
-        
-        times.push(await runOSRMMethod(osrm, 'trip', coordinates));
-    }
-    return times;
-}
-
-function bootstrapConfidenceInterval(data, numSamples = 1000, confidenceLevel = 0.95) {
-    let means = [];
-    let dataLength = data.length;
-
-    for (let i = 0; i < numSamples; i++) {
-        let sample = [];
-        for (let j = 0; j < dataLength; j++) {
-            let randomIndex = Math.floor(RNG() * dataLength);
-            sample.push(data[randomIndex]);
-        }
-        let sampleMean = sample.reduce((a, b) => a + b, 0) / sample.length;
-        means.push(sampleMean);
-    }
-
-    means.sort((a, b) => a - b);
-    let lowerBoundIndex = Math.floor((1 - confidenceLevel) / 2 * numSamples);
-    let upperBoundIndex = Math.floor((1 + confidenceLevel) / 2 * numSamples);
-    let mean = means.reduce((a, b) => a + b, 0) / means.length;
-    let lowerBound = means[lowerBoundIndex];
-    let upperBound = means[upperBoundIndex];
-
-    return { mean: mean, lowerBound: lowerBound, upperBound: upperBound };
-}
-
-function calculateConfidenceInterval(data) {
-    let { mean, lowerBound, upperBound } = bootstrapConfidenceInterval(data);
-    let bestValue = Math.max(...data);
-    let errorMargin = (upperBound - lowerBound) / 2;
-
-    return { mean, errorMargin, bestValue };
-}
-
-async function main() {
-    const args = process.argv.slice(2);
-
-    const {OSRM} = require(args[0]);
-    const path = args[1];
-    const algorithm = args[2].toUpperCase();
-    const method = args[3];
-    const gpsTracesFilePath = args[4];
-    const iterations = parseInt(args[5]);
-
-    const gpsData = new GPSData(gpsTracesFilePath);
-    const osrm = new OSRM({path, algorithm});
-
-
-    const functions = {
-        route: route,
-        table: table,
-        nearest: nearest,
-        match: match,
-        trip: trip
-    };
-    const func = functions[method];
-    if (!func) {
-        throw new Error('Unknown method');
-    }
-    const allTimes = [];
-    for (let i = 0; i < iterations; i++) {
-        RNG = seedrandom(42);
-        allTimes.push((await func(osrm, gpsData)).filter(t => t !== null));
-    }
-
-    const opsPerSec = allTimes.map(times => times.length / times.reduce((a, b) => a + b, 0));
-    const { mean, errorMargin, bestValue } = calculateConfidenceInterval(opsPerSec);
-    console.log(`Ops: ${mean.toFixed(1)} ± ${errorMargin.toFixed(1)} ops/s. Best: ${bestValue.toFixed(1)} ops/s`);
-
-}
-
-main();
--- a/scripts/ci/run_benchmarks.sh
+++ b/scripts/ci/run_benchmarks.sh
@ -53,7 +53,6 @@ function run_benchmarks_for_folder {
    mkdir -p $RESULTS_FOLDER

    BENCHMARKS_FOLDER="$BINARIES_FOLDER/src/benchmarks"
-
    echo "Running match-bench MLD"
    $BENCHMARKS_FOLDER/match-bench "$FOLDER/test/data/mld/monaco.osrm" mld > "$RESULTS_FOLDER/match_mld.bench"
    echo "Running match-bench CH"
@ -82,18 +81,6 @@ function run_benchmarks_for_folder {
    echo "Running osrm-contract"
    measure_peak_ram_and_time "$BINARIES_FOLDER/osrm-contract $FOLDER/data.osrm" "$RESULTS_FOLDER/osrm_contract.bench"

-
-    for ALGORITHM in ch mld; do
-        for BENCH in nearest table trip route match; do
-            echo "Running node $BENCH $ALGORITHM"
-            START=$(date +%s.%N)
-            node $SCRIPTS_FOLDER/scripts/ci/bench.js $FOLDER/lib/binding/node_osrm.node $FOLDER/data.osrm $ALGORITHM $BENCH $GPS_TRACES > "$RESULTS_FOLDER/node_${BENCH}_${ALGORITHM}.bench" 5
-            END=$(date +%s.%N)
-            DIFF=$(echo "$END - $START" | bc)
-            echo "Took: ${DIFF}s"
-        done
-    done
-
    for ALGORITHM in ch mld; do
        for BENCH in nearest table trip route match; do
            echo "Running random $BENCH $ALGORITHM"
--- a/scripts/ci/windows-build.bat
+++ b/scripts/ci/windows-build.bat
@ -59,6 +59,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR

 SET test_region=monaco
 SET test_region_ch=ch\monaco
+SET test_region_corech=corech\monaco
 SET test_region_mld=mld\monaco
 SET test_osm=%test_region%.osm.pbf
 COPY %PROJECT_DIR%\test\data\%test_region%.osm.pbf %test_osm%
@ -68,13 +69,18 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 MKDIR ch
 XCOPY %test_region%.osrm.* ch\
 XCOPY %test_region%.osrm ch\
+MKDIR corech
+XCOPY %test_region%.osrm.* corech\
+XCOPY %test_region%.osrm corech\
 MKDIR mld
 XCOPY %test_region%.osrm.* mld\
 XCOPY %test_region%.osrm mld\
 %CONFIGURATION%\osrm-contract.exe %test_region_ch%.osrm
+%CONFIGURATION%\osrm-contract.exe --core 0.8 %test_region_corech%.osrm
 %CONFIGURATION%\osrm-partition.exe %test_region_mld%.osrm
 %CONFIGURATION%\osrm-customize.exe %test_region_mld%.osrm
 XCOPY /Y ch\*.* ..\test\data\ch\
+XCOPY /Y corech\*.* ..\test\data\corech\
 XCOPY /Y mld\*.* ..\test\data\mld\
 unit_tests\%CONFIGURATION%\library-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
--- a/scripts/update_dependencies.sh
+++ b/scripts/update_dependencies.sh
@ -10,7 +10,7 @@ set -o nounset
 # http://git.661346.n2.nabble.com/subtree-merges-lose-prefix-after-rebase-td7332850.html

 OSMIUM_PATH="osmcode/libosmium"
-OSMIUM_TAG=v2.20.0
+OSMIUM_TAG=v2.14.0

 SOL_PATH="ThePhD/sol2"
 SOL_TAG=v3.3.0
@ -22,7 +22,7 @@ MICROTAR_PATH="rxi/microtar"
 MICROTAR_TAG=v0.1.0

 PROTOZERO_PATH="mapbox/protozero"
-PROTOZERO_TAG=v1.7.1
+PROTOZERO_TAG=v1.6.2

 VTZERO_PATH="mapbox/vtzero"
 VTZERO_TAG=v1.1.0
@ -30,9 +30,6 @@ VTZERO_TAG=v1.1.0
 FMT_PATH="fmtlib/fmt"
 FMT_TAG=v10.2.1

-FLATBUFFERS_PATH="google/flatbuffers"
-FLATBUFFERS_TAG=v24.3.25
-
 function update_subtree () {
    name=$(echo "$1" | tr '[:lower:]' '[:upper:]')
    path=$(tmpvar=${name}_PATH && echo ${!tmpvar})
@ -56,6 +53,6 @@ function update_subtree () {
 }

 ## Update dependencies
-for dep in osmium sol rapidjson microtar protozero vtzero fmt flatbuffers; do
+for dep in osmium sol rapidjson microtar protozero vtzero fmt; do
    update_subtree $dep
 done
--- a/src/benchmarks/bench.cpp
+++ b/src/benchmarks/bench.cpp
@ -16,8 +16,8 @@
 #include "osrm/osrm.hpp"
 #include "osrm/status.hpp"

-#include "util/meminfo.hpp"
 #include <boost/assert.hpp>
+
 #include <boost/optional/optional.hpp>
 #include <cstdlib>
 #include <exception>
@ -655,12 +655,6 @@ try
        std::cerr << "Unknown benchmark: " << benchmarkToRun << std::endl;
        return EXIT_FAILURE;
    }
-
-    std::cout << "Peak RAM: " << std::setprecision(3)
-              << static_cast<double>(osrm::util::PeakRAMUsedInBytes()) /
-                     static_cast<double>((1024 * 1024))
-              << "MB" << std::endl;
-
    return EXIT_SUCCESS;
 }
 catch (const std::exception &e)
--- a/src/benchmarks/json_render.cpp
+++ b/src/benchmarks/json_render.cpp
@ -9,17 +9,12 @@
 #include <rapidjson/document.h>
 #include <sstream>
 #include <stdexcept>
-#include <unordered_set>

 using namespace osrm;

 namespace
 {

-// we use std::string_view as a key in the object, so since here we have dynamic keys we have to
-// "hold" them somewhere okay for tests...
-static std::unordered_set<std::string> gKeysHolder;
-
 void convert(const rapidjson::Value &value, json::Value &result)
 {
    if (value.IsString())
@ -37,8 +32,7 @@ void convert(const rapidjson::Value &value, json::Value &result)
        {
            json::Value member;
            convert(itr->value, member);
-            auto keyItr = gKeysHolder.emplace(itr->name.GetString()).first;
-            object.values.emplace(*keyItr, std::move(member));
+            object.values.emplace(itr->name.GetString(), std::move(member));
        }
        result = std::move(object);
    }
@ -128,7 +122,6 @@ int main(int argc, char **argv)

    if (std::string{out_vec.begin(), out_vec.end()} != out_str || out_str != out_ss_str)
    {
-        std::cerr << "Vector/string results are not equal\n";
        throw std::logic_error("Vector/stringstream/string results are not equal");
    }
    return EXIT_SUCCESS;
--- a/src/engine/routing_algorithms/many_to_many_mld.cpp
+++ b/src/engine/routing_algorithms/many_to_many_mld.cpp
@ -222,6 +222,7 @@ oneToManySearch(SearchEngineData<Algorithm> &engine_working_data,
    std::vector<EdgeDuration> durations_table(target_indices.size(), MAXIMAL_EDGE_DURATION);
    std::vector<EdgeDistance> distances_table(calculate_distance ? target_indices.size() : 0,
                                              MAXIMAL_EDGE_DISTANCE);
+    std::vector<NodeID> middle_nodes_table(target_indices.size(), SPECIAL_NODEID);

    // Collect destination (source) nodes into a map
    std::unordered_multimap<NodeID, std::tuple<std::size_t, EdgeWeight, EdgeDuration, EdgeDistance>>
@ -306,6 +307,7 @@ oneToManySearch(SearchEngineData<Algorithm> &engine_working_data,
                    weights_table[index] = path_weight;
                    durations_table[index] = path_duration;
                    current_distance = path_distance;
+                    middle_nodes_table[index] = node;
                }

                // Remove node from destinations list
--- a/src/engine/search_engine_data.cpp
+++ b/src/engine/search_engine_data.cpp
@ -5,18 +5,16 @@ namespace osrm::engine

 // CH heaps
 using CH = routing_algorithms::ch::Algorithm;
-thread_local SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::forward_heap_1;
-thread_local SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::reverse_heap_1;
-thread_local SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::forward_heap_2;
-thread_local SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::reverse_heap_2;
-thread_local SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::forward_heap_3;
-thread_local SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::reverse_heap_3;
-thread_local SearchEngineData<CH>::SearchEngineHeapPtr
-    SearchEngineData<CH>::map_matching_forward_heap_1;
-thread_local SearchEngineData<CH>::SearchEngineHeapPtr
-    SearchEngineData<CH>::map_matching_reverse_heap_1;
+SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::forward_heap_1;
+SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::reverse_heap_1;
+SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::forward_heap_2;
+SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::reverse_heap_2;
+SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::forward_heap_3;
+SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::reverse_heap_3;
+SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::map_matching_forward_heap_1;
+SearchEngineData<CH>::SearchEngineHeapPtr SearchEngineData<CH>::map_matching_reverse_heap_1;

-thread_local SearchEngineData<CH>::ManyToManyHeapPtr SearchEngineData<CH>::many_to_many_heap;
+SearchEngineData<CH>::ManyToManyHeapPtr SearchEngineData<CH>::many_to_many_heap;

 void SearchEngineData<CH>::InitializeOrClearMapMatchingThreadLocalStorage(unsigned number_of_nodes)
 {
@ -116,13 +114,11 @@ void SearchEngineData<CH>::InitializeOrClearManyToManyThreadLocalStorage(unsigne

 // MLD
 using MLD = routing_algorithms::mld::Algorithm;
-thread_local SearchEngineData<MLD>::SearchEngineHeapPtr SearchEngineData<MLD>::forward_heap_1;
-thread_local SearchEngineData<MLD>::SearchEngineHeapPtr SearchEngineData<MLD>::reverse_heap_1;
-thread_local SearchEngineData<MLD>::MapMatchingHeapPtr
-    SearchEngineData<MLD>::map_matching_forward_heap_1;
-thread_local SearchEngineData<MLD>::MapMatchingHeapPtr
-    SearchEngineData<MLD>::map_matching_reverse_heap_1;
-thread_local SearchEngineData<MLD>::ManyToManyHeapPtr SearchEngineData<MLD>::many_to_many_heap;
+SearchEngineData<MLD>::SearchEngineHeapPtr SearchEngineData<MLD>::forward_heap_1;
+SearchEngineData<MLD>::SearchEngineHeapPtr SearchEngineData<MLD>::reverse_heap_1;
+SearchEngineData<MLD>::MapMatchingHeapPtr SearchEngineData<MLD>::map_matching_forward_heap_1;
+SearchEngineData<MLD>::MapMatchingHeapPtr SearchEngineData<MLD>::map_matching_reverse_heap_1;
+SearchEngineData<MLD>::ManyToManyHeapPtr SearchEngineData<MLD>::many_to_many_heap;

 void SearchEngineData<MLD>::InitializeOrClearMapMatchingThreadLocalStorage(
    unsigned number_of_nodes, unsigned number_of_boundary_nodes)
--- a/src/tools/contract.cpp
+++ b/src/tools/contract.cpp
@ -46,7 +46,10 @@ return_code parseArguments(int argc,
        boost::program_options::value<unsigned int>(&contractor_config.requested_num_threads)
            ->default_value(std::thread::hardware_concurrency()),
        "Number of threads to use")(
-        "segment-speed-file",
+        "core,k",
+        boost::program_options::value<double>(&contractor_config.core_factor)->default_value(1.0),
+        "DEPRECATED: Will always be 1.0. Percentage of the graph (in vertices) to contract "
+        "[0..1].")("segment-speed-file",
                   boost::program_options::value<std::vector<std::string>>(
                       &contractor_config.updater_config.segment_speed_lookup_paths)
                       ->composing(),
@ -56,6 +59,12 @@ return_code parseArguments(int argc,
            &contractor_config.updater_config.turn_penalty_lookup_paths)
            ->composing(),
        "Lookup files containing from_, to_, via_nodes, and turn penalties to adjust turn weights")(
+        "level-cache,o",
+        boost::program_options::bool_switch(&contractor_config.use_cached_priority)
+            ->default_value(false),
+        "DEPRECATED: Will always be false. Use .level file to retain the contraction level for "
+        "each "
+        "node from the last run.")(
        "edge-weight-updates-over-factor",
        boost::program_options::value<double>(
            &contractor_config.updater_config.log_edge_updates_factor)
--- a/third_party/flatbuffers/.appveyor/check-generate-code.bat
+++ b/third_party/flatbuffers/.appveyor/check-generate-code.bat
@ -0,0 +1,41 @@
+:: Copyright 2018 Google Inc. All rights reserved.
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::     http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+set buildtype=Release
+if "%1"=="-b" set buildtype=%2
+
+cd tests
+call generate_code.bat -b %buildtype% || goto FAIL
+
+:: TODO: Release and Debug builds produce differences here for some reason.
+git checkout HEAD -- monster_test.bfbs
+git checkout HEAD -- arrays_test.bfbs
+
+git -c core.autocrlf=true diff --exit-code --quiet || goto :DIFFFOUND
+goto SUCCESS
+
+:DIFFFOUND
+@echo "" >&2
+@echo "ERROR: ********************************************************" >&2
+@echo "ERROR: The following differences were found after running the" >&2
+@echo "ERROR: tests/generate_code.sh script.  Maybe you forgot to run" >&2
+@echo "ERROR: it after making changes in a generator or schema?" >&2
+@echo "ERROR: ********************************************************" >&2
+@echo "" >&2
+@git -c core.autocrlf=true --no-pager diff --binary
+
+:FAIL
+set EXITCODE=1
+:SUCCESS
+cd ..
+EXIT /B %EXITCODE%
--- a/third_party/flatbuffers/.bazelci/presubmit.yml
+++ b/third_party/flatbuffers/.bazelci/presubmit.yml
@ -1,38 +1,18 @@
 ---
 buildifier: latest
-bazel: 6.4.0
 platforms:
+  ubuntu1604:
+    build_targets:
+    - "..."
+    test_targets:
+    - "..."
  ubuntu1804:
-    environment:
-      CC: clang
-      SWIFT_VERSION: "5.5.3"
-      SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
-      PATH: "$PATH:$SWIFT_HOME/usr/bin"
-    shell_commands:
-      - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
-      - "mkdir $SWIFT_HOME"
-      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu1804/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu18.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
    build_targets:
-    - "//..."
+    - "..."
    test_targets:
-    - "//..."
-  ubuntu2004:
-    environment:
-      CC: clang
-      SWIFT_VERSION: "5.5.3"
-      SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
-      PATH: "$PATH:$SWIFT_HOME/usr/bin"
-    shell_commands:
-      - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
-      - "mkdir $SWIFT_HOME"
-      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
-    build_targets:
-    - "//..."
-    test_targets:
-    - "//..."
+    - "..."
  macos:
-    xcode_version: "14.2"
    build_targets:
-    - "//..."
+    - "..."
    test_targets:
-    - "//..."
+    - "..."
--- a/third_party/flatbuffers/.bazelignore
+++ b/third_party/flatbuffers/.bazelignore
@ -1 +0,0 @@
-node_modules
--- a/third_party/flatbuffers/.bazelrc
+++ b/third_party/flatbuffers/.bazelrc
@ -1,4 +0,0 @@
-# We cannot use "common" here because the "version" command doesn't support
-# --deleted_packages. We need to specify it for both build and query instead.
-build --deleted_packages=tests/ts/bazel_repository_test_dir
-query --deleted_packages=tests/ts/bazel_repository_test_dir
--- a/third_party/flatbuffers/.clang-tidy
+++ b/third_party/flatbuffers/.clang-tidy
@ -1,347 +0,0 @@
---
-FormatStyle: "file"
-WarningsAsErrors: "*"
-HeaderFilterRegex: ".*"
-Checks: "google-build-explicit-make-pair,
-         google-build-namespaces,
-         google-build-using-namespace,
-         google-default-arguments,
-         google-explicit-constructor,
-         google-global-names-in-headers,
-         google-objc-avoid-nsobject-new,
-         google-objc-avoid-throwing-exception,
-         google-objc-function-naming,
-         google-objc-global-variable-declaration,
-         google-readability-avoid-underscore-in-googletest-name,
-         google-readability-braces-around-statements,
-         google-readability-casting,
-         google-readability-function-size,
-         google-readability-namespace-comments,
-         google-runtime-int,
-         google-runtime-operator,
-         google-upgrade-googletest-case,
-         clang-analyzer-apiModeling.StdCLibraryFunctions,
-         clang-analyzer-apiModeling.TrustNonnull,
-         clang-analyzer-apiModeling.google.GTest,
-         clang-analyzer-apiModeling.llvm.CastValue,
-         clang-analyzer-apiModeling.llvm.ReturnValue,
-         clang-analyzer-core.CallAndMessage,
-         clang-analyzer-core.CallAndMessageModeling,
-         clang-analyzer-core.DivideZero,
-         clang-analyzer-core.DynamicTypePropagation,
-         clang-analyzer-core.NonNullParamChecker,
-         clang-analyzer-core.NonnilStringConstants,
-         clang-analyzer-core.NullDereference,
-         clang-analyzer-core.StackAddrEscapeBase,
-         clang-analyzer-core.StackAddressEscape,
-         clang-analyzer-core.UndefinedBinaryOperatorResult,
-         clang-analyzer-core.VLASize,
-         clang-analyzer-core.builtin.BuiltinFunctions,
-         clang-analyzer-core.builtin.NoReturnFunctions,
-         clang-analyzer-core.uninitialized.ArraySubscript,
-         clang-analyzer-core.uninitialized.Assign,
-         clang-analyzer-core.uninitialized.Branch,
-         clang-analyzer-core.uninitialized.CapturedBlockVariable,
-         clang-analyzer-core.uninitialized.UndefReturn,
-         clang-analyzer-cplusplus.InnerPointer,
-         clang-analyzer-cplusplus.Move,
-         clang-analyzer-cplusplus.NewDelete,
-         clang-analyzer-cplusplus.NewDeleteLeaks,
-         clang-analyzer-cplusplus.PlacementNew,
-         clang-analyzer-cplusplus.PureVirtualCall,
-         clang-analyzer-cplusplus.SelfAssignment,
-         clang-analyzer-cplusplus.SmartPtrModeling,
-         clang-analyzer-cplusplus.StringChecker,
-         clang-analyzer-cplusplus.VirtualCallModeling,
-         clang-analyzer-deadcode.DeadStores,
-         clang-analyzer-fuchsia.HandleChecker,
-         clang-analyzer-nullability.NullPassedToNonnull,
-         clang-analyzer-nullability.NullReturnedFromNonnull,
-         clang-analyzer-nullability.NullabilityBase,
-         clang-analyzer-nullability.NullableDereferenced,
-         clang-analyzer-nullability.NullablePassedToNonnull,
-         clang-analyzer-nullability.NullableReturnedFromNonnull,
-         clang-analyzer-optin.cplusplus.UninitializedObject,
-         clang-analyzer-optin.cplusplus.VirtualCall,
-         clang-analyzer-optin.mpi.MPI-Checker,
-         clang-analyzer-optin.osx.OSObjectCStyleCast,
-         clang-analyzer-optin.osx.cocoa.localizability.EmptyLocalizationContextChecker,
-         clang-analyzer-optin.osx.cocoa.localizability.NonLocalizedStringChecker,
-         clang-analyzer-optin.performance.GCDAntipattern,
-         clang-analyzer-optin.performance.Padding,
-         clang-analyzer-optin.portability.UnixAPI,
-         clang-analyzer-osx.API,
-         clang-analyzer-osx.MIG,
-         clang-analyzer-osx.NSOrCFErrorDerefChecker,
-         clang-analyzer-osx.NumberObjectConversion,
-         clang-analyzer-osx.OSObjectRetainCount,
-         clang-analyzer-osx.ObjCProperty,
-         clang-analyzer-osx.SecKeychainAPI,
-         clang-analyzer-osx.cocoa.AtSync,
-         clang-analyzer-osx.cocoa.AutoreleaseWrite,
-         clang-analyzer-osx.cocoa.ClassRelease,
-         clang-analyzer-osx.cocoa.Dealloc,
-         clang-analyzer-osx.cocoa.IncompatibleMethodTypes,
-         clang-analyzer-osx.cocoa.Loops,
-         clang-analyzer-osx.cocoa.MissingSuperCall,
-         clang-analyzer-osx.cocoa.NSAutoreleasePool,
-         clang-analyzer-osx.cocoa.NSError,
-         clang-analyzer-osx.cocoa.NilArg,
-         clang-analyzer-osx.cocoa.NonNilReturnValue,
-         clang-analyzer-osx.cocoa.ObjCGenerics,
-         clang-analyzer-osx.cocoa.RetainCount,
-         clang-analyzer-osx.cocoa.RetainCountBase,
-         clang-analyzer-osx.cocoa.RunLoopAutoreleaseLeak,
-         clang-analyzer-osx.cocoa.SelfInit,
-         clang-analyzer-osx.cocoa.SuperDealloc,
-         clang-analyzer-osx.cocoa.UnusedIvars,
-         clang-analyzer-osx.cocoa.VariadicMethodTypes,
-         clang-analyzer-osx.coreFoundation.CFError,
-         clang-analyzer-osx.coreFoundation.CFNumber,
-         clang-analyzer-osx.coreFoundation.CFRetainRelease,
-         clang-analyzer-osx.coreFoundation.containers.OutOfBounds,
-         clang-analyzer-osx.coreFoundation.containers.PointerSizedValues,
-         clang-analyzer-security.FloatLoopCounter,
-         clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
-         clang-analyzer-security.insecureAPI.SecuritySyntaxChecker,
-         clang-analyzer-security.insecureAPI.UncheckedReturn,
-         clang-analyzer-security.insecureAPI.bcmp,
-         clang-analyzer-security.insecureAPI.bcopy,
-         clang-analyzer-security.insecureAPI.bzero,
-         clang-analyzer-security.insecureAPI.decodeValueOfObjCType,
-         clang-analyzer-security.insecureAPI.getpw,
-         clang-analyzer-security.insecureAPI.gets,
-         clang-analyzer-security.insecureAPI.mkstemp,
-         clang-analyzer-security.insecureAPI.mktemp,
-         clang-analyzer-security.insecureAPI.rand,
-         clang-analyzer-security.insecureAPI.strcpy,
-         clang-analyzer-security.insecureAPI.vfork,
-         clang-analyzer-unix.API,
-         clang-analyzer-unix.DynamicMemoryModeling,
-         clang-analyzer-unix.Malloc,
-         clang-analyzer-unix.MallocSizeof,
-         clang-analyzer-unix.MismatchedDeallocator,
-         clang-analyzer-unix.Vfork,
-         clang-analyzer-unix.cstring.BadSizeArg,
-         clang-analyzer-unix.cstring.CStringModeling,
-         clang-analyzer-unix.cstring.NullArg,
-         clang-analyzer-valist.CopyToSelf,
-         clang-analyzer-valist.Uninitialized,
-         clang-analyzer-valist.Unterminated,
-         clang-analyzer-valist.ValistBase,
-         clang-analyzer-webkit.NoUncountedMemberChecker,
-         clang-analyzer-webkit.RefCntblBaseVirtualDtor,
-         clang-analyzer-webkit.UncountedLambdaCapturesChecker,
-
-################################################ Optional checks ################################################
-
-         #google-readability-todo,
-         #bugprone-argument-comment,
-         #bugprone-assert-side-effect,
-         #bugprone-bad-signal-to-kill-thread,
-         #bugprone-bool-pointer-implicit-conversion,
-         #bugprone-branch-clone,
-         #bugprone-copy-constructor-init,
-         #bugprone-dangling-handle,
-         #bugprone-dynamic-static-initializers,
-         #bugprone-easily-swappable-parameters,
-         #bugprone-exception-escape,
-         #bugprone-fold-init-type,
-         #bugprone-forward-declaration-namespace,
-         #bugprone-forwarding-reference-overload,
-         #bugprone-implicit-widening-of-multiplication-result,
-         #bugprone-inaccurate-erase,
-         #bugprone-incorrect-roundings,
-         #bugprone-infinite-loop,
-         #bugprone-integer-division,
-         #bugprone-lambda-function-name,
-         #bugprone-macro-parentheses,
-         #bugprone-macro-repeated-side-effects,
-         #bugprone-misplaced-operator-in-strlen-in-alloc,
-         #bugprone-misplaced-pointer-arithmetic-in-alloc,
-         #bugprone-misplaced-widening-cast,
-         #bugprone-move-forwarding-reference,
-         #bugprone-multiple-statement-macro,
-         #bugprone-narrowing-conversions,
-         #bugprone-no-escape,
-         #bugprone-not-null-terminated-result,
-         #bugprone-parent-virtual-call,
-         #bugprone-posix-return,
-         #bugprone-redundant-branch-condition,
-         #bugprone-reserved-identifier,
-         #bugprone-signal-handler,
-         #bugprone-signed-char-misuse,
-         #bugprone-sizeof-container,
-         #bugprone-sizeof-expression,
-         #bugprone-spuriously-wake-up-functions,
-         #bugprone-string-constructor,
-         #bugprone-string-integer-assignment,
-         #bugprone-string-literal-with-embedded-nul,
-         #bugprone-stringview-nullptr,
-         #bugprone-suspicious-enum-usage,
-         #bugprone-suspicious-include,
-         #bugprone-suspicious-memory-comparison,
-         #bugprone-suspicious-memset-usage,
-         #bugprone-suspicious-missing-comma,
-         #bugprone-suspicious-semicolon,
-         #bugprone-suspicious-string-compare,
-         #bugprone-swapped-arguments,
-         #bugprone-terminating-continue,
-         #bugprone-throw-keyword-missing,
-         #bugprone-too-small-loop-variable,
-         #bugprone-undefined-memory-manipulation,
-         #bugprone-undelegated-constructor,
-         #bugprone-unhandled-exception-at-new,
-         #bugprone-unhandled-self-assignment,
-         #bugprone-unused-raii,
-         #bugprone-unused-return-value,
-         #bugprone-use-after-move,
-         #bugprone-virtual-near-miss,
-         #cppcoreguidelines-avoid-c-arrays,
-         #cppcoreguidelines-avoid-goto,
-         #cppcoreguidelines-avoid-magic-numbers,
-         #cppcoreguidelines-avoid-non-const-global-variables,
-         #cppcoreguidelines-c-copy-assignment-signature,
-         #cppcoreguidelines-explicit-virtual-functions,
-         #cppcoreguidelines-init-variables,
-         #cppcoreguidelines-interfaces-global-init,
-         #cppcoreguidelines-macro-usage,
-         #cppcoreguidelines-narrowing-conversions,
-         #cppcoreguidelines-no-malloc,
-         #cppcoreguidelines-non-private-member-variables-in-classes,
-         #cppcoreguidelines-owning-memory,
-         #cppcoreguidelines-prefer-member-initializer,
-         #cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-         #cppcoreguidelines-pro-bounds-constant-array-index,
-         #cppcoreguidelines-pro-bounds-pointer-arithmetic,
-         #cppcoreguidelines-pro-type-const-cast,
-         #cppcoreguidelines-pro-type-cstyle-cast,
-         #cppcoreguidelines-pro-type-member-init,
-         #cppcoreguidelines-pro-type-reinterpret-cast,
-         #cppcoreguidelines-pro-type-static-cast-downcast,
-         #cppcoreguidelines-pro-type-union-access,
-         #cppcoreguidelines-pro-type-vararg,
-         #cppcoreguidelines-slicing,
-         #cppcoreguidelines-special-member-functions,
-         #cppcoreguidelines-virtual-class-destructor,
-         #hicpp-avoid-c-arrays,
-         #hicpp-avoid-goto,
-         #hicpp-braces-around-statements,
-         #hicpp-deprecated-headers,
-         #hicpp-exception-baseclass,
-         #hicpp-explicit-conversions,
-         #hicpp-function-size,
-         #hicpp-invalid-access-moved,
-         #hicpp-member-init,
-         #hicpp-move-const-arg,
-         #hicpp-multiway-paths-covered,
-         #hicpp-named-parameter,
-         #hicpp-new-delete-operators,
-         #hicpp-no-array-decay,
-         #hicpp-no-assembler,
-         #hicpp-no-malloc,
-         #hicpp-noexcept-move,
-         #hicpp-signed-bitwise,
-         #hicpp-special-member-functions,
-         #hicpp-static-assert,
-         #hicpp-undelegated-constructor,
-         #hicpp-uppercase-literal-suffix,
-         #hicpp-use-auto,
-         #hicpp-use-emplace,
-         #hicpp-use-equals-default,
-         #hicpp-use-equals-delete,
-         #hicpp-use-noexcept,
-         #hicpp-use-nullptr,
-         #hicpp-use-override,
-         #hicpp-vararg,
-         #modernize-avoid-bind,
-         #modernize-avoid-c-arrays,
-         #modernize-concat-nested-namespaces,
-         #modernize-deprecated-headers,
-         #modernize-deprecated-ios-base-aliases,
-         #modernize-loop-convert,
-         #modernize-make-shared,
-         #modernize-make-unique,
-         #modernize-pass-by-value,
-         #modernize-raw-string-literal,
-         #modernize-redundant-void-arg,
-         #modernize-replace-auto-ptr,
-         #modernize-replace-disallow-copy-and-assign-macro,
-         #modernize-replace-random-shuffle,
-         #modernize-return-braced-init-list,
-         #modernize-shrink-to-fit,
-         #modernize-unary-static-assert,
-         #modernize-use-auto,
-         #modernize-use-bool-literals,
-         #modernize-use-default-member-init,
-         #modernize-use-emplace,
-         #modernize-use-equals-default,
-         #modernize-use-equals-delete,
-         #modernize-use-nodiscard,
-         #modernize-use-noexcept,
-         #modernize-use-nullptr,
-         #modernize-use-override,
-         #modernize-use-trailing-return-type,
-         #modernize-use-transparent-functors,
-         #modernize-use-uncaught-exceptions,
-         #modernize-use-using,
-         #performance-faster-string-find,
-         #performance-for-range-copy,
-         #performance-implicit-conversion-in-loop,
-         #performance-inefficient-algorithm,
-         #performance-inefficient-string-concatenation,
-         #performance-inefficient-vector-operation,
-         #performance-move-const-arg,
-         #performance-move-constructor-init,
-         #performance-no-automatic-move,
-         #performance-no-int-to-ptr,
-         #performance-noexcept-move-constructor,
-         #performance-trivially-destructible,
-         #performance-type-promotion-in-math-fn,
-         #performance-unnecessary-copy-initialization,
-         #performance-unnecessary-value-param,
-         #portability-restrict-system-includes,
-         #portability-simd-intrinsics,
-         #readability-avoid-const-params-in-decls,
-         #readability-braces-around-statements,
-         #readability-const-return-type,
-         #readability-container-contains,
-         #readability-container-data-pointer,
-         #readability-container-size-empty,
-         #readability-convert-member-functions-to-static,
-         #readability-delete-null-pointer,
-         #readability-duplicate-include,
-         #readability-else-after-return,
-         #readability-function-cognitive-complexity,
-         #readability-function-size,
-         #readability-identifier-length,
-         #readability-identifier-naming,
-         #readability-implicit-bool-conversion,
-         #readability-inconsistent-declaration-parameter-name,
-         #readability-isolate-declaration,
-         #readability-magic-numbers,
-         #readability-make-member-function-const,
-         #readability-misleading-indentation,
-         #readability-misplaced-array-index,
-         #readability-named-parameter,
-         #readability-non-const-parameter,
-         #readability-qualified-auto,
-         #readability-redundant-access-specifiers,
-         #readability-redundant-control-flow,
-         #readability-redundant-declaration,
-         #readability-redundant-function-ptr-dereference,
-         #readability-redundant-member-init,
-         #readability-redundant-preprocessor,
-         #readability-redundant-smartptr-get,
-         #readability-redundant-string-cstr,
-         #readability-redundant-string-init,
-         #readability-simplify-boolean-expr,
-         #readability-simplify-subscript-expr,
-         #readability-static-accessed-through-instance,
-         #readability-static-definition-in-anonymous-namespace,
-         #readability-string-compare,
-         #readability-suspicious-call-argument,
-         #readability-uniqueptr-delete-release,
-         #readability-uppercase-literal-suffix,
-         #readability-use-anyofallof
-         "
--- a/third_party/flatbuffers/.editorconfig
+++ b/third_party/flatbuffers/.editorconfig
@ -5,4 +5,3 @@ root = true
 indent_style = space
 indent_size = 2
 insert_final_newline = true
-trim_trailing_whitespace = true
--- a/third_party/flatbuffers/.eslintrc.js
+++ b/third_party/flatbuffers/.eslintrc.js
@ -1,13 +0,0 @@
-/* eslint-env node */
-
-module.exports = {
-    root: true,
-    parser: '@typescript-eslint/parser',
-    plugins: [
-        '@typescript-eslint',
-    ],
-    extends: [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended',
-    ]
-};
--- a/third_party/flatbuffers/.github/ISSUE_TEMPLATE.md
+++ b/third_party/flatbuffers/.github/ISSUE_TEMPLATE.md
@ -0,0 +1,12 @@
+Thank you for submitting an issue!
+
+Please make sure you include the names of the affected language(s), compiler version(s), operating system version(s), and FlatBuffers version(s) in your issue title.
+
+This helps us get the correct maintainers to look at your issue. Here are examples of good titles:
+
+- Crash when accessing FlatBuffer [C++, gcc 4.8, OS X, master]
+- Flatc converts a protobuf 'bytes' field to 'string' in fbs schema file [all languages, FlatBuffers 1.4]
+
+Include other details as appropriate.
+
+Thanks!
--- a/third_party/flatbuffers/.github/PULL_REQUEST_TEMPLATE.md
+++ b/third_party/flatbuffers/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,16 @@
+Thank you for submitting a PR!
+
+Please make sure you include the names of the affected language(s) in your PR title.
+This helps us get the correct maintainers to look at your issue.
+
+If you make changes to any of the code generators, be sure to run
+`cd tests && sh generate_code.sh` (or equivalent .bat) and include the generated
+code changes in the PR. This allows us to better see the effect of the PR.
+
+If your PR includes C++ code, please adhere to the Google C++ Style Guide,
+and don't forget we try to support older compilers (e.g. VS2010, GCC 4.6.3),
+so only some C++11 support is available.
+
+Include other details as appropriate.
+
+Thanks!
--- a/third_party/flatbuffers/.github/stale.yml
+++ b/third_party/flatbuffers/.github/stale.yml
@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 365
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  activity for 1 year. It will be automatically closed if no further activity occurs.
+  To keep it open, simply post a new comment. Maintainers will re-open on
+  new activity. Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
--- a/third_party/flatbuffers/.gitignore
+++ b/third_party/flatbuffers/.gitignore
@ -1,13 +1,6 @@
 *_wire.txt
 *_wire.bin
 .DS_Store
-**/.build
-build
-**/Packages
-/*.xcodeproj
-**/xcuserdata/
-**/xcshareddata/
-**/.swiftpm/
 *.o
 *.o.d
 *.class
@ -46,16 +39,12 @@ project.properties
 proguard-project.txt
 linklint_results
 Makefile
-flatbenchmark
-flatbenchmark.exe
 flatc
 flatc.exe
 flathash
 flathash.exe
 flattests
 flattests.exe
-flattests_cpp17
-flattests_cpp17.exe
 flatsamplebinary
 flatsamplebinary.exe
 flatsampletext
@ -74,11 +63,13 @@ tests/monsterdata_go_wire.mon
 tests/monsterdata_javascript_wire.mon
 tests/monsterdata_lobster_wire.mon
 tests/monsterdata_rust_wire.mon
+tests/unicode_test.mon
+tests/ts/
 tests/php/
 CMakeLists.txt.user
 CMakeScripts/**
 CTestTestfile.cmake
-flatbuffers-config-version.cmake
+FlatbuffersConfigVersion.cmake
 FlatBuffers.cbp
 build/Xcode/FlatBuffers.xcodeproj/project.xcworkspace/**
 build/Xcode/FlatBuffers.xcodeproj/xcuserdata/**
@ -88,7 +79,6 @@ java/*.iml
 .idea
 *.iml
 target
-java/target
 **/*.pyc
 build/VS2010/FlatBuffers.sdf
 build/VS2010/FlatBuffers.opensdf
@ -106,10 +96,7 @@ android/build/
 samples/android/.externalNativeBuild/
 samples/android/.gradle/
 samples/android/build/
-js/**/*.js
-js/**/*.d.ts
-mjs/**/*.js
-mjs/**/*.d.ts
+js/flatbuffers.mjs
 /bazel-bin
 /bazel-flatbuffers
 /bazel-genfiles
@ -129,27 +116,3 @@ dart/doc/api/
 Cargo.lock
 .corpus**
 .seed**
-.crash**
-grpc/google/
-**/Package.resolved
-.clangd/**
-package-lock.json
-/*.ilk
-/*.pdb
-.clwb
-yarn-error.log
-.cache/
-/flatbuffers.lib
-.cmake/
-**/dist
-**/vendor
-**/go.sum
-flatbuffers.pc
-**/FlatBuffers.Test.Swift.xcodeproj
-**/html/**
-**/latex/**
-# https://cmake.org/cmake/help/latest/module/FetchContent.html#variable:FETCHCONTENT_BASE_DIR
-cmake-build-debug/
-_deps/
-**/.gradle/**
-kotlin/**/generated
--- a/third_party/flatbuffers/.npmrc
+++ b/third_party/flatbuffers/.npmrc
@ -1 +0,0 @@
-hoist=false
--- a/third_party/flatbuffers/.travis.yml
+++ b/third_party/flatbuffers/.travis.yml
@ -0,0 +1,221 @@
+env:
+  global:
+    # Set at the root level as this is ignored when set under matrix.env.
+    - GCC_VERSION="4.9"
+    # Fail on first error if UBSAN or ASAN enabled for a target
+    - UBSAN_OPTIONS=halt_on_error=1
+    - ASAN_OPTIONS=halt_on_error=1
+    # Travis machines have 2 cores
+    - JOBS=2
+    - MAKEFLAGS="-j 2"
+
+conan-linux: &conan-linux
+  os: linux
+  dist: xenial
+  language: python
+  python: "3.7"
+  services:
+    - docker
+  install:
+    - ./conan/travis/install.sh
+  script:
+    - ./conan/travis/build.sh
+  if: tag IS present
+
+conan-linux-master: &conan-linux-master
+  os: linux
+  dist: xenial
+  language: python
+  python: "3.7"
+  services:
+    - docker
+  install:
+    - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./conan/travis/install.sh; fi'
+  script:
+    - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./conan/travis/build.sh; fi'
+  branches:
+    only:
+    - master
+
+conan-osx: &conan-osx
+  os: osx
+  language: generic
+  install:
+    - ./conan/travis/install.sh
+  script:
+    - ./conan/travis/build.sh
+  if: tag IS present
+
+matrix:
+  include:
+    #- language: python
+    #  python: "2.7"
+    #  install:
+    #    - "pip install wheel twine"
+    #  script:
+    #    - "cd python/"
+    #    - 'VERSION="$TRAVIS_TAG" python setup.py sdist bdist_wheel'
+    #    - "cd ../"
+    #  deploy:
+    #    # Checkpointed release builds.
+    #    - provider: script
+    #      script: .travis/deploy-python.sh
+    #      skip_cleanup: true
+    #      on:
+    #        tags: true
+    #        # all_branches must be set with tags: true. See below post:
+    #        # https://stackoverflow.com/a/27775257/1076585
+    #        all_branches: true
+    #    # Produce a new build for the cutting edge when master changes.
+    #    - provider: script
+    #      script: .travis/deploy-python.sh
+    #      skip_cleanup: true
+    #      on:
+    #        branch: master
+    - language: cpp
+      os:
+        - linux
+
+      addons:
+        apt:
+          packages:
+            - docker-ce
+      script:
+        - bash .travis/build-and-run-docker-test-containers.sh
+
+    - language: cpp
+      os:
+        - linux
+
+      compiler:
+        - gcc
+
+      env:
+        matrix:
+          - BUILD_TYPE=Debug
+          - BUILD_TYPE=Release
+
+      before_install:
+      - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+      - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
+      - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq g++-$GCC_VERSION; fi
+      - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq gcc-$GCC_VERSION; fi
+      - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which g++-$GCC_VERSION) /usr/bin/g++; fi
+      - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc; fi
+
+      script:
+      - bash .travis/check-sources.sh
+      - bash grpc/build_grpc.sh
+      - cmake .
+        -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        -DFLATBUFFERS_BUILD_GRPCTEST=ON
+        -DGRPC_INSTALL_PATH=$TRAVIS_BUILD_DIR/google/grpc/install
+        -DPROTOBUF_DOWNLOAD_PATH=$TRAVIS_BUILD_DIR/google/grpc/third_party/protobuf
+        -DFLATBUFFERS_CODE_SANITIZE=ON
+      - cmake --build . -- -j${JOBS}
+      - LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/google/grpc/install/lib ctest --extra-verbose --output-on-failure
+      - bash .travis/check-generate-code.sh
+
+    - language: cpp
+      os: osx
+      osx_image: xcode9.3
+      env:
+        matrix:
+          - BUILD_TYPE=Debug
+          - BUILD_TYPE=Release
+
+      script:
+      - bash grpc/build_grpc.sh
+      - cmake .
+        -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        -DFLATBUFFERS_BUILD_GRPCTEST=ON
+        -DGRPC_INSTALL_PATH=$TRAVIS_BUILD_DIR/google/grpc/install
+        -DPROTOBUF_DOWNLOAD_PATH=$TRAVIS_BUILD_DIR/google/grpc/third_party/protobuf
+        -DFLATBUFFERS_CODE_SANITIZE=ON
+      - cmake --build . -- -j${JOBS}
+      - DYLD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/google/grpc/install/lib ctest --extra-verbose --output-on-failure
+      - bash .travis/check-generate-code.sh
+
+    - <<: *conan-linux-master
+      env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
+    - <<: *conan-linux
+      env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49
+    - <<: *conan-linux
+      env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5
+    - <<: *conan-linux
+      env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6
+    - <<: *conan-linux
+      env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
+    - <<: *conan-linux
+      env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
+    - <<: *conan-linux
+      env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9
+    - <<: *conan-linux
+      env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39
+    - <<: *conan-linux
+      env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40
+    - <<: *conan-linux
+      env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50
+    - <<: *conan-linux
+      env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
+    - <<: *conan-linux
+      env: CONAN_CLANG_VERSIONS=7.0 CONAN_DOCKER_IMAGE=conanio/clang7
+    - <<: *conan-linux
+      env: CONAN_CLANG_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/clang8
+    - <<: *conan-osx
+      osx_image: xcode7.3
+      env: CONAN_APPLE_CLANG_VERSIONS=7.3
+    - <<: *conan-osx
+      osx_image: xcode8.3
+      env: CONAN_APPLE_CLANG_VERSIONS=8.1
+    - <<: *conan-osx
+      osx_image: xcode9
+      env: CONAN_APPLE_CLANG_VERSIONS=9.0
+    - <<: *conan-osx
+      osx_image: xcode9.4
+      env: CONAN_APPLE_CLANG_VERSIONS=9.1
+    - <<: *conan-osx
+      osx_image: xcode10.2
+      env: CONAN_APPLE_CLANG_VERSIONS=10.0
+
+    - language: android
+      sudo: true
+      dist: trusty
+      android:
+        components:
+          - tools
+          - platform-tools
+          - build-tools-25.0.2
+          - android-25
+          - extra-android-m2repository
+      compiler:
+        - gcc
+
+      before_install:
+        # Output something every 10 minutes or Travis kills the job
+        - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
+        # Install the r17c version of the NDK that still so that we can continue to test with gnustl
+        # and stlport.
+        - export ANDROID_NDK_HOME=$HOME/android-ndk
+        - NDK_ZIP=$ANDROID_NDK_HOME/ndk.zip
+        - mkdir -p $ANDROID_NDK_HOME
+        - curl -o $NDK_ZIP https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip
+        - unzip -q -d $ANDROID_NDK_HOME $NDK_ZIP
+        - rm $NDK_ZIP
+        - mv $ANDROID_NDK_HOME/android-ndk-*/* $ANDROID_NDK_HOME
+        - rmdir $ANDROID_NDK_HOME/android-ndk-*
+        - export CMAKE=$(which cmake)
+        # libc required for prebuilt llvm toolchain the NDK r17c.
+        - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
+        - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq libc6; fi
+        # Setup environment for Linux build which is required to build the sample.
+        - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+        - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
+        - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq g++-$GCC_VERSION; fi
+        - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq gcc-$GCC_VERSION; fi
+        - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which g++-$GCC_VERSION) /usr/bin/g++; fi
+        - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc; fi
+      script:
+        - failed=0; for build_gradle in $(git ls-files | grep build.gradle); do ( cd "$(dirname "${build_gradle}")" && ./gradlew build ) || failed=1; done; exit $((failed))
+        # Kill the sleep loop
+        - kill %1
--- a/third_party/flatbuffers/.travis/build-and-run-docker-test-containers.sh
+++ b/third_party/flatbuffers/.travis/build-and-run-docker-test-containers.sh
@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Copyright 2018 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -e
+
+# build flatc on debian once to speed up the test loop below
+docker build -t build_flatc_debian_stretch -f tests/docker/Dockerfile.testing.build_flatc_debian_stretch .
+BUILD_CONTAINER_ID=$(docker create --read-only build_flatc_debian_stretch)
+docker cp ${BUILD_CONTAINER_ID}:/code/flatc flatc_debian_stretch
+
+for f in $(ls tests/docker/languages | sort)
+do
+        # docker pull sometimes fails for unknown reasons, probably travisci-related. this retries the pull we need a few times.
+        REQUIRED_BASE_IMAGE=$(cat tests/docker/languages/${f} | head -n 1  | awk ' { print $2 } ')
+
+        set +e
+        n=0
+        until [ $n -ge 5 ]
+        do
+           docker pull $REQUIRED_BASE_IMAGE && break
+           n=$[$n+1]
+           sleep 1
+        done
+        set -e
+
+        docker build -t $(echo ${f} | cut -f 3- -d .) -f tests/docker/languages/${f} .
+        echo "TEST OK: ${f}"
+done
--- a/third_party/flatbuffers/.travis/check-generate-code.sh
+++ b/third_party/flatbuffers/.travis/check-generate-code.sh
@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# Copyright 2018 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -e
+
+cd tests
+./generate_code.sh
+cd ..
+
+# TODO: Linux and macos builds produce differences here for some reason.
+git checkout HEAD -- tests/monster_test.bfbs
+git checkout HEAD -- tests/arrays_test.bfbs
+
+if ! git diff --quiet; then
+  echo >&2
+  echo "ERROR: ********************************************************" >&2
+  echo "ERROR: The following differences were found after running the" >&2
+  echo "ERROR: tests/generate_code.sh script.  Maybe you forgot to run" >&2
+  echo "ERROR: it after making changes in a generator or schema?" >&2
+  echo "ERROR: ********************************************************" >&2
+  echo >&2
+  git diff --binary --exit-code
+fi
--- a/third_party/flatbuffers/.travis/check-sources.sh
+++ b/third_party/flatbuffers/.travis/check-sources.sh
@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Copyright 2018 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -e
+
+if [ -n "$1" ]; then
+  scan_dir="$1"
+else
+  scan_dir="$( pwd )"
+fi
+
+py_checker="$0.py"
+
+echo "scan root directory = '$scan_dir'"
+python3 --version
+# Scan recursively and search all *.cpp and *.h files using regex patterns.
+# Assume that script running from a root of Flatbuffers working dir.
+python3 $py_checker "ascii" "$scan_dir/include" "\.h$"
+python3 $py_checker "ascii" "$scan_dir/src"     "\.cpp$"
+python3 $py_checker "ascii" "$scan_dir/tests"   "\.h$"
+python3 $py_checker "utf-8" "$scan_dir/tests"   "\.cpp$"
--- a/third_party/flatbuffers/.travis/check-sources.sh.py
+++ b/third_party/flatbuffers/.travis/check-sources.sh.py
@ -0,0 +1,35 @@
+import os
+import re
+import sys
+
+def check_encoding(encoding, scan_dir, regex_pattern):
+  fname = None
+  try:
+    assert encoding in ['ascii', 'utf-8'], "unexpected encoding"
+    cmp = re.compile(regex_pattern)
+    for root, dirs, files in os.walk(scan_dir):
+      fname = root
+      cmp_list = [f for f in files if cmp.search(f) is not None]
+      for f in cmp_list:
+        fname = os.path.join(root, f)
+        with open(fname, mode='rb') as test_file:
+          btext = test_file.read()
+        # check encoding
+        btext.decode(encoding=encoding, errors="strict")
+        if encoding == "utf-8" and btext.startswith(b'\xEF\xBB\xBF'):
+          raise ValueError("unexpected BOM in file")
+        # check LF line endings
+        LF = btext.count(b'\n')
+        CR = btext.count(b'\r')
+        if CR!=0:
+          raise ValueError("invalid line endings: LF({})/CR({})".format(LF, CR))
+  except Exception as err:
+    print("ERROR with [{}]: {}".format(fname, err))
+    return -1
+  else:
+    return 0
+
+if __name__ == "__main__":
+  # python check-sources.sh.py 'ascii' '.' '.*\.(cpp|h)$'
+  res = check_encoding(sys.argv[1], sys.argv[2], sys.argv[3])
+  sys.exit(0 if res == 0 else -1)
--- a/third_party/flatbuffers/.travis/deploy-python.sh
+++ b/third_party/flatbuffers/.travis/deploy-python.sh
@ -0,0 +1,12 @@
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PROD_REPOSITORY="https://upload.pypi.org/legacy/"
+TEST_REPOSITORY="https://test.pypi.org/legacy/"
+
+twine upload \
+    --username "$PYPI_USERNAME" \
+    --password "$PYPI_PASSWORD" \
+    --repository-url "$PROD_REPOSITORY" \
+    "$DIR/../python/dist/"*
+
--- a/third_party/flatbuffers/BUILD
+++ b/third_party/flatbuffers/BUILD
@ -0,0 +1,225 @@
+licenses(["notice"])
+
+package(
+    default_visibility = ["//visibility:public"],
+    features = [
+        "-layering_check",
+        "-parse_headers",
+    ],
+)
+
+exports_files([
+    "LICENSE",
+])
+
+load(":build_defs.bzl", "flatbuffer_cc_library")
+
+# Public flatc library to compile flatbuffer files at runtime.
+cc_library(
+    name = "flatbuffers",
+    srcs = [
+        "src/code_generators.cpp",
+        "src/idl_gen_fbs.cpp",
+        "src/idl_gen_general.cpp",
+        "src/idl_gen_text.cpp",
+        "src/idl_parser.cpp",
+        "src/reflection.cpp",
+        "src/util.cpp",
+    ],
+    hdrs = [":public_headers"],
+    includes = ["include/"],
+    linkstatic = 1,
+)
+
+# Public C++ headers for the Flatbuffers library.
+filegroup(
+    name = "public_headers",
+    srcs = [
+        "include/flatbuffers/base.h",
+        "include/flatbuffers/code_generators.h",
+        "include/flatbuffers/flatbuffers.h",
+        "include/flatbuffers/flexbuffers.h",
+        "include/flatbuffers/hash.h",
+        "include/flatbuffers/idl.h",
+        "include/flatbuffers/minireflect.h",
+        "include/flatbuffers/reflection.h",
+        "include/flatbuffers/reflection_generated.h",
+        "include/flatbuffers/stl_emulation.h",
+        "include/flatbuffers/util.h",
+    ],
+)
+
+# Public flatc compiler library.
+cc_library(
+    name = "flatc_library",
+    srcs = [
+        "src/code_generators.cpp",
+        "src/flatc.cpp",
+        "src/idl_gen_fbs.cpp",
+        "src/idl_parser.cpp",
+        "src/reflection.cpp",
+        "src/util.cpp",
+    ],
+    hdrs = [
+        "include/flatbuffers/flatc.h",
+        ":public_headers",
+    ],
+    includes = [
+        "grpc/",
+        "include/",
+    ],
+)
+
+# Public flatc compiler.
+cc_binary(
+    name = "flatc",
+    srcs = [
+        "grpc/src/compiler/config.h",
+        "grpc/src/compiler/cpp_generator.cc",
+        "grpc/src/compiler/cpp_generator.h",
+        "grpc/src/compiler/go_generator.cc",
+        "grpc/src/compiler/go_generator.h",
+        "grpc/src/compiler/java_generator.cc",
+        "grpc/src/compiler/java_generator.h",
+        "grpc/src/compiler/schema_interface.h",
+        "src/flatc_main.cpp",
+        "src/idl_gen_cpp.cpp",
+        "src/idl_gen_dart.cpp",
+        "src/idl_gen_general.cpp",
+        "src/idl_gen_kotlin.cpp",
+        "src/idl_gen_go.cpp",
+        "src/idl_gen_grpc.cpp",
+        "src/idl_gen_js_ts.cpp",
+        "src/idl_gen_json_schema.cpp",
+        "src/idl_gen_lobster.cpp",
+        "src/idl_gen_lua.cpp",
+        "src/idl_gen_php.cpp",
+        "src/idl_gen_python.cpp",
+        "src/idl_gen_rust.cpp",
+        "src/idl_gen_text.cpp",
+        "src/util.cpp",
+    ],
+    includes = [
+        "grpc/",
+        "include/",
+    ],
+    deps = [
+        ":flatc_library",
+    ],
+)
+
+cc_library(
+    name = "runtime_cc",
+    hdrs = [
+        "include/flatbuffers/base.h",
+        "include/flatbuffers/flatbuffers.h",
+        "include/flatbuffers/flexbuffers.h",
+        "include/flatbuffers/stl_emulation.h",
+        "include/flatbuffers/util.h",
+    ],
+    includes = ["include/"],
+    linkstatic = 1,
+)
+
+# Test binary.
+cc_test(
+    name = "flatbuffers_test",
+    testonly = 1,
+    srcs = [
+        "include/flatbuffers/minireflect.h",
+        "include/flatbuffers/registry.h",
+        "src/code_generators.cpp",
+        "src/idl_gen_fbs.cpp",
+        "src/idl_gen_general.cpp",
+        "src/idl_gen_text.cpp",
+        "src/idl_parser.cpp",
+        "src/reflection.cpp",
+        "src/util.cpp",
+        "tests/namespace_test/namespace_test1_generated.h",
+        "tests/namespace_test/namespace_test2_generated.h",
+        "tests/native_type_test_impl.h",
+        "tests/native_type_test_impl.cpp",
+        "tests/test.cpp",
+        "tests/test_assert.cpp",
+        "tests/test_assert.h",
+        "tests/test_builder.cpp",
+        "tests/test_builder.h",
+        "tests/union_vector/union_vector_generated.h",
+        ":public_headers",
+    ],
+    copts = [
+        "-DFLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE",
+        "-DBAZEL_TEST_DATA_PATH",
+    ],
+    data = [
+        ":tests/include_test/include_test1.fbs",
+        ":tests/include_test/sub/include_test2.fbs",
+        ":tests/monster_test.bfbs",
+        ":tests/monster_test.fbs",
+        ":tests/monsterdata_test.golden",
+        ":tests/monsterdata_test.json",
+        ":tests/prototest/imported.proto",
+        ":tests/prototest/test.golden",
+        ":tests/prototest/test.proto",
+        ":tests/prototest/test_union.golden",
+        ":tests/unicode_test.json",
+        ":tests/union_vector/union_vector.fbs",
+        ":tests/union_vector/union_vector.json",
+        ":tests/monster_extra.fbs",
+        ":tests/monsterdata_extra.json",
+        ":tests/arrays_test.bfbs",
+        ":tests/arrays_test.fbs",
+        ":tests/arrays_test.golden",
+        ":tests/native_type_test.fbs",
+    ],
+    includes = [
+        "include/",
+        "tests/",
+    ],
+    deps = [
+        ":monster_extra_cc_fbs",
+        ":monster_test_cc_fbs",
+        ":arrays_test_cc_fbs",
+        ":native_type_test_cc_fbs",
+    ],
+)
+
+# Test bzl rules
+
+flatbuffer_cc_library(
+    name = "monster_test_cc_fbs",
+    srcs = ["tests/monster_test.fbs"],
+    include_paths = ["tests/include_test"],
+    includes = [
+        "tests/include_test/include_test1.fbs",
+        "tests/include_test/sub/include_test2.fbs",
+    ],
+)
+
+flatbuffer_cc_library(
+    name = "monster_extra_cc_fbs",
+    srcs = ["tests/monster_extra.fbs"],
+)
+
+flatbuffer_cc_library(
+    name = "arrays_test_cc_fbs",
+    srcs = ["tests/arrays_test.fbs"],
+    flatc_args = [
+        "--gen-object-api",
+        "--gen-compare",
+        "--no-includes",
+        "--gen-mutable",
+        "--reflect-names",
+        "--cpp-ptr-type flatbuffers::unique_ptr",
+        "--scoped-enums" ],
+)
+
+flatbuffer_cc_library(
+    name = "native_type_test_cc_fbs",
+    srcs = ["tests/native_type_test.fbs"],
+    flatc_args = [
+        "--gen-object-api",
+        "--gen-mutable",
+        "--cpp-ptr-type flatbuffers::unique_ptr" ],
+)
+
--- a/third_party/flatbuffers/BUILD.bazel
+++ b/third_party/flatbuffers/BUILD.bazel
@ -1,139 +0,0 @@
-load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
-load("@npm//:defs.bzl", "npm_link_all_packages")
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
-
-licenses(["notice"])
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-npm_link_all_packages(name = "node_modules")
-
-npm_link_package(
-    name = "node_modules/flatbuffers",
-    src = "//ts:flatbuffers",
-)
-
-exports_files([
-    "LICENSE",
-    "tsconfig.json",
-])
-
-config_setting(
-    name = "platform_freebsd",
-    constraint_values = [
-        "@platforms//os:freebsd",
-    ],
-)
-
-config_setting(
-    name = "platform_openbsd",
-    constraint_values = [
-        "@platforms//os:openbsd",
-    ],
-)
-
-filegroup(
-    name = "distribution",
-    srcs = [
-        "BUILD.bazel",
-        "WORKSPACE",
-        "build_defs.bzl",
-        "typescript.bzl",
-        "//grpc/src/compiler:distribution",
-        "//reflection:distribution",
-        "//src:distribution",
-        "//ts:distribution",
-    ] + glob([
-        "include/flatbuffers/*.h",
-    ]),
-    visibility = ["//visibility:public"],
-)
-
-# Public flatc library to compile flatbuffer files at runtime.
-cc_library(
-    name = "flatbuffers",
-    hdrs = ["//:public_headers"],
-    linkstatic = 1,
-    strip_include_prefix = "/include",
-    deps = ["//src:flatbuffers"],
-)
-
-# Public C++ headers for the Flatbuffers library.
-filegroup(
-    name = "public_headers",
-    srcs = [
-        "include/flatbuffers/allocator.h",
-        "include/flatbuffers/array.h",
-        "include/flatbuffers/base.h",
-        "include/flatbuffers/buffer.h",
-        "include/flatbuffers/buffer_ref.h",
-        "include/flatbuffers/code_generator.h",
-        "include/flatbuffers/code_generators.h",
-        "include/flatbuffers/default_allocator.h",
-        "include/flatbuffers/detached_buffer.h",
-        "include/flatbuffers/file_manager.h",
-        "include/flatbuffers/flatbuffer_builder.h",
-        "include/flatbuffers/flatbuffers.h",
-        "include/flatbuffers/flex_flat_util.h",
-        "include/flatbuffers/flexbuffers.h",
-        "include/flatbuffers/grpc.h",
-        "include/flatbuffers/hash.h",
-        "include/flatbuffers/idl.h",
-        "include/flatbuffers/minireflect.h",
-        "include/flatbuffers/reflection.h",
-        "include/flatbuffers/reflection_generated.h",
-        "include/flatbuffers/registry.h",
-        "include/flatbuffers/stl_emulation.h",
-        "include/flatbuffers/string.h",
-        "include/flatbuffers/struct.h",
-        "include/flatbuffers/table.h",
-        "include/flatbuffers/util.h",
-        "include/flatbuffers/vector.h",
-        "include/flatbuffers/vector_downward.h",
-        "include/flatbuffers/verifier.h",
-    ],
-)
-
-# Public flatc compiler library.
-cc_library(
-    name = "flatc_library",
-    linkstatic = 1,
-    deps = [
-        "//src:flatc_library",
-    ],
-)
-
-# Public flatc compiler.
-cc_binary(
-    name = "flatc",
-    data = ["//reflection:reflection_fbs_schema"],
-    deps = [
-        "//src:flatc",
-    ],
-)
-
-filegroup(
-    name = "flatc_headers",
-    srcs = [
-        "include/flatbuffers/flatc.h",
-    ],
-    visibility = ["//:__subpackages__"],
-)
-
-# Library used by flatbuffer_cc_library rules.
-cc_library(
-    name = "runtime_cc",
-    hdrs = [
-        "include/flatbuffers/base.h",
-        "include/flatbuffers/flatbuffers.h",
-        "include/flatbuffers/flexbuffers.h",
-        "include/flatbuffers/stl_emulation.h",
-        "include/flatbuffers/util.h",
-        "include/flatbuffers/vector.h",
-        "include/flatbuffers/verifier.h",
-    ],
-    linkstatic = 1,
-    strip_include_prefix = "/include",
-)
--- a/third_party/flatbuffers/CHANGELOG.md
+++ b/third_party/flatbuffers/CHANGELOG.md
@ -1,168 +0,0 @@
-# Flatbuffers Change Log
-
-All major or breaking changes will be documented in this file, as well as any
-new features that should be highlighted. Minor fixes or improvements are not
-necessarily listed.
-
-## [24.3.25] (March 25 2024)(https://github.com/google/flatbuffers/releases/tag/v24.3.25)
-
-* Fixed license metadata parsing (#8253)
-* [C++] Allow string_view in `LookUpByKey` in addition to null-terminated c-style strings (#8203)
-
-## [24.3.7] (March 7 2024)(https://github.com/google/flatbuffers/releases/tag/v24.3.7)
-
-* Just to fix some of the CI build issues from the 24.3.6 release.
-
-## [24.3.6] (March 6 2024)(https://github.com/google/flatbuffers/releases/tag/v24.3.6)
-
-* Fix typescript object API to allow 0 values for null-default scalars (#7864)
-
-## [23.5.26 (May 26 2023)](https://github.com/google/flatbuffers/releases/tag/v23.5.26)
-
-* Mostly bug fixing for 64-bit support
-* Adds support for specifying underling type of unions in C++ and TS/JS (#7954)
-
-## [23.5.9 (May 9 2023)](https://github.com/google/flatbuffers/releases/tag/v23.5.9)
-
-* 64-bit support for C++ (#7935)
-
-## [23.5.8 (May 8 2023)](https://github.com/google/flatbuffers/releases/tag/v23.5.8)
-
-* add key_field to compiled tests
-* Add golden language directory
-* Rework cmake flatc codegeneration (#7938)
-* remove defining generated files in test srcs
-* Add binary schema reflection (#7932)
-* Migrate from rules_nodejs to rules_js/rules_ts (take 2) (#7928)
-* `flat_buffers.dart`: mark const variable finals for internal Dart linters
-* fixed some windows warnings (#7929)
-* inject no long for FBS generation to remove logs in flattests (#7926)
-* Revert "Migrate from rules_nodejs to rules_js/rules_ts (#7923)" (#7927)
-* Migrate from rules_nodejs to rules_js/rules_ts (#7923)
-* Only generate @kotlin.ExperimentalUnsigned annotation on create*Vector methods having an unsigned array type parameter. (#7881)
-* additional check for absl::string_view availability (#7897)
-* Optionally generate Python type annotations (#7858)
-* Replace deprecated command with environment file (#7921)
-* drop glibc from runtime dependencies (#7906)
-* Make JSON supporting advanced union features (#7869)
-* Allow to use functions from `BuildFlatBuffers.cmake` from a flatbuffers installation installed with CMake. (#7912)
-* TS/JS: Use TypeError instead of Error when appropriate (#7910)
-* Go: make generated code more compliant to "go fmt" (#7907)
-* Support file_identifier in Go (#7904)
-* Optionally generate type prefixes and suffixes for python code (#7857)
-* Go: add test for FinishWithFileIdentifier (#7905)
-* Fix go_sample.sh (#7903)
-* [TS/JS] Upgrade dependencies (#7889)
-* Add a FileWriter interface (#7821)
-* TS/JS: Use minvalue from enum if not found (#7888)
-* [CS] Verifier (#7850)
-* README.md: PyPI case typo (#7880)
-* Update go documentation link to point to root module (#7879)
-* use Bool for flatbuffers bool instead of Byte (#7876)
-* fix using null string in vector (#7872)
-* Add `flatbuffers-64` branch to CI for pushes
-* made changes to the rust docs so they would compile. new_with_capacity is deprecated should use with_capacity, get_root_as_monster should be root_as_monster (#7871)
-* Adding comment for code clarification (#7856)
-* ToCamelCase() when kLowerCamel now converts first char to lower. (#7838)
-* Fix help output for --java-checkerframework (#7854)
-* Update filename to README.md and improve formatting (#7855)
-* Update stale.yml
-* Updated remaining usages of LICENSE.txt
-
-## [23.3.3 (Mar 3 2023)](https://github.com/google/flatbuffers/releases/tag/v23.3.3)
-
-* Refactoring of `flatc` generators to use an interface (#7797).
-
-* Removed legacy cmake support and set min to 3.8 (#7801).
-
-## [23.1.21 (Jan 21 2023)](https://github.com/google/flatbuffers/releases/tag/v23.1.20)
-
-* Reworked entry points for Typescript/Javascript and compatibility for single
-  file build (#7510)
-
-## [23.1.20 (Jan 20 2023)](https://github.com/google/flatbuffers/releases/tag/v23.1.20)
-
-* Removed go.mod files after some versioning issues were being report (#7780).
-
-## [23.1.4 (Jan 4 2023)](https://github.com/google/flatbuffers/releases/tag/v23.1.4)
-
-* Major release! Just kidding, we are continuing the
-  [versioning scheme](https://github.com/google/flatbuffers/wiki/Versioning) of
-  using a date to signify releases. This results in the first release of the new
-  year to bump the tradition major version field.
-
-* Go minimum version is now 1.19 (#7720) with the addition of Go modules.
-
-* Added CI support for Big Endian regression testing (#7707).
-
-* Fixed `getFullyQualifiedName` in typescript to return name delimited by '.'
-  instead of '_' (#7730).
-
-* Fixed the versioning scheme to not include leading zeros which are not
-  consistently handled by every package manager. Only the last release
-  (12.12.06) should have suffered from this.
-
-## [22.12.06 (Dec 06 2022)](https://github.com/google/flatbuffers/releases/tag/v22.12.06)
-
-* Bug fixing release, no major changes.
-
-## [22.10.25 (Oct 25 2022)](https://github.com/google/flatbuffers/releases/tag/v22.10.25)
-
-* Added Nim language support with generator and runtime libraries (#7534).
-
-## [22.9.29 (Sept 29 2022)](https://github.com/google/flatbuffers/releases/tag/v22.9.29)
-
-* Rust soundness fixes to avoid the crate from bing labelled unsafe (#7518).
-
-## [22.9.24 (Sept 24 2022)](https://github.com/google/flatbuffers/releases/tag/v22.9.24)
-
-* 20 Major releases in a row? Nope, we switched to a new
-  [versioning scheme](https://github.com/google/flatbuffers/wiki/Versioning)
-  that is based on date.
-
-* Python supports fixed size arrays now (#7529).
-
-* Behavior change in how C++ object API uses `UnPackTo`. The original intent of
-  this was to reduce allocations by reusing an existing object to pack data
-  into. At some point, this logic started to merge the states of the two objects
-  instead of clearing the state of the packee. This change goes back to the
-  original intention, the packed object is cleared when getting data packed into
-  it (#7527).
-
-* Fixed a bug in C++ alignment that was using `sizeof()` instead of the intended
-  `AlignOf()` for structs (#7520).
-
-* C# has an
-  [official Nuget package](https://www.nuget.org/packages/Google.FlatBuffers)
-  now (#7496).
-
-## 2.0.8 (Aug 29 2022)
-
-* Fix for `--keep-prefix` the was generating the wrong include statements for
-  C++ (#7469). The bug was introduced in 2.0.7.
-
-* Added the `Verifier::Options` option struct to allow specifying runtime
-  configuration settings for the verifier (#7489). This allows to skip verifying
-  nested flatbuffers, a on-by-default change that was introduced in 2.0.7. This
-  deprecates the existing `Verifier` constructor, which may be removed in a
-  future version.
-
-* Refactor of `tests/test.cpp` that lead to ~10% speedup in compilation of the
-  entire project (#7487).
-
-## 2.0.7 (Aug 22 2022)
-
-* This is the first version with an explicit change log, so all the previous
-  features will not be listed.
-
-* Verifier now checks that buffers are at least the minimum size required to be
-  a flatbuffers (12 bytes). This includes nested flatbuffers, which previously
-  could be declared valid at size 0.
-
-* Annotated binaries. Given a flatbuffer binary and a schema (or binary schema)
-  one can generate an annotated flatbuffer (.afb) to describe each byte in the
-  binary with schema metadata and value.
-
-* First binary schema generator (Lua) to generate Lua code via a .bfbs file.
-  This is mostly an implementation detail of flatc internals, but will be slowly
-  applied to the other language generators.
--- a/third_party/flatbuffers/CMake/BuildFlatBuffers.cmake
+++ b/third_party/flatbuffers/CMake/BuildFlatBuffers.cmake
@ -59,9 +59,6 @@ function(build_flatbuffers flatbuffers_schemas
  if(FLATBUFFERS_FLATC_EXECUTABLE)
    set(FLATC_TARGET "")
    set(FLATC ${FLATBUFFERS_FLATC_EXECUTABLE})
-  elseif(TARGET flatbuffers::flatc)
-    set(FLATC_TARGET flatbuffers::flatc)
-    set(FLATC flatbuffers::flatc)
  else()
    set(FLATC_TARGET flatc)
    set(FLATC flatc)
@ -153,297 +150,3 @@ function(build_flatbuffers flatbuffers_schemas
      ${copy_text_schemas_dir})
  endif()
 endfunction()
-
-# Creates a target that can be linked against that generates flatbuffer headers.
-#
-# This function takes a target name and a list of schemas. You can also specify
-# other flagc flags using the FLAGS option to change the behavior of the flatc
-# tool.
-#
-# When the target_link_libraries is done within a different directory than
-# flatbuffers_generate_headers is called, then the target should also be dependent
-# the custom generation target called GENERATE_<TARGET>.
-#
-# Arguments:
-#   TARGET: The name of the target to generate.
-#   SCHEMAS: The list of schema files to generate code for.
-#   BINARY_SCHEMAS_DIR: Optional. The directory in which to generate binary
-#       schemas. Binary schemas will only be generated if a path is provided.
-#   INCLUDE: Optional. Search for includes in the specified paths. (Use this
-#       instead of "-I <path>" and the FLAGS option so that CMake is aware of
-#       the directories that need to be searched).
-#   INCLUDE_PREFIX: Optional. The directory in which to place the generated
-#       files. Use this instead of the --include-prefix option.
-#   FLAGS: Optional. A list of any additional flags that you would like to pass
-#       to flatc.
-#
-# Example:
-#
-#     flatbuffers_generate_headers(
-#         TARGET my_generated_headers_target
-#         INCLUDE_PREFIX ${MY_INCLUDE_PREFIX}"
-#         SCHEMAS ${MY_SCHEMA_FILES}
-#         BINARY_SCHEMAS_DIR "${MY_BINARY_SCHEMA_DIRECTORY}"
-#         FLAGS --gen-object-api)
-#
-#     target_link_libraries(MyExecutableTarget
-#         PRIVATE my_generated_headers_target
-#     )
-#
-# Optional (only needed within different directory):
-#     add_dependencies(app GENERATE_my_generated_headers_target)
-function(flatbuffers_generate_headers)
-  # Parse function arguments.
-  set(options)
-  set(one_value_args
-    "TARGET"
-    "INCLUDE_PREFIX"
-    "BINARY_SCHEMAS_DIR")
-  set(multi_value_args
-    "SCHEMAS"
-    "INCLUDE"
-    "FLAGS")
-  cmake_parse_arguments(
-    PARSE_ARGV 0
-    FLATBUFFERS_GENERATE_HEADERS
-    "${options}"
-    "${one_value_args}"
-    "${multi_value_args}")
-
-  # Test if including from FindFlatBuffers
-  if(FLATBUFFERS_FLATC_EXECUTABLE)
-    set(FLATC_TARGET "")
-    set(FLATC ${FLATBUFFERS_FLATC_EXECUTABLE})
-  elseif(TARGET flatbuffers::flatc)
-    set(FLATC_TARGET flatbuffers::flatc)
-    set(FLATC flatbuffers::flatc)
-  else()
-    set(FLATC_TARGET flatc)
-    set(FLATC flatc)
-  endif()
-
-  set(working_dir "${CMAKE_CURRENT_SOURCE_DIR}")
-
-  # Generate the include files parameters.
-  set(include_params "")
-  foreach (include_dir ${FLATBUFFERS_GENERATE_HEADERS_INCLUDE})
-    set(include_params -I ${include_dir} ${include_params})
-  endforeach()
-
-  # Create a directory to place the generated code.
-  set(generated_target_dir "${CMAKE_CURRENT_BINARY_DIR}/${FLATBUFFERS_GENERATE_HEADERS_TARGET}")
-  set(generated_include_dir "${generated_target_dir}")
-  if (NOT ${FLATBUFFERS_GENERATE_HEADERS_INCLUDE_PREFIX} STREQUAL "")
-    set(generated_include_dir "${generated_include_dir}/${FLATBUFFERS_GENERATE_HEADERS_INCLUDE_PREFIX}")
-    list(APPEND FLATBUFFERS_GENERATE_HEADERS_FLAGS 
-         "--include-prefix" ${FLATBUFFERS_GENERATE_HEADERS_INCLUDE_PREFIX})
-  endif()
-
-  set(generated_custom_commands)
-
-  # Create rules to generate the code for each schema.
-  foreach(schema ${FLATBUFFERS_GENERATE_HEADERS_SCHEMAS})
-    get_filename_component(filename ${schema} NAME_WE)
-    set(generated_include "${generated_include_dir}/${filename}_generated.h")
-
-    # Generate files for grpc if needed
-    set(generated_source_file)
-    if("${FLATBUFFERS_GENERATE_HEADERS_FLAGS}" MATCHES "--grpc")
-      # Check if schema file contain a rpc_service definition
-      file(STRINGS ${schema} has_grpc REGEX "rpc_service")
-      if(has_grpc)
-        list(APPEND generated_include "${generated_include_dir}/${filename}.grpc.fb.h")
-        set(generated_source_file "${generated_include_dir}/${filename}.grpc.fb.cc")
-      endif()
-    endif()
-
-    add_custom_command(
-      OUTPUT ${generated_include} ${generated_source_file}
-      COMMAND ${FLATC} ${FLATC_ARGS}
-      -o ${generated_include_dir}
-      ${include_params}
-      -c ${schema}
-      ${FLATBUFFERS_GENERATE_HEADERS_FLAGS}
-      DEPENDS ${FLATC_TARGET} ${schema}
-      WORKING_DIRECTORY "${working_dir}"
-      COMMENT "Building ${schema} flatbuffers...")
-    list(APPEND all_generated_header_files ${generated_include})
-    list(APPEND all_generated_source_files ${generated_source_file})
-    list(APPEND generated_custom_commands "${generated_include}" "${generated_source_file}")
-
-    # Geneate the binary flatbuffers schemas if instructed to.
-    if (NOT ${FLATBUFFERS_GENERATE_HEADERS_BINARY_SCHEMAS_DIR} STREQUAL "")
-      set(binary_schema
-          "${FLATBUFFERS_GENERATE_HEADERS_BINARY_SCHEMAS_DIR}/${filename}.bfbs")
-      add_custom_command(
-        OUTPUT ${binary_schema}
-        COMMAND ${FLATC} -b --schema
-        -o ${FLATBUFFERS_GENERATE_HEADERS_BINARY_SCHEMAS_DIR}
-        ${include_params}
-        ${schema}
-        DEPENDS ${FLATC_TARGET} ${schema}
-        WORKING_DIRECTORY "${working_dir}")
-      list(APPEND generated_custom_commands "${binary_schema}")
-      list(APPEND all_generated_binary_files ${binary_schema})
-    endif()
-  endforeach()
-
-  # Create an additional target as add_custom_command scope is only within same directory (CMakeFile.txt)
-  set(generate_target GENERATE_${FLATBUFFERS_GENERATE_HEADERS_TARGET})
-  add_custom_target(${generate_target} ALL
-                    DEPENDS ${generated_custom_commands}
-                    COMMENT "Generating flatbuffer target ${FLATBUFFERS_GENERATE_HEADERS_TARGET}")
-
-  # Set up interface library
-  add_library(${FLATBUFFERS_GENERATE_HEADERS_TARGET} INTERFACE)
-  target_sources(
-    ${FLATBUFFERS_GENERATE_HEADERS_TARGET}
-    INTERFACE
-      ${all_generated_header_files}
-      ${all_generated_binary_files}
-      ${all_generated_source_files}
-      ${FLATBUFFERS_GENERATE_HEADERS_SCHEMAS})
-  add_dependencies(
-    ${FLATBUFFERS_GENERATE_HEADERS_TARGET}
-    ${FLATC}
-    ${FLATBUFFERS_GENERATE_HEADERS_SCHEMAS})
-  target_include_directories(
-    ${FLATBUFFERS_GENERATE_HEADERS_TARGET}
-    INTERFACE ${generated_target_dir})
-
-  # Organize file layout for IDEs.
-  source_group(
-    TREE "${generated_target_dir}"
-    PREFIX "Flatbuffers/Generated/Headers Files"
-    FILES ${all_generated_header_files})
-  source_group(
-    TREE "${generated_target_dir}"
-    PREFIX "Flatbuffers/Generated/Source Files"
-    FILES ${all_generated_source_files})
-  source_group(
-    TREE ${working_dir}
-    PREFIX "Flatbuffers/Schemas"
-    FILES ${FLATBUFFERS_GENERATE_HEADERS_SCHEMAS})
-  if (NOT ${FLATBUFFERS_GENERATE_HEADERS_BINARY_SCHEMAS_DIR} STREQUAL "")
-    source_group(
-      TREE "${FLATBUFFERS_GENERATE_HEADERS_BINARY_SCHEMAS_DIR}"
-      PREFIX "Flatbuffers/Generated/Binary Schemas"
-      FILES ${all_generated_binary_files})
-  endif()
-endfunction()
-
-# Creates a target that can be linked against that generates flatbuffer binaries
-# from json files.
-#
-# This function takes a target name and a list of schemas and Json files. You
-# can also specify other flagc flags and options to change the behavior of the
-# flatc compiler.
-#
-# Adding this target to your executable ensurses that the flatbuffer binaries
-# are compiled before your executable is run.
-#
-# Arguments:
-#   TARGET: The name of the target to generate.
-#   JSON_FILES: The list of json files to compile to flatbuffers binaries.
-#   SCHEMA: The flatbuffers schema of the Json files to be compiled.
-#   INCLUDE: Optional. Search for includes in the specified paths. (Use this 
-#       instead of "-I <path>" and the FLAGS option so that CMake is aware of 
-#       the directories that need to be searched).
-#   OUTPUT_DIR: The directly where the generated flatbuffers binaries should be
-#       placed.
-#   FLAGS: Optional. A list of any additional flags that you would like to pass
-#       to flatc.
-#
-# Example:
-#
-#     flatbuffers_generate_binary_files(
-#         TARGET my_binary_data
-#         SCHEMA "${MY_SCHEMA_DIR}/my_example_schema.fbs"
-#         JSON_FILES ${MY_JSON_FILES}
-#         OUTPUT_DIR "${MY_BINARY_DATA_DIRECTORY}"
-#         FLAGS --strict-json)
-#
-#     target_link_libraries(MyExecutableTarget
-#         PRIVATE my_binary_data
-#     )
-function(flatbuffers_generate_binary_files)
-  # Parse function arguments.
-  set(options)
-  set(one_value_args
-    "TARGET"
-    "SCHEMA"
-    "OUTPUT_DIR")
-  set(multi_value_args
-    "JSON_FILES"
-    "INCLUDE"
-    "FLAGS")
-  cmake_parse_arguments(
-    PARSE_ARGV 0
-    FLATBUFFERS_GENERATE_BINARY_FILES
-    "${options}"
-    "${one_value_args}"
-    "${multi_value_args}")
-
-  # Test if including from FindFlatBuffers
-  if(FLATBUFFERS_FLATC_EXECUTABLE)
-    set(FLATC_TARGET "")
-    set(FLATC ${FLATBUFFERS_FLATC_EXECUTABLE})
-  elseif(TARGET flatbuffers::flatc)
-    set(FLATC_TARGET flatbuffers::flatc)
-    set(FLATC flatbuffers::flatc)
-  else()
-    set(FLATC_TARGET flatc)
-    set(FLATC flatc)
-  endif()
-
-  set(working_dir "${CMAKE_CURRENT_SOURCE_DIR}")
-
-  # Generate the include files parameters.
-  set(include_params "")
-  foreach (include_dir ${FLATBUFFERS_GENERATE_BINARY_FILES_INCLUDE})
-    set(include_params -I ${include_dir} ${include_params})
-  endforeach()
-
-  # Create rules to generate the flatbuffers binary for each json file.
-  foreach(json_file ${FLATBUFFERS_GENERATE_BINARY_FILES_JSON_FILES})
-    get_filename_component(filename ${json_file} NAME_WE)
-    set(generated_binary_file "${FLATBUFFERS_GENERATE_BINARY_FILES_OUTPUT_DIR}/${filename}.bin")
-    add_custom_command(
-      OUTPUT ${generated_binary_file}
-      COMMAND ${FLATC} ${FLATC_ARGS}
-      -o ${FLATBUFFERS_GENERATE_BINARY_FILES_OUTPUT_DIR}
-      ${include_params}
-      -b ${FLATBUFFERS_GENERATE_BINARY_FILES_SCHEMA} ${json_file}
-      ${FLATBUFFERS_GENERATE_BINARY_FILES_FLAGS}
-      DEPENDS ${FLATC_TARGET} ${json_file}
-      WORKING_DIRECTORY "${working_dir}"
-      COMMENT "Building ${json_file} binary flatbuffers...")
-      list(APPEND all_generated_binary_files ${generated_binary_file})
-  endforeach()
-
-  # Set up interface library
-  add_library(${FLATBUFFERS_GENERATE_BINARY_FILES_TARGET} INTERFACE)
-  target_sources(
-    ${FLATBUFFERS_GENERATE_BINARY_FILES_TARGET}
-    INTERFACE
-      ${all_generated_binary_files}
-      ${FLATBUFFERS_GENERATE_BINARY_FILES_JSON_FILES}
-      ${FLATBUFFERS_GENERATE_BINARY_FILES_SCHEMA})
-  add_dependencies(
-    ${FLATBUFFERS_GENERATE_BINARY_FILES_TARGET}
-    ${FLATC})
-
-  # Organize file layout for IDEs.
-  source_group(
-    TREE ${working_dir}
-    PREFIX "Flatbuffers/JSON Files"
-    FILES ${FLATBUFFERS_GENERATE_BINARY_FILES_JSON_FILES})
-  source_group(
-    TREE ${working_dir}
-    PREFIX "Flatbuffers/Schemas"
-    FILES ${FLATBUFFERS_GENERATE_BINARY_FILES_SCHEMA})
-  source_group(
-    TREE ${FLATBUFFERS_GENERATE_BINARY_FILES_OUTPUT_DIR}
-    PREFIX "Flatbuffers/Generated/Binary Files"
-    FILES ${all_generated_binary_files})
-endfunction()
--- a/third_party/flatbuffers/CMake/FindFlatBuffers.cmake
+++ b/third_party/flatbuffers/CMake/FindFlatBuffers.cmake
@ -30,7 +30,7 @@ find_program(FLATBUFFERS_FLATC_EXECUTABLE NAMES flatc)
 find_path(FLATBUFFERS_INCLUDE_DIR NAMES flatbuffers/flatbuffers.h)

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(FlatBuffers
+find_package_handle_standard_args(flatbuffers
  DEFAULT_MSG FLATBUFFERS_FLATC_EXECUTABLE FLATBUFFERS_INCLUDE_DIR)

 if(FLATBUFFERS_FOUND)
--- a/third_party/flatbuffers/CMake/FlatbuffersConfig.cmake
+++ b/third_party/flatbuffers/CMake/FlatbuffersConfig.cmake
@ -0,0 +1,4 @@
+include("${CMAKE_CURRENT_LIST_DIR}/FlatbuffersTargets.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/FlatcTargets.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/FlatbuffersSharedTargets.cmake" OPTIONAL)
+
--- a/third_party/flatbuffers/CMake/flatbuffers-config-version.cmake.in
+++ b/third_party/flatbuffers/CMake/flatbuffers-config-version.cmake.in
--- a/third_party/flatbuffers/CMake/PackageDebian.cmake
+++ b/third_party/flatbuffers/CMake/PackageDebian.cmake
@ -17,9 +17,23 @@ if (UNIX)
    SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_COMMIT}")
    SET(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}")

+    # Derive architecture
+    IF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+      FIND_PROGRAM(DPKG_CMD dpkg)
+      IF(NOT DPKG_CMD)
+        MESSAGE(STATUS "Can not find dpkg in your path, default to i386.")
+        SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
+      ENDIF(NOT DPKG_CMD)
+      EXECUTE_PROCESS(COMMAND "${DPKG_CMD}" --print-architecture
+        OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+    ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+
    # Package name
    SET(CPACK_DEBIAN_PACKAGE_NAME "flatbuffers")
-    SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
-    set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+    SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt)
+    SET(CPACK_PACKAGE_FILE_NAME
+        "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")

 endif(UNIX)
--- a/third_party/flatbuffers/CMake/PackageRedhat.cmake
+++ b/third_party/flatbuffers/CMake/PackageRedhat.cmake
@ -15,14 +15,14 @@ if (UNIX)

    set(CPACK_RPM_PACKAGE_NAME "flatbuffers")

-    # Assume this is not a cross compilation build.
+    # Assume this is not a cross complation build.
    if(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)
        set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
    endif(NOT CPACK_RPM_PACKAGE_ARCHITECTURE)

    set(CPACK_RPM_PACKAGE_VENDOR "Google, Inc.")
    set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0")
-    set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE)
+    set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt)
    set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/CMake/DESCRIPTION.txt)

    # This may reduce rpm compatiblity with very old systems.
@ -31,14 +31,4 @@ if (UNIX)
    set(CPACK_RPM_PACKAGE_NAME "flatbuffers")
    set(CPACK_PACKAGE_FILE_NAME
        "${CPACK_RPM_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}_${CPACK_RPM_PACKAGE_ARCHITECTURE}")
-    if(NOT DEFINED ${CPACK_PACKAGING_INSTALL_PREFIX})
-       # Default packaging install prefix on RedHat systems is /usr.
-       # This is the assumed value when this variable is not defined.
-       # There is currently a conflict with
-       # /usr/${CMAKE_INSTALL_LIBDIR}/cmake which is installed by default
-       # by other packages on RedHat (most notably cmake-filesystem). Ensure
-       # that on these systems, flatbuffers does not package this path.
-       # This patch is required for cmake pre-3.17.
-       list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/${CMAKE_INSTALL_LIBDIR}/cmake")
-   endif()
 endif(UNIX)
--- a/third_party/flatbuffers/CMake/Version.cmake
+++ b/third_party/flatbuffers/CMake/Version.cmake
@ -1,39 +1,11 @@
-set(VERSION_MAJOR 24)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH 25)
-set(VERSION_COMMIT 0)
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
 find_program(GIT git)
-  if(GIT)
 execute_process(
-      COMMAND ${GIT} describe --tags
+    COMMAND ${GIT} describe
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    OUTPUT_VARIABLE GIT_DESCRIBE_DIRTY
    OUTPUT_STRIP_TRAILING_WHITESPACE
-      RESULT_VARIABLE GIT_DESCRIBE_RESULT
 )
-
-    if(GIT_DESCRIBE_RESULT EQUAL 0)
-      # Test if the most recent Git tag matches the pattern "v<major>.<minor>.<patch>*"
-      if(GIT_DESCRIBE_DIRTY MATCHES "^v[0-9]+\\.[0-9]+\\.[0-9]+.*")
 string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_DESCRIBE_DIRTY}")
 string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GIT_DESCRIBE_DIRTY}")
 string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GIT_DESCRIBE_DIRTY}")
 string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-([0-9]+).*" "\\1" VERSION_COMMIT "${GIT_DESCRIBE_DIRTY}")
-        # If the tag points to the commit, then only the tag is shown in "git describe"
-        if(VERSION_COMMIT STREQUAL GIT_DESCRIBE_DIRTY)
-          set(VERSION_COMMIT 0)
-        endif()
-      else()
-        message(WARNING "\"${GIT_DESCRIBE_DIRTY}\" does not match pattern v<major>.<minor>.<patch>-<commit>")
-      endif()
-    else()
-      message(WARNING "git describe failed with exit code: ${GIT_DESCRIBE_RESULT}\nMake sure you cloned with tags or run 'git fetch --tags'.")
-    endif()
-  else()
-    message(WARNING "git is not found")
-  endif()
-endif()
-
-message(STATUS "Proceeding with version: ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_COMMIT}")
--- a/third_party/flatbuffers/CMake/flatbuffers-config.cmake
+++ b/third_party/flatbuffers/CMake/flatbuffers-config.cmake
@ -1,4 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/FlatBuffersTargets.cmake" OPTIONAL)
-include("${CMAKE_CURRENT_LIST_DIR}/FlatcTargets.cmake" OPTIONAL)
-include("${CMAKE_CURRENT_LIST_DIR}/FlatBuffersSharedTargets.cmake" OPTIONAL)
-include("${CMAKE_CURRENT_LIST_DIR}/BuildFlatBuffers.cmake" OPTIONAL)
--- a/third_party/flatbuffers/CMake/flatbuffers.pc.in
+++ b/third_party/flatbuffers/CMake/flatbuffers.pc.in
@ -1,9 +0,0 @@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
-Name: FlatBuffers
-Description: Memory Efficient Serialization Library
-Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
-
-Libs: -L${libdir} -lflatbuffers
-Cflags: -I${includedir}
--- a/third_party/flatbuffers/CMakeLists.txt
+++ b/third_party/flatbuffers/CMakeLists.txt
@ -1,15 +1,9 @@
-# This is the legacy minimum version flatbuffers supported for a while.
-cmake_minimum_required(VERSION 3.8...3.25.2)
-
-# Attempt to read the current version of flatbuffers by looking at the latest tag.
-include(CMake/Version.cmake)
-
-project(FlatBuffers
-        VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
-        LANGUAGES CXX)
-
+cmake_minimum_required(VERSION 2.8)
 # generate compile_commands.json
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+include(CheckCXXSymbolExists)
+
+project(FlatBuffers)

 # NOTE: Code coverage only works on Linux & OSX.
 option(FLATBUFFERS_CODE_COVERAGE "Enable the code coverage build option." OFF)
@ -19,11 +13,7 @@ option(FLATBUFFERS_BUILD_FLATLIB "Enable the build of the flatbuffers library"
       ON)
 option(FLATBUFFERS_BUILD_FLATC "Enable the build of the flatbuffers compiler"
       ON)
-option(FLATBUFFERS_STATIC_FLATC "Build flatbuffers compiler with -static flag"
-       OFF)
-option(FLATBUFFERS_BUILD_FLATHASH "Enable the build of flathash" OFF)
-option(FLATBUFFERS_BUILD_BENCHMARKS "Enable the build of flatbenchmark."
-       OFF)
+option(FLATBUFFERS_BUILD_FLATHASH "Enable the build of flathash" ON)
 option(FLATBUFFERS_BUILD_GRPCTEST "Enable the build of grpctest" OFF)
 option(FLATBUFFERS_BUILD_SHAREDLIB
       "Enable the build of the flatbuffers shared library"
@ -39,47 +29,6 @@ option(FLATBUFFERS_PACKAGE_REDHAT
 option(FLATBUFFERS_PACKAGE_DEBIAN
       "Build an deb using the 'package' target."
       OFF)
-option(FLATBUFFERS_BUILD_CPP17
-       "Enable the build of c++17 test target. \"
-       Requirements: Clang6, GCC7, MSVC2017 (_MSC_VER >= 1914)  or higher."
-       OFF)
-option(FLATBUFFERS_BUILD_LEGACY
-       "Run C++ code generator with '--cpp-std c++0x' switch."
-       OFF)
-option(FLATBUFFERS_ENABLE_PCH
-       "Enable precompile headers support for 'flatbuffers' and 'flatc'. \"
-        Only work if CMake supports 'target_precompile_headers'. \"
-        This can speed up compilation time."
-       OFF)
-option(FLATBUFFERS_SKIP_MONSTER_EXTRA
-      "Skip generating monster_extra.fbs that contains non-supported numerical\"
-      types." OFF)
-option(FLATBUFFERS_STRICT_MODE
-      "Build flatbuffers with all warnings as errors (-Werror or /WX)."
-      OFF)
-
-if(NOT DEFINED FLATBUFFERS_CPP_STD)
-  set(FLATBUFFERS_CPP_STD 11)
-endif()
-
-set(MSVC_LIKE OFF)
-if(MSVC OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
-    set(MSVC_LIKE ON)
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set(IS_CLANG ON)
-else()
-  set(IS_CLANG OFF)
-endif()
-
-if(DEFINED FLATBUFFERS_COMPILATION_TIMINGS)
-  message("Recording Compilation Timings to ${FLATBUFFERS_COMPILATION_TIMINGS}")
-  file(REMOVE ${FLATBUFFERS_COMPILATION_TIMINGS})
-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "time -f 'Wall: %E User: %U Sys: %S | %C' -q -a -o ${FLATBUFFERS_COMPILATION_TIMINGS}")
-  set_property(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM "time -f 'Wall: %E User: %U Sys: %S | %C' -q -a -o ${FLATBUFFERS_COMPILATION_TIMINGS}")
-  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "time -f 'Wall: %E User: %U Sys: %S | %C' -q -a -o ${FLATBUFFERS_COMPILATION_TIMINGS}")
-endif()

 if(NOT FLATBUFFERS_BUILD_FLATC AND FLATBUFFERS_BUILD_TESTS)
    message(WARNING
@ -95,10 +44,8 @@ endif()

 # Auto-detect locale-narrow 'strtod_l' and  'strtoull_l' functions.
 if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT)
-  include(CheckCXXSymbolExists)
-
  set(FLATBUFFERS_LOCALE_INDEPENDENT 0)
-  if(MSVC_LIKE)
+  if(MSVC)
    check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L)
    check_cxx_symbol_exists(_strtoui64_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L)
  else()
@ -111,41 +58,20 @@ if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT)
 endif()
 add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$<BOOL:${FLATBUFFERS_LOCALE_INDEPENDENT}>)

-if(NOT WIN32)
-  check_symbol_exists(realpath "stdlib.h" HAVE_REALPATH)
-  if(NOT HAVE_REALPATH)
-    add_definitions(-DFLATBUFFERS_NO_ABSOLUTE_PATH_RESOLUTION)
-  endif()
-endif()
-
 set(FlatBuffers_Library_SRCS
-  include/flatbuffers/allocator.h
-  include/flatbuffers/array.h
+  include/flatbuffers/code_generators.h
  include/flatbuffers/base.h
-  include/flatbuffers/buffer.h
-  include/flatbuffers/buffer_ref.h
-  include/flatbuffers/default_allocator.h
-  include/flatbuffers/detached_buffer.h
-  include/flatbuffers/code_generator.h
-  include/flatbuffers/file_manager.h
-  include/flatbuffers/flatbuffer_builder.h
  include/flatbuffers/flatbuffers.h
-  include/flatbuffers/flexbuffers.h
-  include/flatbuffers/flex_flat_util.h
  include/flatbuffers/hash.h
  include/flatbuffers/idl.h
-  include/flatbuffers/minireflect.h
+  include/flatbuffers/util.h
  include/flatbuffers/reflection.h
  include/flatbuffers/reflection_generated.h
-  include/flatbuffers/registry.h
  include/flatbuffers/stl_emulation.h
-  include/flatbuffers/string.h
-  include/flatbuffers/struct.h
-  include/flatbuffers/table.h
-  include/flatbuffers/util.h
-  include/flatbuffers/vector.h
-  include/flatbuffers/vector_downward.h
-  include/flatbuffers/verifier.h
+  include/flatbuffers/flexbuffers.h
+  include/flatbuffers/registry.h
+  include/flatbuffers/minireflect.h
+  src/code_generators.cpp
  src/idl_parser.cpp
  src/idl_gen_text.cpp
  src/reflection.cpp
@ -154,43 +80,22 @@ set(FlatBuffers_Library_SRCS

 set(FlatBuffers_Compiler_SRCS
  ${FlatBuffers_Library_SRCS}
-  src/idl_gen_binary.cpp
-  src/idl_gen_text.cpp
  src/idl_gen_cpp.cpp
-  src/idl_gen_csharp.cpp
  src/idl_gen_dart.cpp
+  src/idl_gen_general.cpp
  src/idl_gen_kotlin.cpp
-  src/idl_gen_kotlin_kmp.cpp
  src/idl_gen_go.cpp
-  src/idl_gen_java.cpp
-  src/idl_gen_ts.cpp
+  src/idl_gen_js_ts.cpp
  src/idl_gen_php.cpp
  src/idl_gen_python.cpp
  src/idl_gen_lobster.cpp
+  src/idl_gen_lua.cpp
  src/idl_gen_rust.cpp
  src/idl_gen_fbs.cpp
  src/idl_gen_grpc.cpp
  src/idl_gen_json_schema.cpp
-  src/idl_gen_swift.cpp
-  src/file_name_saving_file_manager.cpp
-  src/file_binary_writer.cpp
-  src/file_writer.cpp
-  src/idl_namer.h
-  src/namer.h
  src/flatc.cpp
  src/flatc_main.cpp
-  src/bfbs_gen.h
-  src/bfbs_gen_lua.h
-  src/bfbs_gen_nim.h
-  src/bfbs_namer.h
-  include/flatbuffers/code_generators.h
-  src/binary_annotator.h
-  src/binary_annotator.cpp
-  src/annotated_binary_text_gen.h
-  src/annotated_binary_text_gen.cpp
-  src/bfbs_gen_lua.cpp
-  src/bfbs_gen_nim.cpp
-  src/code_generators.cpp
  grpc/src/compiler/schema_interface.h
  grpc/src/compiler/cpp_generator.h
  grpc/src/compiler/cpp_generator.cc
@ -198,12 +103,6 @@ set(FlatBuffers_Compiler_SRCS
  grpc/src/compiler/go_generator.cc
  grpc/src/compiler/java_generator.h
  grpc/src/compiler/java_generator.cc
-  grpc/src/compiler/python_generator.h
-  grpc/src/compiler/python_generator.cc
-  grpc/src/compiler/swift_generator.h
-  grpc/src/compiler/swift_generator.cc
-  grpc/src/compiler/ts_generator.h
-  grpc/src/compiler/ts_generator.cc
 )

 set(FlatHash_SRCS
@ -214,51 +113,41 @@ set(FlatHash_SRCS
 set(FlatBuffers_Tests_SRCS
  ${FlatBuffers_Library_SRCS}
  src/idl_gen_fbs.cpp
-  tests/evolution_test.cpp
-  tests/flexbuffers_test.cpp
-  tests/fuzz_test.cpp
-  tests/json_test.cpp
-  tests/key_field_test.cpp
-  tests/monster_test.cpp
-  tests/optional_scalars_test.cpp
-  tests/parser_test.cpp
-  tests/proto_test.cpp
-  tests/reflection_test.cpp
  tests/test.cpp
  tests/test_assert.h
  tests/test_assert.cpp
  tests/test_builder.h
  tests/test_builder.cpp
-  tests/util_test.cpp
  tests/native_type_test_impl.h
  tests/native_type_test_impl.cpp
-  tests/alignment_test.h
-  tests/alignment_test.cpp
-  tests/64bit/offset64_test.h
-  tests/64bit/offset64_test.cpp
-  include/flatbuffers/code_generators.h
-  src/code_generators.cpp
-)
-
-set(FlatBuffers_Tests_CPP17_SRCS
-  ${FlatBuffers_Library_SRCS}
-  tests/test_assert.h
-  tests/test_assert.cpp
-  tests/cpp17/test_cpp17.cpp
+  # file generate by running compiler on tests/monster_test.fbs
+  ${CMAKE_CURRENT_BINARY_DIR}/tests/monster_test_generated.h
+  # file generate by running compiler on tests/arrays_test.fbs
+  ${CMAKE_CURRENT_BINARY_DIR}/tests/arrays_test_generated.h
+  # file generate by running compiler on tests/native_type_test.fbs
+  ${CMAKE_CURRENT_BINARY_DIR}/tests/native_type_test_generated.h
 )

 set(FlatBuffers_Sample_Binary_SRCS
+  include/flatbuffers/flatbuffers.h
  samples/sample_binary.cpp
+  # file generated by running compiler on samples/monster.fbs
+  ${CMAKE_CURRENT_BINARY_DIR}/samples/monster_generated.h
 )

 set(FlatBuffers_Sample_Text_SRCS
  ${FlatBuffers_Library_SRCS}
  samples/sample_text.cpp
+  # file generated by running compiler on samples/monster.fbs
+  ${CMAKE_CURRENT_BINARY_DIR}/samples/monster_generated.h
 )

 set(FlatBuffers_Sample_BFBS_SRCS
  ${FlatBuffers_Library_SRCS}
+  src/idl_gen_general.cpp
  samples/sample_bfbs.cpp
+  # file generated by running compiler on samples/monster.fbs
+  ${CMAKE_CURRENT_BINARY_DIR}/samples/monster_generated.h
 )

 set(FlatBuffers_GRPCTest_SRCS
@ -274,25 +163,89 @@ set(FlatBuffers_GRPCTest_SRCS
  tests/test_builder.cpp
  grpc/tests/grpctest.cpp
  grpc/tests/message_builder_test.cpp
+  # file generated by running compiler on samples/monster.fbs
+  ${CMAKE_CURRENT_BINARY_DIR}/samples/monster_generated.h
 )

-# TODO(dbaileychess): Figure out how this would now work. I posted a question on
-# https://stackoverflow.com/questions/71772330/override-target-compile-options-via-cmake-command-line.
-# Append FLATBUFFERS_CXX_FLAGS to CMAKE_CXX_FLAGS.
-if(DEFINED FLATBUFFERS_CXX_FLAGS)
-  message(STATUS "extend CXX_FLAGS with ${FLATBUFFERS_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLATBUFFERS_CXX_FLAGS}")
+# source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
+# source_group(Tests FILES ${FlatBuffers_Tests_SRCS})
+
+if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
+  # do not apply any global settings if the toolchain
+  # is being configured externally
+  message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.")
+elseif(APPLE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Wno-unused-parameter")
+  set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
+elseif(CMAKE_COMPILER_IS_GNUCXX)
+  if(CYGWIN)
+    set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -std=gnu++11")
+  else(CYGWIN)
+    set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -std=c++0x")
+  endif(CYGWIN)
+  set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
+  set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
+      set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -faligned-new -Werror=implicit-fallthrough=2")
+    endif()
+    set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter")
+  endif()
+
+  # Certain platforms such as ARM do not use signed chars by default
+  # which causes issues with certain bounds checks.
+  set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -fsigned-char")
+
+elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+  set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic -Werror -Wextra -Wno-unused-parameter")
+  set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
+  if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.8)
+    list(APPEND FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wimplicit-fallthrough" "-Wextra-semi" "-Werror=unused-private-field") # enable warning
+  endif()
+  if(FLATBUFFERS_LIBCXX_WITH_CLANG)
+    if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+      set(CMAKE_CXX_FLAGS
+          "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+    endif()
+    if(NOT ("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD" OR
+            "${CMAKE_SYSTEM_NAME}" MATCHES "Linux"))
+      set(CMAKE_EXE_LINKER_FLAGS
+          "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
+    endif()
+  endif()
+
+  # Certain platforms such as ARM do not use signed chars by default
+  # which causes issues with certain bounds checks.
+  set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -fsigned-char")
+
+elseif(MSVC)
+  # Visual Studio pedantic build settings
+  # warning C4512: assignment operator could not be generated
+  # warning C4316: object allocated on the heap may not be aligned
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /wd4512 /wd4316")
+endif()
+
+if(FLATBUFFERS_CODE_COVERAGE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fprofile-arcs -ftest-coverage")
+  set(CMAKE_EXE_LINKER_FLAGS
+      "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
 endif()
-message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")

 function(add_fsanitize_to_target _target _sanitizer)
-  if(WIN32)
-    target_compile_definitions(${_target} PRIVATE FLATBUFFERS_MEMORY_LEAK_TRACKING)
-    message(STATUS "Sanitizer MSVC::_CrtDumpMemoryLeaks added to ${_target}")
-  else()
  # FLATBUFFERS_CODE_SANITIZE: boolean {ON,OFF,YES,NO} or string with list of sanitizer.
  # List of sanitizer is string starts with '=': "=address,undefined,thread,memory".
-    if(IS_CLANG OR (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.9))
+  if((${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") OR
+    ((${CMAKE_CXX_COMPILER_ID} MATCHES "GNU") AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9"))
+  )
    set(_sanitizer_flags "=address,undefined")
    if(_sanitizer MATCHES "=.*")
      # override default by user-defined sanitizer list
@ -303,287 +256,117 @@ function(add_fsanitize_to_target _target _sanitizer)
      "-fsanitize${_sanitizer_flags}")
    target_link_libraries(${_target} PRIVATE
      "-fsanitize${_sanitizer_flags}")
-      set_target_properties(${_target} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ON)
    message(STATUS "Sanitizer ${_sanitizer_flags} added to ${_target}")
  endif()
-  endif()
 endfunction()

-function(add_pch_to_target _target _pch_header)
-  # the command is available since cmake 3.16
-  if(COMMAND target_precompile_headers)
-    target_precompile_headers(${_target} PRIVATE ${_pch_header})
-    if(NOT MSVC)
-      set_source_files_properties(src/util.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+if(BIICODE)
+  include(biicode/cmake/biicode.cmake)
+  return()
 endif()
-  endif()
-endfunction()

 include_directories(include)
 include_directories(grpc)

-# Creates an interface library that stores the configuration settings that each
-# target links too. This is a compromise between setting configuration globally
-# with add_compile_options() and the more targetted target_compile_options().
-# This way each target in this file can share settings and override them if
-# needed.
-add_library(ProjectConfig INTERFACE)
-target_compile_features(ProjectConfig
-  INTERFACE
-    cxx_std_${FLATBUFFERS_CPP_STD}
-)
-
-# Force the standard to be met.
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-# We shouldn't rely on any compiler-extensions to make things work.
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-if(MSVC_LIKE)
-  target_compile_options(ProjectConfig
-    INTERFACE
-      /W4
-      $<$<BOOL:${FLATBUFFERS_STRICT_MODE}>:
-        /WX       # Treat all compiler warnings as errors
-      >
-      /wd4512   # C4512: assignment operator could not be generated
-      /wd4316   # C4316: object allocated on the heap may not be aligned
-      /wd4456   # C4456: hides previous local declaration
-      $<$<CXX_COMPILER_ID:Clang>:
-        /D_CRT_SECURE_NO_WARNINGS
-      >
-  )
-else()
-  target_compile_options(ProjectConfig
-    INTERFACE
-      -Wall
-      $<$<BOOL:${FLATBUFFERS_STRICT_MODE}>:
-        -Werror   # Treat all compiler warnings as errors
-
-        -fno-rtti # Disable runtime type information
-
-        $<$<CXX_COMPILER_ID:GNU>:
-          # False positive string overflow
-          # https://github.com/google/flatbuffers/issues/7366
-          -Wno-error=stringop-overflow
-        >
-      >
-      -pedantic
-      -Wextra
-      -Wno-unused-parameter
-      -Wold-style-cast
-      -fsigned-char
-      -Wnon-virtual-dtor
-
-      # This isn't working for some reason: $<$<CXX_COMPILER_ID:CLANG>:
-      $<$<BOOL:${IS_CLANG}>:
-        -Wnewline-eof
-        -Wno-unknown-warning-option
-        -Wmissing-declarations
-        -Wzero-as-null-pointer-constant
-        $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,3.8>:
-          -Wimplicit-fallthrough
-          -Wextra-semi
-          $<$<BOOL:${FLATBUFFERS_STRICT_MODE}>:
-            -Werror=unused-private-field
-          >
-        >
-      >
-
-      $<$<CXX_COMPILER_ID:GNU>:
-        $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.4>:
-          -Wunused-result
-          -Wunused-parameter
-          -Werror=unused-parameter
-          -Wmissing-declarations
-        >
-        $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.7>:
-          -Wzero-as-null-pointer-constant
-        >
-        $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,7.0>:
-          -faligned-new
-          $<$<BOOL:${FLATBUFFERS_STRICT_MODE}>:
-            -Werror=implicit-fallthrough=2
-          >
-        >
-        $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,8.0>:
-          -Wextra-semi
-        >
-      >
-
-      $<$<BOOL:${FLATBUFFERS_CODE_COVERAGE}>:
-        -g
-        -fprofile-arcs
-        -ftest-coverage
-      >
-    )
-
-  if(FLATBUFFERS_CODE_COVERAGE)
-    target_link_options(ProjectConfig
-      INTERFACE
-        -fprofile-arcs
-        -ftest-coverage
-    )
-  endif()
-endif()
-
 if(FLATBUFFERS_BUILD_FLATLIB)
  add_library(flatbuffers STATIC ${FlatBuffers_Library_SRCS})
-
-  # Attach header directory for when build via add_subdirectory().
-  target_include_directories(flatbuffers
-    INTERFACE
-      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  )
-  target_link_libraries(flatbuffers PRIVATE $<BUILD_INTERFACE:ProjectConfig>)
-
-  if(FLATBUFFERS_ENABLE_PCH)
-    add_pch_to_target(flatbuffers include/flatbuffers/pch/pch.h)
-  endif()
+  # CMake > 2.8.11: Attach header directory for when build via add_subdirectory().
+  target_include_directories(flatbuffers INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+  target_compile_options(flatbuffers PRIVATE "${FLATBUFFERS_PRIVATE_CXX_FLAGS}")
 endif()

 if(FLATBUFFERS_BUILD_FLATC)
  add_executable(flatc ${FlatBuffers_Compiler_SRCS})
-  if(FLATBUFFERS_ENABLE_PCH)
-    add_pch_to_target(flatc include/flatbuffers/pch/flatc_pch.h)
-  endif()
-
-  target_link_libraries(flatc PRIVATE $<BUILD_INTERFACE:ProjectConfig>)
-  target_compile_options(flatc
-    PRIVATE
-      $<$<AND:$<BOOL:${MSVC_LIKE}>,$<CONFIG:Release>>:
-        /MT
-      >
-  )
-
+  target_compile_options(flatc PRIVATE "${FLATBUFFERS_PRIVATE_CXX_FLAGS}")
  if(FLATBUFFERS_CODE_SANITIZE AND NOT WIN32)
    add_fsanitize_to_target(flatc ${FLATBUFFERS_CODE_SANITIZE})
  endif()
  if(NOT FLATBUFFERS_FLATC_EXECUTABLE)
    set(FLATBUFFERS_FLATC_EXECUTABLE $<TARGET_FILE:flatc>)
  endif()
-  if(FLATBUFFERS_STATIC_FLATC AND NOT MSVC)
-    target_link_libraries(flatc PRIVATE -static)
+  if(MSVC)
+    # Make flatc.exe not depend on runtime dlls for easy distribution.
+    target_compile_options(flatc PUBLIC $<$<CONFIG:Release>:/MT>)
  endif()
 endif()

 if(FLATBUFFERS_BUILD_FLATHASH)
  add_executable(flathash ${FlatHash_SRCS})
-  target_link_libraries(flathash PRIVATE $<BUILD_INTERFACE:ProjectConfig>)
 endif()

 if(FLATBUFFERS_BUILD_SHAREDLIB)
  add_library(flatbuffers_shared SHARED ${FlatBuffers_Library_SRCS})
-  target_link_libraries(flatbuffers_shared PRIVATE $<BUILD_INTERFACE:ProjectConfig>)
-  # FlatBuffers use calendar-based versioning and do not provide any ABI
-  # stability guarantees. Therefore, always use the full version as SOVERSION
-  # in order to avoid breaking reverse dependencies on upgrades.
-  set(FlatBuffers_Library_SONAME_FULL "${PROJECT_VERSION}")
-  set_target_properties(flatbuffers_shared PROPERTIES
-                        OUTPUT_NAME flatbuffers
-                        SOVERSION "${FlatBuffers_Library_SONAME_FULL}"
+
+  # Shared object version: "major.minor.micro"
+  # - micro updated every release when there is no API/ABI changes
+  # - minor updated when there are additions in API/ABI
+  # - major (ABI number) updated when there are changes in ABI (or removals)
+  set(FlatBuffers_Library_SONAME_MAJOR "1")
+  set(FlatBuffers_Library_SONAME_FULL "${FlatBuffers_Library_SONAME_MAJOR}.11.0")
+  set_target_properties(flatbuffers_shared PROPERTIES OUTPUT_NAME flatbuffers
+                        SOVERSION "${FlatBuffers_Library_SONAME_MAJOR}"
                        VERSION "${FlatBuffers_Library_SONAME_FULL}")
-  if(FLATBUFFERS_ENABLE_PCH)
-    add_pch_to_target(flatbuffers_shared include/flatbuffers/pch/pch.h)
-  endif()
 endif()

-function(compile_schema SRC_FBS OPT OUT_GEN_FILE) 
+function(compile_flatbuffers_schema_to_cpp_opt SRC_FBS OPT)
  get_filename_component(SRC_FBS_DIR ${SRC_FBS} PATH)
  string(REGEX REPLACE "\\.fbs$" "_generated.h" GEN_HEADER ${SRC_FBS})
  add_custom_command(
    OUTPUT ${GEN_HEADER}
-    COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}"
-      ${OPT}
-      -o "${SRC_FBS_DIR}"
+    COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --gen-mutable
+            --gen-object-api -o "${SRC_FBS_DIR}"
+            --cpp-ptr-type flatbuffers::unique_ptr # Used to test with C++98 STLs
+            --reflect-names ${OPT}
+            -I "${CMAKE_CURRENT_SOURCE_DIR}/tests/include_test"
            "${CMAKE_CURRENT_SOURCE_DIR}/${SRC_FBS}"
-    DEPENDS flatc ${SRC_FBS}
-    COMMENT "flatc generation: `${SRC_FBS}` -> `${GEN_HEADER}`"
-    )
-  set(${OUT_GEN_FILE} ${GEN_HEADER} PARENT_SCOPE)
+    DEPENDS flatc)
 endfunction()

-function(compile_schema_for_test SRC_FBS OPT)
-  compile_schema("${SRC_FBS}" "${OPT}" GEN_FILE)
-  target_sources(flattests PRIVATE ${GEN_FILE})
+function(compile_flatbuffers_schema_to_cpp SRC_FBS)
+    compile_flatbuffers_schema_to_cpp_opt(${SRC_FBS} "--no-includes;--gen-compare")
 endfunction()

-function(compile_schema_for_samples SRC_FBS OPT)
-  compile_schema("${SRC_FBS}" "${OPT}" GEN_FILE)
-  target_sources(flatsample PRIVATE ${GEN_FILE})
+function(compile_flatbuffers_schema_to_binary SRC_FBS)
+  get_filename_component(SRC_FBS_DIR ${SRC_FBS} PATH)
+  string(REGEX REPLACE "\\.fbs$" ".bfbs" GEN_BINARY_SCHEMA ${SRC_FBS})
+  add_custom_command(
+    OUTPUT ${GEN_BINARY_SCHEMA}
+    COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -b --schema -o "${SRC_FBS_DIR}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${SRC_FBS}"
+    DEPENDS flatc)
 endfunction()

 if(FLATBUFFERS_BUILD_TESTS)
+  compile_flatbuffers_schema_to_cpp(tests/monster_test.fbs)
+  compile_flatbuffers_schema_to_cpp_opt(tests/native_type_test.fbs "")
+  compile_flatbuffers_schema_to_cpp_opt(tests/arrays_test.fbs --scoped-enums)
+  include_directories(${CMAKE_CURRENT_BINARY_DIR}/tests)
  add_executable(flattests ${FlatBuffers_Tests_SRCS})
-  target_link_libraries(flattests PRIVATE $<BUILD_INTERFACE:ProjectConfig>)
-  target_include_directories(flattests PUBLIC 
-    # Ideally everything is fully qualified from the root directories
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    # TODO(derekbailey): update includes to fully qualify src/ and tests/
-    src 
-    tests 
-    ${CMAKE_CURRENT_BINARY_DIR}/tests 
-  )
-
-  # Have tests load data from the source directory, not the build directory.
-  add_definitions(-DFLATBUFFERS_TEST_PATH_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/)
-
-  # The flattest target needs some generated files
-  SET(FLATC_OPT --cpp --gen-mutable --gen-object-api --reflect-names)
-  SET(FLATC_OPT_COMP ${FLATC_OPT};--gen-compare)
-  SET(FLATC_OPT_SCOPED_ENUMS ${FLATC_OPT_COMP};--scoped-enums)
-
-  compile_schema_for_test(tests/alignment_test.fbs "${FLATC_OPT_COMP}")
-  compile_schema_for_test(tests/arrays_test.fbs "${FLATC_OPT_SCOPED_ENUMS}")
-  compile_schema_for_test(tests/native_inline_table_test.fbs "${FLATC_OPT_COMP}")
-  compile_schema_for_test(tests/native_type_test.fbs "${FLATC_OPT}")
-  compile_schema_for_test(tests/key_field/key_field_sample.fbs "${FLATC_OPT_COMP}")
-  compile_schema_for_test(tests/64bit/test_64bit.fbs "${FLATC_OPT_COMP};--bfbs-gen-embed")
-  compile_schema_for_test(tests/64bit/evolution/v1.fbs "${FLATC_OPT_COMP}")
-  compile_schema_for_test(tests/64bit/evolution/v2.fbs "${FLATC_OPT_COMP}")
-  compile_schema_for_test(tests/union_underlying_type_test.fbs "${FLATC_OPT_SCOPED_ENUMS}")
-
+  set_property(TARGET flattests
+    PROPERTY COMPILE_DEFINITIONS FLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE
+    FLATBUFFERS_DEBUG_VERIFICATION_FAILURE=1)
  if(FLATBUFFERS_CODE_SANITIZE)
+    if(WIN32)
+      target_compile_definitions(flattests PRIVATE FLATBUFFERS_MEMORY_LEAK_TRACKING)
+      message(STATUS "Sanitizer MSVC::_CrtDumpMemoryLeaks added to flattests")
+    else()
      add_fsanitize_to_target(flattests ${FLATBUFFERS_CODE_SANITIZE})
    endif()
+  endif()

+  compile_flatbuffers_schema_to_cpp(samples/monster.fbs)
  include_directories(${CMAKE_CURRENT_BINARY_DIR}/samples)
-
  add_executable(flatsamplebinary ${FlatBuffers_Sample_Binary_SRCS})
  add_executable(flatsampletext ${FlatBuffers_Sample_Text_SRCS})
  add_executable(flatsamplebfbs ${FlatBuffers_Sample_BFBS_SRCS})
-
-  # Add a library so there is a single target that the generated samples can 
-  # link too.
-  if(MSVC OR ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.20.0")
-    add_library(flatsample INTERFACE)
-  else()
-    add_library(flatsample STATIC)
-  endif()
-
-  # Since flatsample has no sources, we have to explicitly set the linker lang.
-  set_target_properties(flatsample PROPERTIES LINKER_LANGUAGE CXX)
-  
-  compile_schema_for_samples(samples/monster.fbs "${FLATC_OPT_COMP}")
-
-  target_link_libraries(flatsamplebinary PRIVATE $<BUILD_INTERFACE:ProjectConfig> flatsample)
-  target_link_libraries(flatsampletext PRIVATE $<BUILD_INTERFACE:ProjectConfig> flatsample)
-  target_link_libraries(flatsamplebfbs PRIVATE $<BUILD_INTERFACE:ProjectConfig> flatsample)
-
-  if(FLATBUFFERS_BUILD_CPP17)
-    add_executable(flattests_cpp17 ${FlatBuffers_Tests_CPP17_SRCS})
-    target_link_libraries(flattests_cpp17 PRIVATE $<BUILD_INTERFACE:ProjectConfig>)
-    target_include_directories(flattests_cpp17 PUBLIC src tests)
-    target_compile_features(flattests_cpp17 PRIVATE cxx_std_17) # requires cmake 3.8
-
-    if(FLATBUFFERS_CODE_SANITIZE)
-      add_fsanitize_to_target(flattests_cpp17 ${FLATBUFFERS_CODE_SANITIZE})
-    endif()
-  endif(FLATBUFFERS_BUILD_CPP17)
 endif()

 if(FLATBUFFERS_BUILD_GRPCTEST)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -Wno-shadow")
+  endif()
  if(NOT GRPC_INSTALL_PATH)
    message(SEND_ERROR "GRPC_INSTALL_PATH variable is not defined. See grpc/README.md")
  endif()
@ -592,22 +375,13 @@ if(FLATBUFFERS_BUILD_GRPCTEST)
  endif()
  INCLUDE_DIRECTORIES(${GRPC_INSTALL_PATH}/include)
  INCLUDE_DIRECTORIES(${PROTOBUF_DOWNLOAD_PATH}/src)
-  find_package(Threads REQUIRED)
-  list(APPEND CMAKE_PREFIX_PATH ${GRPC_INSTALL_PATH})
-  find_package(absl CONFIG REQUIRED)
-  find_package(protobuf CONFIG REQUIRED)
-  find_package(gRPC CONFIG REQUIRED)
+  LINK_DIRECTORIES(${GRPC_INSTALL_PATH}/lib)
  add_executable(grpctest ${FlatBuffers_GRPCTest_SRCS})
-  target_link_libraries(grpctest
-    PRIVATE
-      $<BUILD_INTERFACE:ProjectConfig>
-      gRPC::grpc++_unsecure
-      gRPC::gpr
-      pthread
-      dl
-  )
+  target_link_libraries(grpctest grpc++_unsecure grpc_unsecure gpr pthread dl)
 endif()

+include(CMake/Version.cmake)
+
 if(FLATBUFFERS_INSTALL)
  include(GNUInstallDirs)

@ -615,24 +389,28 @@ if(FLATBUFFERS_INSTALL)

  set(FB_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/flatbuffers")

-  configure_file(CMake/flatbuffers-config-version.cmake.in flatbuffers-config-version.cmake @ONLY)
+  configure_file(CMake/FlatbuffersConfigVersion.cmake.in FlatbuffersConfigVersion.cmake @ONLY)
  install(
-      FILES
-        "CMake/flatbuffers-config.cmake"
-        "CMake/BuildFlatBuffers.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/flatbuffers-config-version.cmake"
+      FILES "CMake/FlatbuffersConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FlatbuffersConfigVersion.cmake"
      DESTINATION ${FB_CMAKE_DIR}
  )

  if(FLATBUFFERS_BUILD_FLATLIB)
+    if(CMAKE_VERSION VERSION_LESS 3.0)
      install(
-      TARGETS flatbuffers EXPORT FlatBuffersTargets
+        TARGETS flatbuffers EXPORT FlatbuffersTargets
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      )
+    else()
+      install(
+        TARGETS flatbuffers EXPORT FlatbuffersTargets
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
      )
+    endif()

-    install(EXPORT FlatBuffersTargets
-      FILE FlatBuffersTargets.cmake
+    install(EXPORT FlatbuffersTargets
+      FILE FlatbuffersTargets.cmake
      NAMESPACE flatbuffers::
      DESTINATION ${FB_CMAKE_DIR}
    )
@ -653,27 +431,28 @@ if(FLATBUFFERS_INSTALL)
  endif()

  if(FLATBUFFERS_BUILD_SHAREDLIB)
+    if(CMAKE_VERSION VERSION_LESS 3.0)
      install(
-      TARGETS flatbuffers_shared EXPORT FlatBuffersSharedTargets
+        TARGETS flatbuffers_shared EXPORT FlatbuffersSharedTargets
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+      )
+    else()
+      install(
+        TARGETS flatbuffers_shared EXPORT FlatbuffersSharedTargets
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
      )
-
-    install(
-      EXPORT FlatBuffersSharedTargets
-      FILE FlatBuffersSharedTargets.cmake
-      NAMESPACE flatbuffers::
-      DESTINATION ${FB_CMAKE_DIR}
-    )
    endif()

-  if(FLATBUFFERS_BUILD_SHAREDLIB OR FLATBUFFERS_BUILD_FLATLIB)
-      configure_file(CMake/flatbuffers.pc.in flatbuffers.pc @ONLY)
  install(
-        FILES "${CMAKE_CURRENT_BINARY_DIR}/flatbuffers.pc"
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+      EXPORT FlatbuffersSharedTargets
+      FILE FlatbuffersSharedTargets.cmake
+      NAMESPACE flatbuffers::
+      DESTINATION ${FB_CMAKE_DIR}
    )
  endif()
 endif()
@ -681,10 +460,9 @@ endif()
 if(FLATBUFFERS_BUILD_TESTS)
  enable_testing()

+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/tests" DESTINATION
+       "${CMAKE_CURRENT_BINARY_DIR}")
  add_test(NAME flattests COMMAND flattests)
-  if(FLATBUFFERS_BUILD_CPP17)
-    add_test(NAME flattests_cpp17 COMMAND flattests_cpp17)
-  endif()
  if(FLATBUFFERS_BUILD_GRPCTEST)
    add_test(NAME grpctest COMMAND grpctest)
  endif()
@ -696,23 +474,9 @@ if(UNIX)
    # Use of CPack only supported on Linux systems.
    if(FLATBUFFERS_PACKAGE_DEBIAN)
        include(CMake/PackageDebian.cmake)
-        include(CPack)
    endif()
    if (FLATBUFFERS_PACKAGE_REDHAT)
        include(CMake/PackageRedhat.cmake)
+    endif()
    include(CPack)
 endif()
-endif()
-
-# Include for running Google Benchmarks.
-if(FLATBUFFERS_BUILD_BENCHMARKS)
-  add_subdirectory(benchmarks)
-endif()
-
-# Add FlatBuffers::FlatBuffers interface, needed for FetchContent_Declare
-add_library(FlatBuffers INTERFACE)
-add_library(FlatBuffers::FlatBuffers ALIAS FlatBuffers)
-target_include_directories(
-  FlatBuffers
-  INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/include>)
--- a/third_party/flatbuffers/FlatBuffers.podspec
+++ b/third_party/flatbuffers/FlatBuffers.podspec
@ -1,21 +0,0 @@
-Pod::Spec.new do |s|
-  s.name             = 'FlatBuffers'
-  s.version          = '24.3.25'
-  s.summary          = 'FlatBuffers: Memory Efficient Serialization Library'
-
-  s.description      = "FlatBuffers is a cross platform serialization library architected for
-  maximum memory efficiency. It allows you to directly access serialized
-  data without parsing/unpacking it first, while still having great 
-  forwards/backwards compatibility."
-
-  s.homepage         = 'https://github.com/google/flatbuffers'
-  s.license          = { :type => 'Apache2.0', :file => 'LICENSE' }
-  s.author           = { 'mustii' => 'mustii@mmk.one' }
-  s.source           = { :git => 'https://github.com/google/flatbuffers.git', :tag => s.version.to_s, :submodules => true }
-
-  s.ios.deployment_target = '11.0'
-  s.osx.deployment_target = '10.14'
-
-  s.swift_version = '5.0'
-  s.source_files = 'swift/Sources/Flatbuffers/*.swift'
-end
--- a/third_party/flatbuffers/Formatters.md
+++ b/third_party/flatbuffers/Formatters.md
@ -1,22 +0,0 @@
-# Format Guidelines
-
-If you are interesting in contributing to the flatbuffers project, please take a second to read this document. Each language has it's own set of rules, that are defined in their respective formatter/linter documents.
-
-# Notes
-
- Run the linter on the language you are working on before making a Pull Request.
- DONT format/lint the generated code.
-
-# Languages
-
-## C++
-
-C++ uses `clang-format` as it's formatter. Run the following script `sh scripts/clang-format-git.sh`, and it should style the C++ code according to [google style guide](https://google.github.io/styleguide/cppguide.html).
-
-## Swift
-
-Swift uses swiftformat as it's formatter. Take a look at [how to install here](https://github.com/nicklockwood/SwiftFormat/blob/master/README.md#how-do-i-install-it). Run the following command `swiftformat --config swift.swiftformat .` in the root directory of the project
-
-## Typescript
-
-Typescript uses eslint as it's linter. Take a look at [how to install here](https://eslint.org/docs/user-guide/getting-started). Run the following command `eslint ts/** --ext .ts` in the root directory of the project
--- a/third_party/flatbuffers/LICENSE.txt
+++ b/third_party/flatbuffers/LICENSE.txt
@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 Google Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/third_party/flatbuffers/Package.swift
+++ b/third_party/flatbuffers/Package.swift
@ -1,36 +0,0 @@
-// swift-tools-version:5.6
-/*
- * Copyright 2020 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import PackageDescription
-
-let package = Package(
-  name: "FlatBuffers",
-  platforms: [
-    .iOS(.v11),
-    .macOS(.v10_14),
-  ],
-  products: [
-    .library(
-      name: "FlatBuffers",
-      targets: ["FlatBuffers"]),
-  ],
-  targets: [
-    .target(
-      name: "FlatBuffers",
-      dependencies: [],
-      path: "swift/Sources"),
-  ])
--- a/third_party/flatbuffers/Package@swift-5.5.swift
+++ b/third_party/flatbuffers/Package@swift-5.5.swift
@ -1,37 +0,0 @@
-// swift-tools-version:5.5
-/*
- * Copyright 2020 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import PackageDescription
-
-let package = Package(
-  name: "FlatBuffers",
-  platforms: [
-    .iOS(.v11),
-    .macOS(.v10_14),
-  ],
-  products: [
-    .library(
-      name: "FlatBuffers",
-      targets: ["FlatBuffers"]),
-  ],
-  targets: [
-    .target(
-      name: "FlatBuffers",
-      dependencies: [],
-      path: "swift/Sources"),
-  ])
-
--- a/third_party/flatbuffers/README.md
+++ b/third_party/flatbuffers/README.md
@ -1,118 +0,0 @@
-![logo](http://google.github.io/flatbuffers/fpl_logo_small.png) FlatBuffers
-===========
-
-![Build status](https://github.com/google/flatbuffers/actions/workflows/build.yml/badge.svg?branch=master)
-[![BuildKite status](https://badge.buildkite.com/7979d93bc6279aa539971f271253c65d5e8fe2fe43c90bbb25.svg)](https://buildkite.com/bazel/flatbuffers)
-[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/flatbuffers.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:flatbuffers)
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/google/flatbuffers/badge)](https://api.securityscorecards.dev/projects/github.com/google/flatbuffers)
-[![Join the chat at https://gitter.im/google/flatbuffers](https://badges.gitter.im/google/flatbuffers.svg)](https://gitter.im/google/flatbuffers?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Discord Chat](https://img.shields.io/discord/656202785926152206.svg)](https:///discord.gg/6qgKs3R)
-[![Twitter Follow](https://img.shields.io/twitter/follow/wvo.svg?style=social)](https://twitter.com/wvo)
-[![Twitter Follow](https://img.shields.io/twitter/follow/dbaileychess.svg?style=social)](https://twitter.com/dbaileychess)
-
-
-**FlatBuffers** is a cross platform serialization library architected for
-maximum memory efficiency. It allows you to directly access serialized data without parsing/unpacking it first, while still having great forwards/backwards compatibility.
-
-## Quick Start
-
-1. Build the compiler for flatbuffers (`flatc`)
-
-    Use `cmake` to create the build files for your platform and then perform the compliation (Linux example).
-
-    ```
-    cmake -G "Unix Makefiles"
-    make -j
-    ```
-
-2. Define your flatbuffer schema (`.fbs`)
-
-    Write the [schema](https://flatbuffers.dev/flatbuffers_guide_writing_schema.html) to define the data you want to serialize. See [monster.fbs](https://github.com/google/flatbuffers/blob/master/samples/monster.fbs) for an example.
-
-3. Generate code for your language(s)
-
-    Use the `flatc` compiler to take your schema and generate language-specific code:
-
-    ```
-    ./flatc --cpp --rust monster.fbs
-    ```
-    
-    Which generates `monster_generated.h` and `monster_generated.rs` files.
-
-4. Serialize data
-
-    Use the generated code, as well as the `FlatBufferBuilder` to construct your serialized buffer. ([`C++` example](https://github.com/google/flatbuffers/blob/master/samples/sample_binary.cpp#L24-L56))
-
-5. Transmit/store/save Buffer
-
-    Use your serialized buffer however you want. Send it to someone, save it for later, etc...
-
-6. Read the data
-
-    Use the generated accessors to read the data from the serialized buffer.
-    
-    It doesn't need to be the same language/schema version, FlatBuffers ensures the data is readable across languages and schema versions. See the [`Rust` example](https://github.com/google/flatbuffers/blob/master/samples/sample_binary.rs#L92-L106) reading the data written by `C++`.
-
-## Documentation
-
-**Go to our [landing page][] to browse our documentation.**
-
-## Supported operating systems
- Windows
- macOS
- Linux
- Android
- And any others with a recent C++ compiler (C++ 11 and newer)
-
-## Supported programming languages
-
-Code generation and runtime libraries for many popular languages.
-
-1. C
-1. C++ - [snapcraft.io](https://snapcraft.io/flatbuffers)
-1. C# - [nuget.org](https://www.nuget.org/packages/Google.FlatBuffers)
-1. Dart - [pub.dev](https://pub.dev/packages/flat_buffers)
-1. Go - [go.dev](https://pkg.go.dev/github.com/google/flatbuffers)
-1. Java - [Maven](https://search.maven.org/artifact/com.google.flatbuffers/flatbuffers-java)
-1. JavaScript - [NPM](https://www.npmjs.com/package/flatbuffers)
-1. Kotlin
-1. Lobster
-1. Lua
-1. PHP
-1. Python - [PyPI](https://pypi.org/project/flatbuffers/)
-1. Rust - [crates.io](https://crates.io/crates/flatbuffers)
-1. Swift - [swiftpackageindex](https://swiftpackageindex.com/google/flatbuffers)
-1. TypeScript - [NPM](https://www.npmjs.com/package/flatbuffers)
-1. Nim
-
-## Versioning
-
-FlatBuffers does not follow traditional SemVer versioning (see [rationale](https://github.com/google/flatbuffers/wiki/Versioning)) but rather uses a format of the date of the release.
-
-## Contribution
-
-* [FlatBuffers Issues Tracker][] to submit an issue.
-* [stackoverflow.com][] with [`flatbuffers` tag][] for any questions regarding FlatBuffers.
-
-*To contribute to this project,* see [CONTRIBUTING][].
-
-## Community
-
-* [Discord Server](https:///discord.gg/6qgKs3R)
-
-## Security
-
-Please see our [Security Policy](SECURITY.md) for reporting vulnerabilities.
-
-## Licensing
-*Flatbuffers* is licensed under the Apache License, Version 2.0. See [LICENSE][] for the full license text.
-
-<br>
-
-   [CONTRIBUTING]: http://github.com/google/flatbuffers/blob/master/CONTRIBUTING.md
-   [`flatbuffers` tag]: https://stackoverflow.com/questions/tagged/flatbuffers
-   [FlatBuffers Google Group]: https://groups.google.com/forum/#!forum/flatbuffers
-   [FlatBuffers Issues Tracker]: http://github.com/google/flatbuffers/issues
-   [stackoverflow.com]: http://stackoverflow.com/search?q=flatbuffers
-   [landing page]: https://google.github.io/flatbuffers
-   [LICENSE]: https://github.com/google/flatbuffers/blob/master/LICENSE
--- a/third_party/flatbuffers/SECURITY.md
+++ b/third_party/flatbuffers/SECURITY.md
@ -1,11 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-To report a security issue, please use http://g.co/vulnz. We use
-http://g.co/vulnz for our intake, and do coordination and disclosure here on
-GitHub (including using GitHub Security Advisory). The Google Security Team will
-respond within 5 working days of your report on g.co/vulnz.
-
-Select the `I want to report a technical security or an abuse risk related bug
-in a Google product (SQLi, XSS, etc.)` option and complete the form.
--- a/third_party/flatbuffers/WORKSPACE
+++ b/third_party/flatbuffers/WORKSPACE
@ -1,169 +1,18 @@
 workspace(name = "com_github_google_flatbuffers")

-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
-
-http_archive(
-    name = "platforms",
-    sha256 = "3a561c99e7bdbe9173aa653fd579fe849f1d8d67395780ab4770b1f381431d51",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz",
-        "https://github.com/bazelbuild/platforms/releases/download/0.0.7/platforms-0.0.7.tar.gz",
-    ],
-)
-
-http_archive(
-    name = "build_bazel_rules_apple",
-    sha256 = "34c41bfb59cdaea29ac2df5a2fa79e5add609c71bb303b2ebb10985f93fa20e7",
-    url = "https://github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz",
-)
-
-load(
-    "@build_bazel_rules_apple//apple:repositories.bzl",
-    "apple_rules_dependencies",
-)
-
-apple_rules_dependencies()
-
-http_archive(
-    name = "build_bazel_rules_swift",
-    sha256 = "a2fd565e527f83fb3f9eb07eb9737240e668c9242d3bc318712efa54a7deda97",
-    url = "https://github.com/bazelbuild/rules_swift/releases/download/0.27.0/rules_swift.0.27.0.tar.gz",
-)
-
-load(
-    "@build_bazel_rules_swift//swift:repositories.bzl",
-    "swift_rules_dependencies",
-)
-
-swift_rules_dependencies()
-
-load(
-    "@build_bazel_rules_swift//swift:extras.bzl",
-    "swift_rules_extra_dependencies",
-)
-
-swift_rules_extra_dependencies()
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

 http_archive(
    name = "io_bazel_rules_go",
-    sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
+        "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.18.6/rules_go-0.18.6.tar.gz",
+        "https://github.com/bazelbuild/rules_go/releases/download/0.18.6/rules_go-0.18.6.tar.gz",
    ],
+    sha256 = "f04d2373bcaf8aa09bccb08a98a57e721306c8f6043a2a0ee610fd6853dcde3d",
 )

-load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies")
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

 go_rules_dependencies()

-##### Protobuf
-_PROTOBUF_VERSION = "3.15.2"
-
-http_archive(
-    name = "com_google_protobuf",
-    strip_prefix = "protobuf-" + _PROTOBUF_VERSION,
-    urls = [
-        "https://github.com/protocolbuffers/protobuf/archive/v" + _PROTOBUF_VERSION + ".tar.gz",
-    ],
-)
-
-##### GRPC
-_GRPC_VERSION = "1.49.0"  # https://github.com/grpc/grpc/releases/tag/v1.48.0
-
-http_archive(
-    name = "com_github_grpc_grpc",
-    patch_args = ["-p1"],
-    patches = ["//grpc:build_grpc_with_cxx14.patch"],
-    sha256 = "15715e1847cc9e42014f02c727dbcb48e39dbdb90f79ad3d66fe4361709ff935",
-    strip_prefix = "grpc-" + _GRPC_VERSION,
-    urls = ["https://github.com/grpc/grpc/archive/refs/tags/v" + _GRPC_VERSION + ".tar.gz"],
-)
-
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
-grpc_deps()
-
-load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
-
-grpc_extra_deps()
-
-# rules_go from https://github.com/bazelbuild/rules_go/releases/tag/v0.34.0
-
-http_archive(
-    name = "aspect_rules_js",
-    sha256 = "76a04ef2120ee00231d85d1ff012ede23963733339ad8db81f590791a031f643",
-    strip_prefix = "rules_js-1.34.1",
-    url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.1/rules_js-v1.34.1.tar.gz",
-)
-
-load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
-
-rules_js_dependencies()
-
-load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock", "pnpm_repository")
-
-pnpm_repository(name = "pnpm")
-
-http_archive(
-    name = "aspect_rules_ts",
-    sha256 = "4c3f34fff9f96ffc9c26635d8235a32a23a6797324486c7d23c1dfa477e8b451",
-    strip_prefix = "rules_ts-1.4.5",
-    url = "https://github.com/aspect-build/rules_ts/releases/download/v1.4.5/rules_ts-v1.4.5.tar.gz",
-)
-
-load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
-
-rules_ts_dependencies(
-    # Since rules_ts doesn't always have the newest integrity hashes, we
-    # compute it manually here.
-    #   $ curl --silent https://registry.npmjs.org/typescript/5.3.3 | jq ._integrity
-    ts_integrity = "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
-    ts_version_from = "//:package.json",
-)
-
-load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
-
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = DEFAULT_NODE_VERSION,
-)
-
-npm_translate_lock(
-    name = "npm",
-    npmrc = "//:.npmrc",
-    pnpm_lock = "//:pnpm-lock.yaml",
-    # Set this to True when the lock file needs to be updated, commit the
-    # changes, then set to False again.
-    update_pnpm_lock = False,
-    verify_node_modules_ignored = "//:.bazelignore",
-)
-
-load("@npm//:repositories.bzl", "npm_repositories")
-
-npm_repositories()
-
-http_archive(
-    name = "aspect_rules_esbuild",
-    sha256 = "098e38e5ee868c14a6484ba263b79e57d48afacfc361ba30137c757a9c4716d6",
-    strip_prefix = "rules_esbuild-0.15.0",
-    url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.15.0/rules_esbuild-v0.15.0.tar.gz",
-)
-
-# Register a toolchain containing esbuild npm package and native bindings
-load("@aspect_rules_esbuild//esbuild:repositories.bzl", "LATEST_ESBUILD_VERSION", "esbuild_register_toolchains")
-
-esbuild_register_toolchains(
-    name = "esbuild",
-    esbuild_version = LATEST_ESBUILD_VERSION,
-)
-
-http_file(
-    name = "bazel_linux_x86_64",
-    downloaded_file_path = "bazel",
-    executable = True,
-    sha256 = "e78fc3394deae5408d6f49a15c7b1e615901969ecf6e50d55ef899996b0b8458",
-    urls = [
-        "https://github.com/bazelbuild/bazel/releases/download/6.3.2/bazel-6.3.2-linux-x86_64",
-    ],
-)
+go_register_toolchains()
--- a/third_party/flatbuffers/android/AndroidManifest.xml
+++ b/third_party/flatbuffers/android/AndroidManifest.xml
@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013 Google, Inc.
+
+     This software is provided 'as-is', without any express or implied
+     warranty.  In no event will the authors be held liable for any damages
+     arising from the use of this software.
+     Permission is granted to anyone to use this software for any purpose,
+     including commercial applications, and to alter it and redistribute it
+     freely, subject to the following restrictions:
+     1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+     2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+     3. This notice may not be removed or altered from any source distribution.
+ -->
+<!-- BEGIN_INCLUDE(manifest) -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.example.FlatBufferTest">
+
+    <uses-feature android:glEsVersion="0x00020000"></uses-feature>
+
+    <!-- This .apk has no Java code itself, so set hasCode to false. -->
+    <application android:label="@string/app_name"
+                 android:hasCode="false"
+                 android:allowBackup="false">
+        <!-- Our activity is the built-in NativeActivity framework class.
+             This will take care of integrating with our NDK code. -->
+        <activity android:name="android.app.NativeActivity"
+                android:label="@string/app_name"
+                android:configChanges="orientation|keyboardHidden"
+                android:screenOrientation="landscape">
+            <!-- Tell NativeActivity the name of or .so -->
+            <meta-data android:name="android.app.lib_name"
+                    android:value="FlatBufferTest" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
+<!-- END_INCLUDE(manifest) -->
--- a/third_party/flatbuffers/android/build.gradle
+++ b/third_party/flatbuffers/android/build.gradle
@ -0,0 +1,108 @@
+// Copyright (c) 2017 Google, Inc.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty.  In no event will the authors be held liable for any damages
+// arising from the use of this software.
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+buildscript {
+  repositories {
+    jcenter()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:2.3.0'
+  }
+}
+
+allprojects {
+  repositories {
+    jcenter()
+  }
+}
+
+apply plugin: 'com.android.application'
+
+android {
+  compileSdkVersion 25
+  buildToolsVersion '25.0.2'
+
+  sourceSets {
+    main {
+      manifest.srcFile 'AndroidManifest.xml'
+      res.srcDirs = ['res']
+    }
+  }
+
+  externalNativeBuild {
+    ndkBuild {
+      path "jni/Android.mk"
+    }
+  }
+
+  defaultConfig {
+    applicationId 'com.example.FlatBufferTest'
+    // This is the platform API where NativeActivity was introduced.
+    minSdkVersion 9
+    targetSdkVersion 25
+    versionCode 1
+    versionName "1.0"
+
+    buildTypes {
+      release {
+        minifyEnabled false
+      }
+    }
+
+    externalNativeBuild {
+      ndkBuild {
+        targets "FlatBufferTest"
+        arguments "-j" + Runtime.getRuntime().availableProcessors()
+        abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+      }
+    }
+  }
+
+  lintOptions {
+    abortOnError false
+  }
+
+  // Build with each STL variant.
+  productFlavors {
+    stlport {
+      applicationIdSuffix ".stlport"
+      versionNameSuffix "-stlport"
+      externalNativeBuild {
+        ndkBuild {
+          arguments "APP_STL=stlport_static"
+        }
+      }
+    }
+    gnustl {
+      applicationIdSuffix ".gnustl"
+      versionNameSuffix "-gnustl"
+      externalNativeBuild {
+        ndkBuild {
+          arguments "APP_STL=gnustl_static"
+        }
+      }
+    }
+    libcpp {
+      applicationIdSuffix ".libcpp"
+      versionNameSuffix "-libcpp"
+      externalNativeBuild {
+        ndkBuild {
+          arguments "APP_STL=c++_static"
+        }
+      }
+    }
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dennis	4ec1652781	Remove example (no one uses this)	2024-07-10 13:25:25 +02:00
Dennis	3cdcba165b	Simplify CMakeLists.txt	2024-07-10 12:51:46 +02:00