This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/509-remove-deprecated-version
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 2ea4904f43aad6c896db8a92c9cebcdae768742c
Merge: a727b468 70548d61
Author: Pepijn Noltes <pnol...@apache.org>
AuthorDate: Thu Feb 8 19:16:32 2024 +0100
Merge remote-tracking branch 'origin/master' into
feature/509-remove-deprecated-version
# Conflicts:
#
bundles/remote_services/remote_service_admin_dfi/src/import_registration_dfi.c
# libs/dfi/gtest/src/dyn_interface_tests.cpp
# libs/dfi/gtest/src/dyn_message_tests.cpp
.github/workflows/coverage.yml | 6 +-
.github/workflows/ubuntu.yml | 2 +-
CMakeLists.txt | 5 +-
.../src/export_registration_dfi.c | 8 +-
.../src/import_registration_dfi.c | 58 +-
.../gtest/src/RsaJsonRpcUnitTestSuite.cc | 33 -
.../rsa_rpc_json/src/rsa_json_rpc_endpoint_impl.c | 9 +-
.../rsa_rpc_json/src/rsa_json_rpc_impl.c | 1 +
.../rsa_rpc_json/src/rsa_json_rpc_proxy_impl.c | 25 +-
cmake/CelixDeps.cmake.in | 1 -
cmake/celix_project/CodeCoverage.cmake | 4 +-
conanfile.py | 3 +
libs/dfi/CMakeLists.txt | 12 +-
libs/dfi/error_injector/CMakeLists.txt | 3 +-
libs/dfi/error_injector/dfi/CMakeLists.txt | 1 -
libs/dfi/error_injector/dfi/include/dfi_ei.h | 2 -
libs/dfi/error_injector/dfi/src/dfi_ei.cc | 7 -
.../error_injector/ffi}/CMakeLists.txt | 16 +-
.../{dfi/include/dfi_ei.h => ffi/include/ffi_ei.h} | 16 +-
libs/dfi/error_injector/ffi/src/ffi_ei.cc | 44 +
libs/dfi/gtest/CMakeLists.txt | 30 +-
libs/dfi/gtest/descriptors/example6.descriptor | 6 +-
libs/dfi/gtest/descriptors/example7.descriptor | 13 +
.../gtest/descriptors/invalids/garbage.descriptor | 1 +
.../invalids/invalidExtraSection.descriptor | 15 +
.../invalidInterfaceAnnotations.descriptor | 13 +
.../invalids/invalidMetaType.descriptor | 2 +-
...tor => invalidMethodMissingEquality.descriptor} | 2 +-
...=> invalidMethodMissingFunctionName.descriptor} | 2 +-
...escriptor => invalidMethodMissingId.descriptor} | 2 +-
...descriptor => invalidMsgMissingName.descriptor} | 3 +-
...criptor => invalidMsgMissingNewline.descriptor} | 4 +-
.../invalids/invalidMsgMissingVersion.descriptor | 3 +-
...ersion.descriptor => invalidMsgType.descriptor} | 4 +-
.../invalids/invalidTypeMissingEquality.descriptor | 10 +
...> invalidTypeUnrecognizedSimpleType.descriptor} | 4 +-
.../invalids/methodMissingHandle.descriptor | 13 +
...riptor => methodWithMultipleHandles.descriptor} | 4 +-
.../invalids/methodWithTooManyArgs.descriptor | 10 +
.../invalids/methodWithoutArguments.descriptor | 13 +
.../descriptors/invalids/multiOutArgs.descriptor | 1 -
...tArgs.descriptor => multiPreOutArgs.descriptor} | 1 -
.../gtest/descriptors/invalids/noName.descriptor | 12 +
.../gtest/descriptors/invalids/noType.descriptor | 12 +
...idMetaType.descriptor => noTypeName.descriptor} | 4 +-
.../invalids/outArgAtWrongPosition.descriptor | 8 +
libs/dfi/gtest/src/dyn_closure_tests.cpp | 14 -
libs/dfi/gtest/src/dyn_common_ei_tests.cc | 84 ++
libs/dfi/gtest/src/dyn_common_tests.cc | 149 ++++
libs/dfi/gtest/src/dyn_example_functions.c | 4 +
libs/dfi/gtest/src/dyn_example_functions.h | 2 +
libs/dfi/gtest/src/dyn_function_ei_tests.cc | 112 +++
libs/dfi/gtest/src/dyn_function_tests.cpp | 184 ++--
libs/dfi/gtest/src/dyn_interface_ei_tests.cc | 101 +++
libs/dfi/gtest/src/dyn_interface_tests.cpp | 264 ++++--
libs/dfi/gtest/src/dyn_message_ei_tests.cc | 45 +
libs/dfi/gtest/src/dyn_message_tests.cpp | 92 +-
libs/dfi/gtest/src/dyn_type_ei_tests.cc | 192 ++++
libs/dfi/gtest/src/dyn_type_tests.cpp | 338 ++++++-
libs/dfi/gtest/src/json_rpc_ei_tests.cc | 189 ++++
libs/dfi/gtest/src/json_rpc_test.c | 67 ++
.../src/json_rpc_test.h} | 41 +-
libs/dfi/gtest/src/json_rpc_tests.cpp | 719 +++++++--------
libs/dfi/gtest/src/json_serializer_ei_tests.cc | 172 ++++
libs/dfi/gtest/src/json_serializer_tests.cpp | 242 ++++-
libs/dfi/include/dfi_log_util.h | 78 --
libs/dfi/include/dyn_function.h | 54 +-
libs/dfi/include/dyn_interface.h | 67 +-
libs/dfi/include/dyn_message.h | 51 +-
libs/dfi/include/dyn_type.h | 128 +--
libs/dfi/include/json_rpc.h | 10 +-
libs/dfi/include/json_serializer.h | 20 +-
libs/dfi/src/dyn_common.c | 184 ++--
libs/dfi/{include => src}/dyn_common.h | 35 +-
libs/dfi/src/dyn_descriptor.c | 178 ++++
libs/dfi/src/dyn_descriptor.h | 51 ++
libs/dfi/src/dyn_function.c | 323 ++++---
libs/dfi/src/dyn_function_common.h | 23 +-
libs/dfi/src/dyn_interface.c | 459 +++-------
libs/dfi/src/dyn_interface_common.h | 6 +-
libs/dfi/src/dyn_message.c | 344 ++------
libs/dfi/src/dyn_type.c | 972 +++++++++------------
libs/dfi/src/dyn_type_common.c | 56 +-
libs/dfi/src/dyn_type_common.h | 26 +-
libs/dfi/src/json_rpc.c | 582 ++++++------
libs/dfi/src/json_serializer.c | 520 +++++------
libs/error_injector/CMakeLists.txt | 6 +
.../{string => jansson}/CMakeLists.txt | 25 +-
.../stdio_ei.h => jansson/include/jansson_ei.h} | 37 +-
libs/error_injector/jansson/src/jansson_ei.cc | 91 ++
libs/error_injector/stdio/CMakeLists.txt | 2 +
libs/error_injector/stdio/include/stdio_ei.h | 8 +-
libs/error_injector/stdio/src/stdio_ei.cc | 16 +
libs/error_injector/string/CMakeLists.txt | 1 +
libs/error_injector/string/include/string_ei.h | 2 +
libs/error_injector/string/src/string_ei.cc | 14 +-
libs/framework/gtest/src/ManifestTestSuite.cc | 4 -
libs/framework/src/celix_log.c | 4 -
libs/utils/CMakeLists.txt | 14 -
libs/utils/include_deprecated/celix_utils_api.h | 5 -
libs/utils/src/memstream/fmemopen.c | 76 --
libs/utils/src/memstream/open_memstream.c | 130 ---
102 files changed, 4562 insertions(+), 3499 deletions(-)
diff --cc libs/utils/include_deprecated/celix_utils_api.h
index 87fcd7c8,8a42325c..68b02ca9
--- a/libs/utils/include_deprecated/celix_utils_api.h
+++ b/libs/utils/include_deprecated/celix_utils_api.h
@@@ -30,11 -30,5 +30,6 @@@
#include "utils.h"
#include "celix_utils.h"
#include "celix_version.h"
+#include "celix_version_range.h"
- #if defined(NO_MEMSTREAM_AVAILABLE)
- #include "memstream/open_memstream.h"
- #include "memstream/fmemopen.h"
- #endif
-
#endif //CELIX_CELIX_UTILS_API_H_
