Wolkabout · Oct 17, 2023 · Jun 13, 2023 · Jun 19, 2023 · Jun 19, 2023 · Jun 19, 2023
diff --git a/.github/workflows/cmake-build-and-test.yml b/.github/workflows/cmake-build-and-test.yml
@@ -55,4 +55,4 @@ jobs:
         uses: jidicula/clang-format-action@v3.5.2
         with:
           clang-format-version: 10
-          exclude-regex: "WolkSDK-Cpp/core/utilities/nlohmann/json.hpp"
+          exclude-regex: "WolkSDK-Cpp/core/utility/nlohmann/json.hpp"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.11)
 project(WolkAboutConnector C CXX)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -49,9 +49,6 @@ if (${BUILD_TESTS})
     endif ()
 endif ()
 
-# Setup the option for optional Poco file downloader
-OPTION(BUILD_POCO_HTTP_DOWNLOADER "Build the optional `FileDownloader` implementation that uses Poco" ON)
-
 # Setup the option for optional apt/systemd firmware updaters
 OPTION(BUILD_APT_SYSTEMD_FIRMWARE_UPDATER "Build the optional apt/systemd firmware updaters" OFF)
 
@@ -117,7 +114,7 @@ add_subdirectory(WolkSDK-Cpp)
 
 # Define the version of the library
 set(WOLKCONNECT_VERSION_MAJOR 4)
-set(WOLKCONNECT_VERSION_MINOR 2)
+set(WOLKCONNECT_VERSION_MINOR 3)
 set(WOLKCONNECT_VERSION_PATCH 0)
 set(WOLKCONNECT_VERSION_SUFFIX)
 
@@ -162,12 +159,6 @@ set(LIB_HEADER_FILES wolk/api/FeedUpdateHandler.h
 
 file(COPY wolk/ DESTINATION ${CMAKE_LIBRARY_INCLUDE_DIRECTORY}/wolk PATTERN *.cpp EXCLUDE PATTERN "poco/HTTPFileDownloader.h" EXCLUDE)
 
-if (${BUILD_POCO_HTTP_DOWNLOADER})
-    set(LIB_SOURCE_FILES ${LIB_SOURCE_FILES} wolk/service/file_management/poco/HTTPFileDownloader.cpp)
-    set(LIB_HEADER_FILES ${LIB_HEADER_FILES} wolk/service/file_management/poco/HTTPFileDownloader.h)
-    file(COPY wolk/service/file_management/poco/HTTPFileDownloader.h DESTINATION ${CMAKE_LIBRARY_INCLUDE_DIRECTORY}/wolk/service/file_management/poco)
-endif ()
-
 if (${BUILD_APT_SYSTEMD_FIRMWARE_UPDATER})
     set(LIB_SOURCE_FILES ${LIB_SOURCE_FILES} wolk/service/firmware_update/debian/DebianPackageInstaller.cpp
             wolk/service/firmware_update/debian/GenericDBusInterface.cpp
@@ -184,19 +175,14 @@ if (${BUILD_APT_SYSTEMD_FIRMWARE_UPDATER})
 endif ()
 
 add_library(${PROJECT_NAME} SHARED ${LIB_SOURCE_FILES} ${LIB_HEADER_FILES})
-target_link_libraries(${PROJECT_NAME} PUBLIC WolkAboutCore Threads::Threads)
-target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE ${CMAKE_PREFIX_PATH}/include)
+target_link_libraries(${PROJECT_NAME} SDKCore Threads::Threads)
+target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE ${CMAKE_BINARY_DIR}/include)
 target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN")
 set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${WOLKCONNECT_VERSION_STRING} SOVERSION ${WOLKCONNECT_VERSION_MAJOR}.${WOLKCONNECT_VERSION_MINOR}.${WOLKCONNECT_VERSION_PATCH})
 
-if (${BUILD_POCO_HTTP_DOWNLOADER})
-    target_link_libraries(${PROJECT_NAME} PUBLIC PocoFoundation PocoCrypto PocoJSON PocoNet PocoNetSSL PocoUtil)
-    add_dependencies(${PROJECT_NAME} libpoco)
-endif ()
-
 if (${BUILD_APT_SYSTEMD_FIRMWARE_UPDATER})
