From 5d6acfd1d40934a2bb3c94e593f705a12a76b5c8 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Mon, 19 Feb 2024 16:49:27 -0800
Subject: [PATCH] test: restore compatibility with older Catch2 releases

---
 meson.build                | 1 -
 test/css_reload_helper.cpp | 1 -
 test/date.cpp              | 2 +-
 test/main.cpp              | 5 +++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 2678cb13..46ff9926 100644
--- a/meson.build
+++ b/meson.build
@@ -558,7 +558,6 @@ endif
 
 catch2 = dependency(
     'catch2',
-    version: '>=3.5.1',
     default_options: [ 'tests=false' ],
     fallback: ['catch2', 'catch2_dep'],
     required: get_option('tests'),
diff --git a/test/css_reload_helper.cpp b/test/css_reload_helper.cpp
index 01850bc3..f3888a83 100644
--- a/test/css_reload_helper.cpp
+++ b/test/css_reload_helper.cpp
@@ -4,7 +4,6 @@
 
 #if __has_include(<catch2/catch_test_macros.hpp>)
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_all.hpp>
 #else
 #include <catch2/catch.hpp>
 #endif
diff --git a/test/date.cpp b/test/date.cpp
index 004d6aa8..d317f98a 100644
--- a/test/date.cpp
+++ b/test/date.cpp
@@ -7,7 +7,7 @@
 
 #if __has_include(<catch2/catch_test_macros.hpp>)
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_all.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #else
 #include <catch2/catch.hpp>
 #endif
diff --git a/test/main.cpp b/test/main.cpp
index daeee69e..15e17b0f 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -3,8 +3,9 @@
 #include <spdlog/sinks/stdout_sinks.h>
 #include <spdlog/spdlog.h>
 
-#if __has_include(<catch2/catch_all.hpp>)
-#include <catch2/catch_all.hpp>
+#if __has_include(<catch2/catch_session.hpp>)
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_version_macros.hpp>
 #include <catch2/reporters/catch_reporter_tap.hpp>
 #else
 #include <catch2/catch.hpp>