.github/workflows/ci.yaml

@@ -0,0 +1,107 @@
+name: CI
+
+on: 
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 0 1 * *' # This line schedules the workflow to run at 00:00 on the first day of every month
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            compiler: gcc
+          - os: ubuntu-latest
+            compiler: clang
+          - os: windows-latest
+            compiler: msvc
+          - os: macos-latest
+            compiler:
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/vcpkg
+            ~/vcpkg_installed
+            ${{ env.HOME }}/.cache/vcpkg/archives
+            ${{ env.XDG_CACHE_HOME }}/vcpkg/archives
+            ${{ env.LOCALAPPDATA }}\vcpkg\archives
+            ${{ env.APPDATA }}\vcpkg\archives
+          key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('./vcpkg.json')}}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.BUILD_TYPE }}-
+
+      - name: Setup Cpp
+        uses: aminya/setup-cpp@v1
+        with:
+          compiler: ${{ matrix.compiler }}
+          vcvarsall: ${{ contains(matrix.os, 'windows') }}
+          cmake: true
+          ninja: true
+          vcpkg: true
+          cppcheck: false
+
+      - name: Install compiler for Macos
+        if: startsWith(matrix.os, 'macos')
+        run: |
+          brew install llvm
+
+      - name: Prepare the PATH
+        run: |
+            if [[ "${{ runner.os }}" == "Windows" ]]; then
+                echo "$env:USERPROFILE\vcpkg" >> $GITHUB_PATH
+                echo "$env:USERPROFILE\ninja" >> $GITHUB_PATH
+            else
+                echo "$HOME/vcpkg" >> $GITHUB_PATH
+                echo "$HOME/ninja" >> $GITHUB_PATH
+            fi
+
+      - name: Install dependencies
+        run: |
+            cp -v ci/vcpkg/vcpkg.json .
+            vcpkg install
+
+      - name: Build project
+        run: |
+          pushd ~
+          if [ -d build ]; then
+            echo "Build dir exists"
+            ls -la build
+          else
+            mkdir -v build
+          fi
+          cd build
+          pwd
+          set -x
+          cmake -DVCPKG_INSTALLED_DIR=~/vcpkg_installed -DVCPKG_VERBOSE=ON -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_BUILD_TYPE=Release -G "Ninja" -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake ${GITHUB_WORKSPACE}
+          cmake --build .
+          popd
+        continue-on-error: true
+
+      - name: Dump diagnostics
+        if: failure()
+        run: |
+          cd ~/build
+          echo "---------------------------------"
+          cat build.ninja
+          echo "---------------------------------"
+
+      - name: Run Unit Tests
+        run: |
+          pushd ~/build
+          ctest -R UNITTESTS . -C Release
+          popd

CMakeLists.txt

@@ -1,17 +1,11 @@
-cmake_minimum_required(VERSION 3.0)
-
-if (UNIX)
-    # Ninja creates too many problems while maintaining
-    # compatibility with old and new versions of Linux/Cmake
-    set (CMAKE_GENERATOR "Unix Makefiles" CACHE INTERNAL "" FORCE)
-endif()
+cmake_minimum_required(VERSION 3.10)
 
 if (DEFINED ENV{RESTC_CPP_VERSION})
     set(RESTC_CPP_VERSION $ENV{RESTC_CPP_VERSION})
 endif()
 
 if (NOT DEFINED RESTC_CPP_VERSION)
-    set(RESTC_CPP_VERSION 0.99.0)
+    set(RESTC_CPP_VERSION 1.0.0)
 endif()
 
 if(NOT DEFINED RESTC_BOOST_VERSION)
@@ -22,6 +16,18 @@ project (restc-cpp VERSION ${RESTC_CPP_VERSION})
 
 message(STATUS "Building restc-cpp version ${PROJECT_VERSION}")
 
+include(CheckCXXCompilerFlag)
+
+if (MSVC)
+    # Thank you Microsoft. Its so nice of you to give us all these meaningful reasons to stay up all night.
+    check_cxx_compiler_flag("/std:c++20" COMPILER_SUPPORTS_CXX20)
+    check_cxx_compiler_flag("/std:c++17" COMPILER_SUPPORTS_CXX17)
+    add_compile_options(/Zc:__cplusplus)
+else()
+    check_cxx_compiler_flag("-std=c++20" COMPILER_SUPPORTS_CXX20)
+    check_cxx_compiler_flag("-std=c++17" COMPILER_SUPPORTS_CXX17)
+endif()
+
 if (NOT DEFINED INSTALL_RAPIDJSON_HEADERS)
     option(INSTALL_RAPIDJSON_HEADERS "Install rapidjson headers when make install is executed" ON)
 endif()
