Update 3rdparty dependencies to latest versions (#44)

* Updated spdlog to v1.12.0 * Updated nlohmann-json to v3.11.2 * Updated googletest to v1.14 * Updated libcurl to v8.3.0 * Updated glib to v2.78.0 * Updated openssl to v3.1.2 * Updated paho.mqtt.c to v1.3.12 * Updated paho.mqtt.cpp to v1.2.0 * Update versions of shared libraries in build scripts
eclipse-leda · Sep 21, 2023 · d8d9354 · d8d9354
1 parent fcb7ff5
commit d8d9354
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 20 deletions.
diff --git a/.github/actions/build-native-binary/action.yaml b/.github/actions/build-native-binary/action.yaml
@@ -135,7 +135,7 @@ runs:
     if: ${{ inputs.arch == 'amd64' }}
     run: |
       cd dist_${{ inputs.arch }}/utest
-      ./TestSelfUpdateAgent > ../../unit_tests_report_${{ inputs.arch }}.txt --gtest_output=xml:../../unit_tests_report_${{ inputs.arch }}.xml
+      LD_LIBRARY_PATH=../lib ./TestSelfUpdateAgent > ../../unit_tests_report_${{ inputs.arch }}.txt --gtest_output=xml:../../unit_tests_report_${{ inputs.arch }}.xml
     shell: bash
 
   - uses: uraimo/run-on-arch-action@v2
@@ -163,7 +163,7 @@ runs:
     if: ${{ inputs.arch == 'amd64' }}
     run: |
       cd dist_${{ inputs.arch }}_codecov/utest
-      ./TestSelfUpdateAgent
+      LD_LIBRARY_PATH=../lib ./TestSelfUpdateAgent
     shell: bash
 
   - name: Generate code-coverage report

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -32,8 +32,9 @@ install(
     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 )
 
-install(FILES ${CMAKE_BINARY_DIR}/glib/gio/libgio-2.0.so.0.7300.0             DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgio-2.0.so.0)
-install(FILES ${CMAKE_BINARY_DIR}/glib/glib/libglib-2.0.so.0.7300.0           DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libglib-2.0.so.0)
-install(FILES ${CMAKE_BINARY_DIR}/glib/gmodule/libgmodule-2.0.so.0.7300.0     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgmodule-2.0.so.0)
-install(FILES ${CMAKE_BINARY_DIR}/glib/gobject/libgobject-2.0.so.0.7300.0     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgobject-2.0.so.0)
+install(FILES ${CMAKE_BINARY_DIR}/glib/gio/libgio-2.0.so.0.7800.0             DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgio-2.0.so.0)
+install(FILES ${CMAKE_BINARY_DIR}/glib/glib/libglib-2.0.so.0.7800.0           DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libglib-2.0.so.0)
+install(FILES ${CMAKE_BINARY_DIR}/glib/gmodule/libgmodule-2.0.so.0.7800.0     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgmodule-2.0.so.0)
+install(FILES ${CMAKE_BINARY_DIR}/glib/gobject/libgobject-2.0.so.0.7800.0     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgobject-2.0.so.0)
 install(FILES ${CMAKE_BINARY_DIR}/glib/subprojects/libffi/src/libffi.so.7.1.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libffi.so.7)
+install(FILES ${CMAKE_BINARY_DIR}/glib/subprojects/proxy-libintl/libintl.so.8 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libintl.so.8)
diff --git a/3rdparty/curl b/3rdparty/curl
diff --git a/3rdparty/glib b/3rdparty/glib
diff --git a/3rdparty/googletest b/3rdparty/googletest
diff --git a/3rdparty/nlohmann-json b/3rdparty/nlohmann-json
diff --git a/3rdparty/openssl b/3rdparty/openssl
diff --git a/3rdparty/paho.mqtt.c b/3rdparty/paho.mqtt.c
diff --git a/3rdparty/paho.mqtt.cpp b/3rdparty/paho.mqtt.cpp
diff --git a/3rdparty/spdlog b/3rdparty/spdlog
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
@@ -76,9 +76,10 @@ COPY --from=build /work/dist_amd64/lib/libsua.so      /sua/lib/
 COPY --from=build /work/build_amd64/glib/gio/libgio-2.0.so.0          /sua/lib/
 COPY --from=build /work/build_amd64/glib/gobject/libgobject-2.0.so.0  /sua/lib/
 COPY --from=build /work/build_amd64/glib/glib/libglib-2.0.so.0        /sua/lib/
-COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0           /sua/lib/
-COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7    /sua/lib/
-COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so       /sua/lib/
+COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0            /sua/lib/
+COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7     /sua/lib/
+COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so        /sua/lib/
+COPY --from=build /work/build_amd64/glib/subprojects/proxy-libintl/libintl.so.8 /sua/lib/
 COPY --from=build /etc/ssl/certs /etc/ssl/certs/
 COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates
 COPY --from=build /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -76,9 +76,10 @@ COPY --from=build /work/dist_arm64/lib/libsua.so      /sua/lib/
 COPY --from=build /work/build_arm64/glib/gio/libgio-2.0.so.0          /sua/lib/
 COPY --from=build /work/build_arm64/glib/gobject/libgobject-2.0.so.0  /sua/lib/
 COPY --from=build /work/build_arm64/glib/glib/libglib-2.0.so.0        /sua/lib/
-COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0           /sua/lib/
-COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7    /sua/lib/
-COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so       /sua/lib/
+COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0            /sua/lib/
+COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7     /sua/lib/
+COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so        /sua/lib/
+COPY --from=build /work/build_arm64/glib/subprojects/proxy-libintl/libintl.so.8 /sua/lib/
 COPY --from=build /etc/ssl/certs /etc/ssl/certs/
 COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates
 COPY --from=build /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib/ld-linux-aarch64.so.1

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -59,3 +59,9 @@ set_property(
     TARGET z_lib
     PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/zlib-1.2.11/libz.so
 )
+
+add_library(intl_lib SHARED IMPORTED)
+set_property(
+    TARGET intl_lib
+    PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/proxy-libintl/libintl.so
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -58,6 +58,7 @@ target_link_libraries(${PROJECT_NAME}
     glib_lib
     ffi_lib
     z_lib
+    intl_lib
     ${SUA_PLATFORM_LIBS}
     ssl_lib
     crypto_lib
+2 −3		.github/workflows/ci.yml
+2 −0		.gitignore
+33 −22		CMakeLists.txt
+1 −1		INSTALL
+79 −42		README.md
+1 −37		appveyor.yml
+2 −2		bench/CMakeLists.txt
+23 −0		bench/latency.cpp
+1 −1		example/CMakeLists.txt
+20 −2		example/example.cpp
+3 −3		include/spdlog/async.h
+16 −18		include/spdlog/async_logger-inl.h
+11 −3		include/spdlog/common.h
+6 −0		include/spdlog/details/backtracer-inl.h
+1 −0		include/spdlog/details/backtracer.h
+8 −0		include/spdlog/details/file_helper-inl.h
+1 −0		include/spdlog/details/file_helper.h
+24 −2		include/spdlog/details/mpmc_blocking_q.h
+41 −12		include/spdlog/details/os-inl.h
+4 −0		include/spdlog/details/os.h
+10 −1		include/spdlog/details/registry-inl.h
+2 −0		include/spdlog/details/registry.h
+1 −1		include/spdlog/details/synchronous_factory.h
+1 −1		include/spdlog/details/tcp_client-windows.h
+3 −2		include/spdlog/details/tcp_client.h
+1 −5		include/spdlog/details/thread_pool-inl.h
+6 −4		include/spdlog/details/udp_client-windows.h
+1 −1		include/spdlog/details/udp_client.h
+3 −3		include/spdlog/fmt/bin_to_hex.h
+3 −3		include/spdlog/logger-inl.h
+21 −22		include/spdlog/logger.h
+1 −1		include/spdlog/pattern_formatter.h
+6 −2		include/spdlog/sinks/android_sink.h
+9 −9		include/spdlog/sinks/ansicolor_sink-inl.h
+61 −0		include/spdlog/sinks/callback_sink.h
+8 −58		include/spdlog/sinks/daily_file_sink.h
+4 −4		include/spdlog/sinks/dist_sink.h
+5 −3		include/spdlog/sinks/dup_filter_sink.h
+133 −0		include/spdlog/sinks/kafka_sink.h
+18 −6		include/spdlog/sinks/msvc_sink.h
+196 −6		include/spdlog/sinks/qt_sinks.h
+1 −1		include/spdlog/sinks/ringbuffer_sink.h
+1 −2		include/spdlog/sinks/stdout_sinks-inl.h
+7 −0		include/spdlog/sinks/systemd_sink.h
+6 −6		include/spdlog/sinks/win_eventlog_sink.h
+5 −0		include/spdlog/spdlog-inl.h
+26 −17		include/spdlog/spdlog.h
+1 −1		include/spdlog/stopwatch.h
+1 −1		include/spdlog/version.h
+16 −0		tests/CMakeLists.txt
+0 −17,959		tests/catch.hpp
+0 −23		tests/catch.license
+2 −1		tests/includes.h
+1 −2		tests/main.cpp
+9 −1		tests/test_async.cpp
+13 −0		tests/test_backtrace.cpp
+93 −0		tests/test_bin_to_hex.cpp
+34 −0		tests/test_custom_callbacks.cpp
+5 −5		tests/test_daily_logger.cpp
+12 −9		tests/test_errors.cpp
+5 −5		tests/test_file_helper.cpp
+5 −5		tests/test_file_logging.cpp
+1 −1		tests/test_macros.cpp
+0 −91		tests/test_misc.cpp
+22 −2		tests/test_mpmc_q.cpp
+1 −1		tests/test_pattern_formatter.cpp
+3 −3		tests/test_stopwatch.cpp