From 6eb3fb09a163e08e7f154c9e1a707f435655ca88 Mon Sep 17 00:00:00 2001
From: Dobiasd <editgym@gmail.com>
Date: Wed, 21 Feb 2024 11:17:34 +0100
Subject: [PATCH] Use the latest FunctionalPlus version (0.2.23), bump
 frugally-deep version to 0.15.31

---
 .github/workflows/ci.yml | 2 +-
 CMakeLists.txt           | 2 +-
 INSTALL.md               | 4 ++--
 conanfile.txt            | 2 +-
 test/Dockerfile          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88e9eed6..33f9de02 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
           echo "Version numbers of TensorFlow and Keras:"
           python3 -c "import tensorflow as tf; import tensorflow.keras; print(tf.__version__)"
           # FunctionalPlus
-          git clone -b 'v0.2.22' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus
+          git clone -b 'v0.2.23' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus
           cd FunctionalPlus
           mkdir -p build && cd build
           cmake ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 115fc343..93292a36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND CMAKE_MODULE_PATH "${FDEEP_TOP_DIR}/cmake")
 
 include(cmake/hunter.cmake) # default off
 
-project(frugally-deep VERSION 0.15.30)
+project(frugally-deep VERSION 0.15.31)
 
 message(STATUS "===( ${PROJECT_NAME} ${PROJECT_VERSION} )===")
 
diff --git a/INSTALL.md b/INSTALL.md
index fe99ba38..b5dbfef9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -7,7 +7,7 @@ Installation
 You can install frugally-deep using cmake as shown below, or (if you prefer) download the [code](https://github.com/Dobiasd/frugally-deep/archive/master.zip) (and the [code](https://github.com/Dobiasd/FunctionalPlus/archive/master.zip) of [FunctionalPlus](https://github.com/Dobiasd/FunctionalPlus)), extract it and tell your compiler to use the `include` directories.
 
 ```
-git clone -b 'v0.2.22' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus
+git clone -b 'v0.2.23' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus
 cd FunctionalPlus
 mkdir -p build && cd build
 cmake ..
@@ -63,7 +63,7 @@ Just add a *conanfile.txt* with frugally-deep as a requirement and chose the gen
 
 ```
 [requires]
-frugally-deep/v0.15.30@dobiasd/stable
+frugally-deep/v0.15.31@dobiasd/stable
 
 [generators]
 cmake
diff --git a/conanfile.txt b/conanfile.txt
index 9497a28f..45a2bcee 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -1,6 +1,6 @@
 [requires]
 eigen/3.4.0
-functionalplus/v0.2.22
+functionalplus/v0.2.23
 nlohmann_json/3.11.3
 
 [generators]
diff --git a/test/Dockerfile b/test/Dockerfile
index c2ec8226..5c5bade1 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -29,7 +29,7 @@ RUN ./bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_p
 RUN pip install /tmp/tensorflow_pkg/tensorflow-2.15.0-cp310-cp310-linux_x86_64.whl
 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 'v0.2.23' --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.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