@@ -32,6 +38,30 @@ option(RESTC_CPP_AUTORUN_UNIT_TESTS "Run Unit Tests automatically after build" O
 
 option(RESTC_CPP_WITH_FUNCTIONALT_TESTS "Enable Functional Testing" ON)
 
+option(RESTC_USE_LEGACY_BOOST_FIND "Use the old Boost find module" OFF)
+
+set(GTEST_TAG "main" CACHE STRING "Gtest branch to use. Required on older Linux versions because newer gtest requure newer cmake!")
+set(LOGFAULT_TAG "master" CACHE STRING "Logfault branch to use. Required on older Linux versions because newer gtest requure newer cmake!")
+
+find_package(RapidJSON QUIET)
+
+if (NOT RapidJSON_FOUND AND INSTALL_RAPIDJSON_HEADERS)
+    message(STATUS "Rapidjson not found. Adding it as an external project.")
+    set(RESTC_CPP_EXTERNAL_DEPS ${RESTC_CPP_EXTERNAL_DEPS} externalRapidJson)
+    set(restc_cpp_add_rapidjson ON)
+endif()
+
+if (RESTC_CPP_LOG_WITH_LOGFAULT)
+    find_path(LOGFAULT logfault/logfault.h)
+    if (LOGFAULT)
+        message ("Using existing logfault")
+    else()
+        message ("Embedding logfault header only library")
+        set(RESTC_CPP_EXTERNAL_DEPS ${RESTC_CPP_EXTERNAL_DEPS} externalLogfault)
+        set(restc_cpp_add_logfault ON)
+    endif()
+endif()
+
 include(cmake_scripts/external-projects.cmake)
 
 if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
@@ -68,7 +98,26 @@ option(RESTC_CPP_LOG_JSON_SERIALIZATION "Enable trace logging for json serializa
 
 option(RESTC_CPP_WITH_ZLIB "Use zlib" ON)
 
-option(RESTC_CPP_USE_CPP17 "Use the C++17 standard" ON)
+option(RESTC_CPP_USE_CPP14 "Use the C++14 standard" OFF)
+
+option(RESTC_CPP_USE_CPP17 "Use the C++17 standard" OFF)
+
+option(RESTC_CPP_USE_CPP20 "Use the C++20 standard" OFF)
+
+if (NOT RESTC_CPP_USE_CPP14 AND NOT RESTC_CPP_USE_CPP17 AND NOT RESTC_CPP_USE_CPP20)
+    # Check if GCC 12 is being used and default it to C++17
+    # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1887728.html
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0)
+        message(STATUS "GCC 12 detected, defaulting to C++17")
+        set(RESTC_CPP_USE_CPP17 ON)
+    elseif (COMPILER_SUPPORTS_CXX20)
+        set(RESTC_CPP_USE_CPP20 ON)
+    elseif (COMPILER_SUPPORTS_CXX17)
+        set(RESTC_CPP_USE_CPP17 ON)
+    else ()
+        set(RESTC_CPP_USE_CPP14 ON)
+    endif()
+endif()
 
 option(RESTC_CPP_THREADED_CTX "Allow asio contextx with multiple therads. Enables thread-safe internal access." OFF)
 
@@ -139,7 +188,10 @@ endif()
 message(STATUS "Using ${CMAKE_CXX_COMPILER}")
 
 macro(SET_CPP_STANDARD target)
-    if (RESTC_CPP_USE_CPP17)
+    if (RESTC_CPP_USE_CPP20)
+        message(STATUS "Using C++ 20 for ${target}")
+        set_property(TARGET ${target} PROPERTY CXX_STANDARD 20)
+    elseif (RESTC_CPP_USE_CPP17)
         message(STATUS "Using C++ 17 for ${target}")
         set_property(TARGET ${target} PROPERTY CXX_STANDARD 17)
     else()
@@ -168,6 +220,7 @@ set(ACTUAL_SOURCES
     src/RequestBodyStringImpl.cpp
     src/RequestBodyFileImpl.cpp
     src/url_encode.cpp
+    src/boost_compitability.cpp
     ${LOGGING_SRC}
     )
 
@@ -179,14 +232,7 @@ if (RESTC_CPP_WITH_ZLIB)
     set(ACTUAL_SOURCES ${ACTUAL_SOURCES} src/ZipReaderImpl.cpp)
 endif()
 
-if (WIN32)
-    include(cmake_scripts/pch.cmake)
-    ADD_MSVC_PRECOMPILED_HEADER(restc-cpp/restc-cpp.h src/pch.cpp ACTUAL_SOURCES)
-    add_definitions(-DWAR_PCH)
-    set(SOURCES ${ACTUAL_SOURCES} src/pch.cpp ${HEADERS} ${RESFILES})
-else()
-    set(SOURCES ${ACTUAL_SOURCES})
-endif()
+set(SOURCES ${ACTUAL_SOURCES})
 
 add_library(${PROJECT_NAME} ${SOURCES})
 set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_OUTPUT_NAME restc-cppD)
