Update to C++23 standard

chronoxor · Nov 19, 2023 · 6d30827 · 6d30827
1 parent 34100be
commit 6d30827
Show file tree

Hide file tree

Showing 19 changed files with 204 additions and 116 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,3 +6,4 @@ images/* linguist-vendored
 modules/* linguist-vendored
 temp/* linguist-vendored
 tools/* linguist-vendored
+www/* linguist-vendored
diff --git a/.github/workflows/build-linux-clang.yml b/.github/workflows/build-linux-clang.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup required packages"
         run: sudo apt-get install -y binutils-dev libssl-dev uuid-dev

diff --git a/.github/workflows/build-linux-gcc.yml b/.github/workflows/build-linux-gcc.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup required packages"
         run: sudo apt-get install -y binutils-dev libssl-dev uuid-dev

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup python"
         uses: actions/setup-python@v4

diff --git a/.github/workflows/build-windows-mingw.yml b/.github/workflows/build-windows-mingw.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup cmake"
         run: cmake --version
@@ -21,8 +21,8 @@ jobs:
 
       - name: "Build"
         env:
-          INCLUDE: C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\x86_64-w64-mingw32\include
-          LIB: C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\x86_64-w64-mingw32\lib
+          INCLUDE: C:\mingw64\x86_64-w64-mingw32\include
+          LIB: C:\mingw64\x86_64-w64-mingw32\lib
         run: |
           cd build
           ./mingw.bat
diff --git a/.github/workflows/build-windows-msys2.yml b/.github/workflows/build-windows-msys2.yml
@@ -12,7 +12,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup MSYS2"
         uses: msys2/setup-msys2@v2

diff --git a/.github/workflows/build-windows-vs.yml b/.github/workflows/build-windows-vs.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup Visual Studio"
         uses: egor-tensin/vs-shell@v2

diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
@@ -14,7 +14,7 @@ jobs:
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: "Setup cmake"
         run: cmake --version

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -124,8 +124,8 @@ if(NOT CPPSERVER_MODULE)
   file(GLOB TESTS_SOURCE_FILES "tests/*.cpp")
   add_executable(cppserver-tests ${TESTS_HEADER_FILES} ${TESTS_INLINE_FILES} ${TESTS_SOURCE_FILES})
   set_target_properties(cppserver-tests PROPERTIES COMPILE_FLAGS "${PEDANTIC_COMPILE_FLAGS}" FOLDER "tests")
-  target_include_directories(cppserver-tests PRIVATE Catch2::Catch2)
-  target_link_libraries(cppserver-tests ${LINKLIBS} Catch2::Catch2WithMain)
+  target_include_directories(cppserver-tests PRIVATE Catch2)
+  target_link_libraries(cppserver-tests ${LINKLIBS} Catch2)
   list(APPEND INSTALL_TARGETS cppserver-tests)
   list(APPEND INSTALL_TARGETS_PDB cppserver-tests)
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2023 Ivan Shynkarenka
+Copyright (c) 2016-2024 Ivan Shynkarenka
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
 # CppServer
 
 [![Awesome C++](https://awesome.re/badge.svg)](https://github.com/fffaraz/awesome-cpp)
+[![License](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
+[![Release](https://img.shields.io/github/release/chronoxor/CppServer.svg?sort=semver)](https://github.com/chronoxor/CppServer/releases)
 <br/>
 [![Linux (clang)](https://github.com/chronoxor/CppServer/actions/workflows/build-linux-clang.yml/badge.svg)](https://github.com/chronoxor/CppServer/actions/workflows/build-linux-clang.yml)
 [![Linux (gcc)](https://github.com/chronoxor/CppServer/actions/workflows/build-linux-gcc.yml/badge.svg)](https://github.com/chronoxor/CppServer/actions/workflows/build-linux-gcc.yml)
-<br/>
 [![MacOS](https://github.com/chronoxor/CppServer/actions/workflows/build-macos.yml/badge.svg)](https://github.com/chronoxor/CppServer/actions/workflows/build-macos.yml)
 <br/>
 [![Windows (MSYS2)](https://github.com/chronoxor/CppServer/actions/workflows/build-windows-msys2.yml/badge.svg)](https://github.com/chronoxor/CppServer/actions/workflows/build-windows-msys2.yml)