Update github actions and appveyor to have C++ 20

Author: ThijsWithaar

.github/workflows/cmake.yml

@@ -9,7 +9,7 @@ on:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: RelWithDebInfo
-  VCPKG_REF: '408ffb232c30189278a3deb30fb51622036692d5'
+  VCPKG_REF: '000d1bda1ffa95a73e0b40334fa4103d6f4d3d48'
 
 jobs:
   build-windows:
@@ -63,18 +63,30 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
 
+    - name: Install Clang
+      run: |
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 17
+        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 170
+        sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 170
+        sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
+        sudo update-alternatives --config clang
+        sudo update-alternatives --config clang++
+        sudo update-alternatives --config c++
+
     - name: Install build dependencies
       # Catch2 is not yet in the ubuntu repo, so install it ourselves
       run: |
         sudo apt-get install -y ghostscript imagemagick
         sudo apt-get install -y libboost-all-dev qtbase5-dev qttools5-dev
-        sudo git clone -b v2.x https://github.com/catchorg/Catch2.git /tmp/catch2
-        sudo cmake -H/tmp/catch2 -B/tmp/catch2.build -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr
+        sudo git clone -b v3.4.0 https://github.com/catchorg/Catch2.git /tmp/catch2
+        sudo cmake -S/tmp/catch2 -B/tmp/catch2.build -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr
         sudo cmake --build /tmp/catch2.build -- install
 
     - name: Configure CMake

appveyor.yml

@@ -1,6 +1,6 @@
 image:
- - Visual Studio 2019
- - ubuntu2004
+ - Visual Studio 2022
+ - ubuntu2204
 
 configuration:
  - release
@@ -15,15 +15,15 @@ environment:
   APPVEYOR_SAVE_CACHE_ON_ERROR: true
   VCPKG_DIR: C:\Tools\vcpkg
   VCPKG_BINARY_SOURCES: 'clear;files,C:\Tools\vcpkg.cache,readwrite'
-  VCPKG_REF: '408ffb232c30189278a3deb30fb51622036692d5'
+  VCPKG_REF: '000d1bda1ffa95a73e0b40334fa4103d6f4d3d48'
   VCPKG_DEFAULT_TRIPLET: x64-windows
   QT_DIR: C:\Qt\5.15\msvc2019_64
   BUILD_TYPE: RelWithDebInfo
 
 init:
  - echo %APPVEYOR_BUILD_WORKER_IMAGE%
  - echo %CONFIGURATION%
- - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+ - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
  #- cmd: set Path=%QT_DIR%\bin;%Path%
 
 install:
@@ -42,18 +42,18 @@ install:
  - sh: sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
  - sh: sudo add-apt-repository ppa:mhier/libboost-latest
  - sh: wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
- - sh: sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
+ - sh: sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
  - sh: sudo apt update -q
  - sh: sudo apt install -yq build-essential ninja-build git cmake clang imagemagick
  - sh: sudo apt install -yq libboost-all-dev qtbase5-dev qttools5-dev
  #      Catch2 is not yet in a repo, so build+install ourselves
- - sh: git clone -b v2.x https://github.com/catchorg/Catch2.git ~/catch2
+ - sh: git clone -b v3.4.0 https://github.com/catchorg/Catch2.git ~/catch2
  - sh: cmake -S~/catch2 -B~/catch2.build -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr
  - sh: sudo cmake --build ~/catch2.build -- install
 
 
 before_build:
- - cmd: cmake -G "Visual Studio 16 2019" -A x64 -T v142 -DVCPKG_TARGET_TRIPLET=%VCPKG_DEFAULT_TRIPLET% -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -H%APPVEYOR_BUILD_FOLDER% -B%APPVEYOR_BUILD_FOLDER%/build
+ - cmd: cmake -G "Visual Studio 17 2022" -A x64 -DVCPKG_TARGET_TRIPLET=%VCPKG_DEFAULT_TRIPLET% -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -H%APPVEYOR_BUILD_FOLDER% -B%APPVEYOR_BUILD_FOLDER%/build
  - sh: cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -S${APPVEYOR_BUILD_FOLDER} -B${APPVEYOR_BUILD_FOLDER}/build
 
 build_script:

lib/network/ssdpBridge.cc

@@ -1,6 +1,6 @@
 #include <Denon/network/ssdpBridge.h>
 
-#define DEBUG_LVL 1
+//#define DEBUG_LVL 2
 #ifdef DEBUG_LVL
 	#include <iostream>
 #endif
@@ -73,8 +73,10 @@ void Bridge::OnReceiveFromServer(boost::asio::ip::address_v4 sender, const std::
 			m_cache.services[key] = *pNotify;
 		}
 
-		//std::cout << "Server: Notify -> client\n";
-		//m_Client.send(data);
+		#if DEBUG_LVL > 0
+			std::cout << "Server: Notify -> client\n";
+		#endif
+		m_Client.broadcast(data);
 	}
 	else if(auto pResponse = std::get_if<Ssdp::Response>(&sn))
 	{

qtui/SsdpClient.cc

@@ -49,7 +49,7 @@ void SsdpClient::onRead()
 		}
 		catch(std::exception& e)
 		{
-			std::throw_with_nested(std::runtime_error("Ssdp Parse error: "sv + e.what()));
+			std::throw_with_nested(std::runtime_error(std::string("Ssdp Parse error: ") + e.what()));
 		}
 	}
 };

qtui/UpnpEvents.cc

@@ -1,15 +1,14 @@
 #include "UpnpEvents.h"
 
+#include <iostream>
+#include <sstream>
 #include <boost/property_tree/xml_parser.hpp>
 
 
 #include <Denon/network/http.h>
 #include <Denon/string.h>
 #include <Denon/upnpEvent.h>
 
-#include <iostream>
-#include <sstream>
-
 
 constexpr int listenPort = 49200;
 constexpr int uPnpPort = 60006;
@@ -121,7 +120,7 @@ void UpnpEvents::onCbRead()
 		}
 		catch(std::exception& e)
 		{
-			std::throw_with_nested(std::runtime_error("UpnpEvents.onCbRead, parsing failed: "sv + e.what()));
+			std::throw_with_nested(std::runtime_error(std::string("UpnpEvents.onCbRead, parsing failed: ") + e.what()));
 		}
 
 		Denon::Http::Response resp;

test/CMakeLists.txt

@@ -27,7 +27,7 @@ endforeach()
 
 target_link_libraries(${PROJECT_NAME}
 	Denon
-	Catch2::Catch2
+	Catch2::Catch2WithMain
 )
 
 include(CTest)

test/avTransport.cc

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 //#include <catch2/catch_test_macros.hpp>
 
 #include <Denon/network/ssdp.h>

test/http.cc

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 //#include <catch2/catch_test_macros.hpp>
 
 #include <iostream>

test/main.cc

@@ -1,5 +1,4 @@
-#include <catch2/catch.hpp>
-//#include <catch2/catch_all.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <iostream>