@@ -199,21 +245,21 @@ target_include_directories(${PROJECT_NAME}
 
 SET_CPP_STANDARD(${PROJECT_NAME})
 
-if (RESTC_CPP_LOG_WITH_LOGFAULT)
-    find_path(LOGFAULT logfault/logfault.h)
-    if (LOGFAULT)
-        message ("Using existing logfault")
-    else()
-        message ("Embedding logfault header only library")
-        set(RESTC_CPP_EXTERNAL_DEPS ${RESTC_CPP_EXTERNAL_DEPS} externalLogfault)
-    endif()
+if(NOT "${RESTC_CPP_EXTERNAL_DEPS}" STREQUAL "")
+    add_dependencies(${PROJECT_NAME} ${RESTC_CPP_EXTERNAL_DEPS})
 endif()
 
-add_dependencies(${PROJECT_NAME} externalRapidJson ${RESTC_CPP_EXTERNAL_DEPS})
-
 if (NOT EMBEDDED_RESTC_CPP)
-    #set(Boost_USE_MULTITHREADED ON)
-    find_package(Boost ${RESTC_BOOST_VERSION} REQUIRED COMPONENTS
+
+    if (RESTC_USE_LEGACY_BOOST_FIND)
+        unset(restc_cpp_boost_find_config)
+        message("Using legacy Boost find config")
+    elseif(CMAKE_VERSION VERSION_GREATER "3.28")
+        set(restc_cpp_boost_find_config CONFIG)
+        message("Using new Boost find config")
+    endif()
+
+    find_package(Boost ${RESTC_BOOST_VERSION} REQUIRED ${restc_cpp_boost_find_config} COMPONENTS
         system
         program_options
         filesystem
@@ -223,6 +269,9 @@ if (NOT EMBEDDED_RESTC_CPP)
         chrono
         ${BOOST_LOG_DEP}
         )
+
+    message(STATUS "Boost version found: ${Boost_VERSION}")
+
     target_include_directories(${PROJECT_NAME} PUBLIC ${Boost_INCLUDE_DIRS})
     target_link_libraries(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES})
     target_compile_definitions(${PROJECT_NAME} PUBLIC -DBOOST_COROUTINE_NO_DEPRECATION_WARNING=1)
@@ -255,16 +304,12 @@ if (NOT EMBEDDED_RESTC_CPP)
         link_directories(${Boost_LIBRARY_DIRS})
     endif()
 
-    include(cmake_scripts/pch.cmake)
-
-    set_property(TARGET  PROPERTY CXX_STANDARD 17)
-
     if(WIN32)
         add_definitions(-D_WIN32_WINNT=0x0600)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
     endif()
 
-    set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib CACHE PATH "Destination location")
+    set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Destination location")
     link_directories(${LIBRARY_OUTPUT_PATH})
 
     include(cmake_scripts/doxygen.cmake)

README.md

