Use the latest version (3.11.3) of nlohmann_json

Dobiasd · Jan 16, 2024 · 38c5244 · 38c5244
1 parent 5532171
commit 38c5244
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
           sudo ln -s /usr/local/include/eigen3/Eigen /usr/local/include/Eigen
           cd ../..
           # json
-          git clone -b 'v3.10.5' --single-branch --depth 1 https://github.com/nlohmann/json
+          git clone -b 'v3.11.3' --single-branch --depth 1 https://github.com/nlohmann/json
           cd json
           mkdir -p build && cd build
           cmake -DJSON_BuildTests=OFF ..

diff --git a/INSTALL.md b/INSTALL.md
@@ -22,7 +22,7 @@ make && sudo make install
 sudo ln -s /usr/local/include/eigen3/Eigen /usr/local/include/Eigen
 cd ../..
 
-git clone -b 'v3.10.5' --single-branch --depth 1 https://github.com/nlohmann/json
+git clone -b 'v3.11.3' --single-branch --depth 1 https://github.com/nlohmann/json
 cd json
 mkdir -p build && cd build
 cmake -DJSON_BuildTests=OFF ..

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,7 +1,7 @@
 [requires]
 eigen/3.4.0
 functionalplus/v0.2.22
-nlohmann_json/3.10.5
+nlohmann_json/3.11.3
 
 [generators]
 CMakeToolchain

diff --git a/test/Dockerfile b/test/Dockerfile
@@ -31,7 +31,7 @@ WORKDIR /
 
 RUN git clone -b 'v0.2.22' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus && cd FunctionalPlus && mkdir -p build && cd build && cmake .. && make && make install
 RUN git clone -b '3.4.0' --single-branch --depth 1 https://gitlab.com/libeigen/eigen.git && cd eigen && mkdir -p build && cd build && cmake .. && make && make install && ln -s /usr/local/include/eigen3/Eigen /usr/local/include/Eigen
-RUN git clone -b 'v3.10.5' --single-branch --depth 1 https://github.com/nlohmann/json && cd json && mkdir -p build && cd build && cmake -DJSON_BuildTests=OFF .. && make && make install
+RUN git clone -b 'v3.11.3' --single-branch --depth 1 https://github.com/nlohmann/json && cd json && mkdir -p build && cd build && cmake -DJSON_BuildTests=OFF .. && make && make install
 
 ADD include frugally-deep/include
 ADD keras_export frugally-deep/keras_export