From 1db3c55b488fbc4f2936fd6e4656b70aa53c42f5 Mon Sep 17 00:00:00 2001
From: llyyr <llyyr.public@gmail.com>
Date: Sun, 16 Oct 2022 19:21:43 +0530
Subject: [PATCH] Fix build with catch2>=3.0.0

---
 test/SafeSignal.cpp  |  2 +-
 test/config.cpp      |  2 +-
 test/main.cpp        | 19 ++++++++++---------
 test/waybar_time.cpp |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/SafeSignal.cpp b/test/SafeSignal.cpp
index 6a1e17a5..7ff6f2ae 100644
--- a/test/SafeSignal.cpp
+++ b/test/SafeSignal.cpp
@@ -2,7 +2,7 @@
 
 #include <glibmm.h>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <thread>
 #include <type_traits>
 
diff --git a/test/config.cpp b/test/config.cpp
index 29b0502a..cdc96b0c 100644
--- a/test/config.cpp
+++ b/test/config.cpp
@@ -1,6 +1,6 @@
 #include "config.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 TEST_CASE("Load simple config", "[config]") {
   waybar::Config conf;
diff --git a/test/main.cpp b/test/main.cpp
index 5eb060d9..7970c262 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -3,8 +3,8 @@
 #include <spdlog/sinks/stdout_sinks.h>
 #include <spdlog/spdlog.h>
 
-#include <catch2/catch.hpp>
-#include <catch2/catch_reporter_tap.hpp>
+#include <catch2/catch_all.hpp>
+#include <catch2/reporters/catch_reporter_tap.hpp>
 #include <memory>
 
 int main(int argc, char* argv[]) {
@@ -13,13 +13,14 @@ int main(int argc, char* argv[]) {
 
   session.applyCommandLine(argc, argv);
   const auto logger = spdlog::default_logger();
-  const auto& reporter_name = session.config().getReporterName();
-  if (reporter_name == "tap") {
-    spdlog::set_pattern("# [%l] %v");
-  } else if (reporter_name == "compact") {
-    logger->sinks().clear();
-  } else {
-    logger->sinks().assign({std::make_shared<spdlog::sinks::stderr_sink_st>()});
+  for (const auto& spec : session.config().getReporterSpecs()) {
+    if (spec.name() == "tap") {
+      spdlog::set_pattern("# [%l] %v");
+    } else if (spec.name() == "compact") {
+      logger->sinks().clear();
+    } else {
+      logger->sinks().assign({std::make_shared<spdlog::sinks::stderr_sink_st>()});
+    }
   }
 
   return session.run();
diff --git a/test/waybar_time.cpp b/test/waybar_time.cpp
index 5fc3312d..79469d41 100644
--- a/test/waybar_time.cpp
+++ b/test/waybar_time.cpp
@@ -3,7 +3,7 @@
 #include <date/date.h>
 #include <date/tz.h>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <chrono>
 #include <stdexcept>