-    target_link_libraries(${PROJECT_NAME} PUBLIC ${GLIB_LIBRARIES} ${GIO_LIBRARIES})
+    target_link_libraries(${PROJECT_NAME} ${GLIB_LIBRARIES} ${GIO_LIBRARIES})
     target_include_directories(${PROJECT_NAME} PUBLIC ${GLIB_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS})
 endif ()
 
@@ -232,9 +218,8 @@ if (${BUILD_TESTS})
     enable_testing()
     add_executable(${PROJECT_NAME}Tests ${TEST_SOURCE_FILES} ${TEST_HEADER_FILES})
     target_link_libraries(${PROJECT_NAME}Tests ${PROJECT_NAME} gtest_main gtest gmock_main gmock)
-    target_include_directories(${PROJECT_NAME}Tests PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_LIBRARY_INCLUDE_DIRECTORY} ${CMAKE_PREFIX_PATH}/include WolkSDK-Cpp)
+    target_include_directories(${PROJECT_NAME}Tests PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_LIBRARY_INCLUDE_DIRECTORY} ${CMAKE_BINARY_DIR}/include WolkSDK-Cpp)
     set_target_properties(${PROJECT_NAME}Tests PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")
-    add_dependencies(${PROJECT_NAME}Tests ${PROJECT_NAME} libgtest)
 
     add_test(NAME "WolkConnect-Cpp_Tests" COMMAND ${PROJECT_NAME}Tests)
 endif ()
@@ -300,6 +285,6 @@ endif ()
 # Create the install rule
 include(GNUInstallDirs)
 install(DIRECTORY ${CMAKE_LIBRARY_INCLUDE_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX} PATTERN *.h)
-install(DIRECTORY ${CMAKE_PREFIX_PATH}/include DESTINATION ${CMAKE_INSTALL_PREFIX} PATTERN *.h)
-install(DIRECTORY ${CMAKE_PREFIX_PATH}/lib/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/include DESTINATION ${CMAKE_INSTALL_PREFIX} PATTERN *.h)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/lib/ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -5,6 +5,9 @@
 
 WolkAbout C++11 Connector library for connecting devices to WolkAbout IoT Platform.
 
+**Version 4.3.0-DEV**
+    - [IMPROVEMENT] - Using new WolkSDK-Cpp version 3.4.0, the full restructure of the SDK library.
+
 **Version 4.2.0**
     - [IMPROVEMENT] - Modernized CMake a little bit to with the `target_include_directories`.
 

diff --git a/WolkSDK-Cpp b/WolkSDK-Cpp
diff --git a/debian/changelog b/debian/changelog
diff --git a/debian/compat b/debian/compat
diff --git a/debian/control b/debian/control
diff --git a/debian/copyright b/debian/copyright
diff --git a/debian/rules b/debian/rules
diff --git a/examples/debian-package-installation/Application.cpp b/examples/debian-package-installation/Application.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "wolk/WolkBuilder.h"
 #include "wolk/WolkSingle.h"
 #include "wolk/service/firmware_update/debian/DebianPackageInstaller.h"

diff --git a/examples/full_feature/Application.cpp b/examples/full_feature/Application.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "core/persistence/inmemory/InMemoryPersistence.h"
-#include "core/utilities/FileSystemUtils.h"
-#include "core/utilities/Logger.h"
+#include "core/utility/FileSystemUtils.h"
+#include "core/utility/Logger.h"
 #include "wolk/WolkBuilder.h"
 #include "wolk/WolkSingle.h"
 

diff --git a/examples/pull/Application.cpp b/examples/pull/Application.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "wolk/WolkBuilder.h"
 #include "wolk/WolkSingle.h"
 #include "wolk/api/ParameterHandler.h"

diff --git a/examples/register_feed_and_attribute/Application.cpp b/examples/register_feed_and_attribute/Application.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "wolk/WolkBuilder.h"
 #include "wolk/WolkSingle.h"
 

diff --git a/examples/simple/Application.cpp b/examples/simple/Application.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "wolk/WolkBuilder.h"
 #include "wolk/WolkSingle.h"
 

diff --git a/examples/subdevices/Application.cpp b/examples/subdevices/Application.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "wolk/WolkBuilder.h"
 #include "wolk/WolkMulti.h"
 

diff --git a/out/coverage.sh b/out/coverage.sh
diff --git a/out/manage-units.pkla b/out/manage-units.pkla
diff --git a/tests/DataServiceTests.cpp b/tests/DataServiceTests.cpp
@@ -26,7 +26,7 @@
 
 #include "core/Types.h"
 #include "core/model/Feed.h"
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/ConnectivityServiceMock.h"
 #include "tests/mocks/DataProtocolMock.h"
 #include "tests/mocks/OutboundMessageHandlerMock.h"

diff --git a/tests/ErrorServiceTests.cpp b/tests/ErrorServiceTests.cpp
@@ -23,7 +23,7 @@
 #undef private
 #undef protected
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/ErrorProtocolMock.h"
 
 #include <gtest/gtest.h>

diff --git a/tests/FileManagementServiceTests.cpp b/tests/FileManagementServiceTests.cpp
@@ -23,8 +23,8 @@
 #undef private
 #undef protected
 
-#include "core/utilities/FileSystemUtils.h"
-#include "core/utilities/Logger.h"
+#include "core/utility/FileSystemUtils.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/ConnectivityServiceMock.h"
 #include "tests/mocks/DataProtocolMock.h"
 #include "tests/mocks/DataServiceMock.h"

diff --git a/tests/FileTransferSessionTests.cpp b/tests/FileTransferSessionTests.cpp
@@ -27,8 +27,8 @@
 #include "core/model/messages/FileBinaryResponseMessage.h"
 #include "core/model/messages/FileUploadInitiateMessage.h"
 #include "core/model/messages/FileUrlDownloadInitMessage.h"
-#include "core/utilities/Logger.h"
-#include "core/utilities/Timer.h"
+#include "core/utility/Logger.h"
+#include "core/utility/Timer.h"
 #include "tests/mocks/FileDownloaderMock.h"
 
 #include <gtest/gtest.h>
@@ -46,6 +46,8 @@ class FileTransferSessionTests : public ::testing::Test
         fileDownloaderMock = std::make_shared<FileDownloaderMock>();
     }
 
