From a3b24035a025dc1fb25db8a5f97ffa86709ca29c Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Fri, 22 Dec 2023 18:25:14 -0400 Subject: [PATCH 1/2] Update dependency libraries --- .gitignore | 3 +++ conanfile.txt | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3dac48a13..83447f79a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ docs/internals/html appimage/*.AppImage /test-config*.yaml localconfig/ +.cache/ +.vscode/ +build/ diff --git a/conanfile.txt b/conanfile.txt index a6bf34638..cc0c602be 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,12 +1,12 @@ [requires] -catch2/3.4.0 +catch2/3.5.0 corrade/2020.06 -cpp-httplib/0.14.1 +cpp-httplib/0.14.3 docopt.cpp/0.6.3 fast-cpp-csv-parser/cci.20211104 json-schema-validator/2.2.0 -libmaxminddb/1.7.1 -nlohmann_json/3.11.2 +libmaxminddb/1.8.0 +nlohmann_json/3.11.3 openssl/1.1.1w opentelemetry-proto/1.0.0 pcapplusplus/23.09 @@ -17,6 +17,7 @@ uvw/3.2.0 libpcap/1.10.4 yaml-cpp/0.8.0 robin-hood-hashing/3.11.5 +libcurl/8.5.0 crashpad/cci.20220219 zlib/[>=1.2.10 <1.3] From 8b7e0087b8c1d28d8237c9a4ecccacf75f9c07c8 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Fri, 22 Dec 2023 19:09:06 -0400 Subject: [PATCH 2/2] Dont update json --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index cc0c602be..cb8d7c1f6 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -6,7 +6,7 @@ docopt.cpp/0.6.3 fast-cpp-csv-parser/cci.20211104 json-schema-validator/2.2.0 libmaxminddb/1.8.0 -nlohmann_json/3.11.3 +nlohmann_json/3.11.2 openssl/1.1.1w opentelemetry-proto/1.0.0 pcapplusplus/23.09