@@ -1,3 +1,5 @@
+[![CI](https://github.com/jgaa/restc-cpp/actions/workflows/ci.yaml/badge.svg)](https://github.com/jgaa/restc-cpp/actions/workflows/ci.yaml)
+
 # Introduction to the restc-cpp C++ library
 <i>The magic that takes the pain out of accessing JSON API's from C++ </i>
 
@@ -73,7 +75,7 @@ that experience. So I spent a few weeks creating my own HTTP Client library
 using boost::asio with JSON serialization/deserialization.
 
 # Dependencies
-Restc-cpp depends on C++14 with its standard libraries and:
+Restc-cpp depends on C++14 (or newer) with its standard libraries and:
   - boost
   - rapidjson (CMake will download and install rapidjson for the project)
   - gtest (CMake will download and install gtest for the project if it is not installed)
@@ -251,25 +253,43 @@ Please refer to the [tutorial](doc/Tutorial.md) for more examples.
 # Current Status
 The project has been in public BETA since April 11th 2017.
 
+# Supported compilers
+These are the compilers that are being tested before anything is merged to the master branch.
+
+- g++ from 8 to 14
+- clang (current)
+- msvc (current)
+- Apple clang (current)
+
+# Supported C++ standards
+These are the C++ versions that are are being tested before anything is merged to the master branch.
+
+- C++14
+- C++17
+- C++20
+
 # Supported operating systems
 These are the operating systems where my Continues Integration (Jenkins) servers currently compiles the project and run all the tests:
 
  - Debian Testing
  - Debian Bookworm
  - Debian Bullseye
  - Debian Buster
- - Windows 10 / Microsoft Visual Studio 2019, Community version using vcpkg for dependencies
- - Ubuntu Xenial (LTS)
+ - Windows 10 / Microsoft Visual Studio 2022, Community version using vcpkg for dependencies
+ - Ubuntu Noble (LTS)
  - Ubuntu Jammy (LTS)
-
-Support for MacOS has been removed after Apples announcement that their love for privacy was just 
-a marketing gimmick.
-
-Fedora is currently disabled in my CI because of failures to start their Docker containers. (Work in progress). 
+ - Ubuntu Bionic (LTS)
+ - Fedora (latest)
+ - MacOS (latest)
 
 The Jenkins setup is [here](ci/jenkins).
 
-I currently use my own CI infrastructure running on my own hardware. I use Jenkins on a VM with Debian Bullseye, and three slaves for Docker on Linux VM's, one slave running on a VM with Microsoft Windows 10 Pro. Using Docker to build with different Linux distributions gives me flexibility. It also immediately catches mistakes that break the build or test(s) on a specific Linux distribution or platform. Using my own infrastructure improves the security, as I don't share any credentials with 3rd party services or allow external access into my LAN.
+I currently use my own CI infrastructure running on my own hardware. I use Jenkins on a VM with Debian Bookworm, and three slaves for Docker on Linux VM's, one slave running on a VM with Microsoft Windows 10 Pro. Using Docker to build with different Linux distributions gives me flexibility. It also immediately catches mistakes that break the build or test(s) on a specific Linux distribution or platform. Using my own infrastructure improves the security, as I don't share any credentials with 3rd party services or allow external access into my LAN. 
+
+Github Actions can not compile for various Linux variants (at least not on the free plan for Open Source projects), 
+and it can not run multiple docker-containers (or even *any* containers for Windows or MacOS builds) to allow integration testing.
+I have configured it for this repository anyway, because it's automation setup is different than the Jenkins setup,
+which have helped identifying some issues with the projects cmake files.
 
 # Blog-posts about the project:
   - [About version 0.90](https://lastviking.eu/restc_cpp_90.html)

ci/jenkins/Dockefile.debian-buster

@@ -8,7 +8,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get -q update &&\
     DEBIAN_FRONTEND="noninteractive" apt-get install -y -q \
     openssh-server g++ git \
     build-essential \
-    zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
+    zlib1g-dev g++ cmake make libboost-all-dev libssl-dev libgtest-dev \
     default-jdk &&\
     apt-get -y -q autoremove &&\
     apt-get -y -q clean

ci/jenkins/Dockefile.ubuntu-xenial

@@ -9,7 +9,7 @@ RUN apt-get -q update &&\
     apt-get -y -q --no-install-recommends upgrade &&\
     apt-get -y -q install openssh-server g++ git \
     automake autoconf build-essential \
-    zlib1g-dev g++ cmake make libboost-all-dev libssl-dev \
+    zlib1g-dev g++ cmake make libboost-all-dev libssl-dev libgtest-dev \
     openjdk-8-jdk &&\
     apt-get -y -q autoremove &&\
     apt-get -y -q clean