+    static void TearDownTestCase() { fileDownloaderMock.reset(); }
+
     static std::shared_ptr<FileDownloaderMock> fileDownloaderMock;
 
     const std::string DEVICE_KEY = "DEVICE_KEY";

diff --git a/tests/FirmwareUpdateServiceTests.cpp b/tests/FirmwareUpdateServiceTests.cpp
@@ -23,8 +23,8 @@
 #undef private
 #undef protected
 
-#include "core/utilities/FileSystemUtils.h"
-#include "core/utilities/Logger.h"
+#include "core/utility/FileSystemUtils.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/ConnectivityServiceMock.h"
 #include "tests/mocks/DataProtocolMock.h"
 #include "tests/mocks/DataServiceMock.h"

diff --git a/tests/InboundPlatformMessageHandlerTests.cpp b/tests/InboundPlatformMessageHandlerTests.cpp
@@ -23,7 +23,7 @@
 #undef private
 #undef protected
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/MessageListenerMock.h"
 #include "tests/mocks/ProtocolMock.h"
 

diff --git a/tests/PlatformStatusServiceTests.cpp b/tests/PlatformStatusServiceTests.cpp
@@ -23,7 +23,7 @@
 #undef private
 #undef protected
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/PlatformStatusListenerMock.h"
 #include "tests/mocks/PlatformStatusProtocolMock.h"
 

diff --git a/tests/RegistrationServiceTests.cpp b/tests/RegistrationServiceTests.cpp
@@ -23,8 +23,8 @@
 #undef private
 #undef protected
 
