From d4e2dcf1f141ed21d2f82204dcf8f2db37007861 Mon Sep 17 00:00:00 2001 From: Kai-Uwe Hermann Date: Thu, 21 Mar 2024 15:27:59 +0100 Subject: [PATCH 1/2] Move libevse-security dependency before libocpp Update it to the version used in libocpp Signed-off-by: Kai-Uwe Hermann # Conflicts: # dependencies.yaml --- dependencies.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 37993d941..a531826ef 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -46,6 +46,14 @@ libcurl: git_tag: curl-8_4_0 cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBCURL" +# EvseSecurity +# This has to appear before libocpp in this file since it is also a direct dependency of libocpp +# and would otherwise be overwritten by the version used there +libevse-security: + git: https://github.com/EVerest/libevse-security.git + git_tag: bce1ba4 + cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBEVSE_SECURITY" + # OCPP libocpp: git: https://github.com/EVerest/libocpp.git @@ -75,12 +83,7 @@ everest-utils: git: https://github.com/EVerest/everest-utils.git git_tag: v0.2.1 cmake_condition: "EVEREST_CORE_BUILD_TESTING" -# evse-security, since this is a direct dependency of libocpp it will get overwritten by the version set there -# setting it here can be misleading since it does not affect the version being used -libevse-security: - git: https://github.com/EVerest/libevse-security.git - git_tag: bce1ba4 - cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBEVSE_SECURITY" + # unit testing gtest: # GoogleTest now follows the Abseil Live at Head philosophy. We recommend updating to the latest commit in the main branch as often as possible. From 54745656ab61a6a7f4c569818b965f1e960cd631 Mon Sep 17 00:00:00 2001 From: Kai-Uwe Hermann Date: Thu, 21 Mar 2024 12:25:56 +0100 Subject: [PATCH 2/2] Update everest-framework to v0.11.0 Signed-off-by: Kai-Uwe Hermann --- dependencies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.yaml b/dependencies.yaml index a531826ef..1aa2f85ff 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ --- everest-framework: git: https://github.com/EVerest/everest-framework.git - git_tag: v0.10.1 + git_tag: v0.11.0 options: ["BUILD_TESTING OFF"] sigslot: git: https://github.com/palacaze/sigslot