-#include "core/utilities/Logger.h"
-#include "core/utilities/Timer.h"
+#include "core/utility/Logger.h"
+#include "core/utility/Timer.h"
 #include "tests/mocks/ConnectivityServiceMock.h"
 #include "tests/mocks/ErrorProtocolMock.h"
 #include "tests/mocks/ErrorServiceMock.h"

diff --git a/tests/WolkBuilderTests.cpp b/tests/WolkBuilderTests.cpp
@@ -25,7 +25,7 @@
 #undef private
 #undef protected
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/DataProtocolMock.h"
 #include "tests/mocks/ErrorProtocolMock.h"
 #include "tests/mocks/FeedUpdateHandlerMock.h"

diff --git a/tests/WolkMultiTests.cpp b/tests/WolkMultiTests.cpp
@@ -24,7 +24,7 @@
 #undef private
 #undef protected
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/ConnectivityServiceMock.h"
 #include "tests/mocks/DataProtocolMock.h"
 #include "tests/mocks/DataServiceMock.h"

diff --git a/tests/WolkSingleTests.cpp b/tests/WolkSingleTests.cpp
@@ -24,7 +24,7 @@
 #undef private
 #undef protected
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "tests/mocks/ConnectivityServiceMock.h"
 #include "tests/mocks/DataProtocolMock.h"
 #include "tests/mocks/DataServiceMock.h"

diff --git a/wolk/WolkBuilder.cpp b/wolk/WolkBuilder.cpp
@@ -28,7 +28,7 @@
 #include "core/protocol/wolkabout/WolkaboutFirmwareUpdateProtocol.h"
 #include "core/protocol/wolkabout/WolkaboutPlatformStatusProtocol.h"
 #include "core/protocol/wolkabout/WolkaboutRegistrationProtocol.h"
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "wolk/WolkMulti.h"
 #include "wolk/WolkSingle.h"
 #include "wolk/service/data/DataService.h"

diff --git a/wolk/WolkInterface.cpp b/wolk/WolkInterface.cpp
@@ -22,7 +22,7 @@
 #include "core/protocol/FirmwareUpdateProtocol.h"
 #include "core/protocol/PlatformStatusProtocol.h"
 #include "core/protocol/RegistrationProtocol.h"
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 #include "wolk/service/data/DataService.h"
 #include "wolk/service/file_management/FileManagementService.h"
 #include "wolk/service/firmware_update/FirmwareUpdateService.h"

diff --git a/wolk/WolkInterface.h b/wolk/WolkInterface.h
@@ -18,7 +18,7 @@
 #define WOLK_INTERFACE_H
 
 #include "core/model/Reading.h"
-#include "core/utilities/CommandBuffer.h"
+#include "core/utility/CommandBuffer.h"
 #include "wolk/WolkInterfaceType.h"
 #include "wolk/api/FeedUpdateHandler.h"
 #include "wolk/api/ParameterHandler.h"

diff --git a/wolk/WolkMulti.cpp b/wolk/WolkMulti.cpp
@@ -16,7 +16,7 @@
 
 #include "wolk/WolkMulti.h"
 
-#include "core/utilities/Logger.h"
+#include "core/utility/Logger.h"
 
 #include <algorithm>
 #include <utility>

diff --git a/wolk/WolkMulti.h b/wolk/WolkMulti.h
@@ -18,7 +18,7 @@
 #define WOLK_MULTI_H
 
 #include "core/connectivity/InboundPlatformMessageHandler.h"
-#include "core/utilities/StringUtils.h"
+#include "core/utility/StringUtils.h"
 #include "wolk/WolkBuilder.h"
 #include "wolk/WolkInterface.h"
 

diff --git a/wolk/WolkSingle.h b/wolk/WolkSingle.h
@@ -19,7 +19,7 @@
 
 #include "core/connectivity/ConnectivityService.h"
 #include "core/model/Device.h"
-#include "core/utilities/StringUtils.h"
+#include "core/utility/StringUtils.h"
 #include "wolk/WolkInterface.h"
 
 #include <algorithm>