M config/format-config.sh => config/format-config.sh +1 -1
@@ 47,7 47,6 @@ export declare ignore_paths=(
'module-lwip/includes/lwipopts.h'
'module-lwip/lib/lwip/'
'module-os/'
- 'module-utils/json/'
'module-utils/microtar/'
'module-utils/segger/log/'
'module-utils/segger/systemview/'
@@ 56,6 55,7 @@ export declare ignore_paths=(
'module-vfs/board/free_rtos_custom/include/FreeRTOSFATConfig.h'
'module-vfs/drivers/include/thirdparty/fatfs/ffconf.h'
'module-vfs/thirdparty/*'
+ 'third-party/'
)
# bash function using above config function
M module-apps/application-onboarding/CMakeLists.txt => module-apps/application-onboarding/CMakeLists.txt +1 -0
@@ 49,4 49,5 @@ target_sources(${PROJECT_NAME}
target_include_directories(${PROJECT_NAME}
PRIVATE
service-db
+ json::json
)
M module-apps/application-onboarding/data/OnBoardingSwitchData.hpp => module-apps/application-onboarding/data/OnBoardingSwitchData.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include <SwitchData.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <utility>
namespace app::onBoarding
M module-apps/application-settings-new/data/QuoteSwitchData.hpp => module-apps/application-settings-new/data/QuoteSwitchData.hpp +1 -1
@@ 6,7 6,7 @@
#include "application-settings-new/models/QuotesModel.hpp"
#include <SwitchData.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <utility>
namespace Quotes
M module-apps/application-settings-new/models/QuotesModel.cpp => module-apps/application-settings-new/models/QuotesModel.cpp +1 -1
@@ 7,7 7,7 @@
#include <InputEvent.hpp>
#include <i18n/i18n.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <Utils.hpp>
#include <string>
#include <utility>
M module-apps/application-settings-new/widgets/QuoteWidget.hpp => module-apps/application-settings-new/widgets/QuoteWidget.hpp +0 -1
@@ 9,7 9,6 @@
#include <ImageBox.hpp>
#include <Label.hpp>
#include <ListItem.hpp>
-#include <json/json11.hpp>
#include <service-db/QuotesMessages.hpp>
namespace gui
M module-apps/application-settings-new/windows/QuotesMainWindow.cpp => module-apps/application-settings-new/windows/QuotesMainWindow.cpp +1 -1
@@ 9,7 9,7 @@
#include <InputEvent.hpp>
#include <i18n/i18n.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <utility>
namespace style::quotes
M module-bluetooth/Bluetooth/BtKeysStorage.hpp => module-bluetooth/Bluetooth/BtKeysStorage.hpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
@@ 6,7 6,7 @@
#include <btstack_link_key_db_memory.h>
#include <btstack_util.h>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <service-bluetooth/SettingsHolder.hpp>
namespace bluetooth
M module-bluetooth/CMakeLists.txt => module-bluetooth/CMakeLists.txt +1 -0
@@ 78,6 78,7 @@ target_link_libraries(${PROJECT_NAME}
service-bluetooth
service-evtmgr
sml::sml
+ json::json
)
if (${ENABLE_TESTS})
M module-db/tests/CMakeLists.txt => module-db/tests/CMakeLists.txt +1 -0
@@ 38,6 38,7 @@ add_catch2_executable(
module-sys
iosyscalls
module-db
+ json::json
DEPS
assets
PurePhone-disk-img
M module-db/tests/QueryInterface.cpp => module-db/tests/QueryInterface.cpp +1 -1
@@ 17,7 17,7 @@
#include <filesystem>
#include <memory>
#include <module-db/queries/messages/sms/QuerySMSGetCount.hpp>
-#include <module-utils/json/json11.hpp>
+#include <json11.hpp>
namespace db
{
M module-gui/CMakeLists.txt => module-gui/CMakeLists.txt +2 -1
@@ 1,4 1,4 @@
-project(module-gui VERSION 1.0
+project(module-gui VERSION 1.0
DESCRIPTION "GUI library dedicated for pure phone.")
module_is_test_entity()
@@ 29,6 29,7 @@ target_link_libraries(${PROJECT_NAME}
PRIVATE
pugixml::pugixml
Microsoft.GSL::GSL
+ json::json
)
# Board specific compilation definitions,options,include directories and features
M module-gui/gui/dom/Item2JsonSerializer.hpp => module-gui/gui/dom/Item2JsonSerializer.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include "Item2JsonSerializingVisitor.hpp"
-#include <module-utils/json/json11.hpp>
+#include <json11.hpp>
#include <list>
namespace gui
M module-gui/gui/dom/Item2JsonSerializingVisitor.hpp => module-gui/gui/dom/Item2JsonSerializingVisitor.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include "visitor/GuiVisitor.hpp"
-#include <module-utils/json/json11.hpp>
+#include <json11.hpp>
#include <list>
namespace gui
M module-gui/gui/input/Profile.hpp => module-gui/gui/input/Profile.hpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "InputEvent.hpp"
@@ 6,7 6,7 @@
#include <cstdint>
#include <vector>
#include <map>
-#include "json/json11.hpp"
+#include <json11.hpp>
#include <filesystem>
namespace gui
M module-services/service-appmgr/CMakeLists.txt => module-services/service-appmgr/CMakeLists.txt +2 -1
@@ 1,4 1,4 @@
-project(service-appmgr)
+project(service-appmgr)
message( "${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}" )
set(SOURCES
@@ 37,6 37,7 @@ target_link_libraries(${PROJECT_NAME}
service-gui
module-apps
module-audio
+ json::json
PUBLIC
time
)
M module-services/service-appmgr/service-appmgr/messages/DOMRequest.hpp => module-services/service-appmgr/service-appmgr/messages/DOMRequest.hpp +1 -1
@@ 5,7 5,7 @@
#include "BaseMessage.hpp"
#include "service-desktop/DeveloperModeMessage.hpp"
-#include <json/json11.hpp>
+#include <json11.hpp>
namespace app::manager
{
M module-services/service-bluetooth/CMakeLists.txt => module-services/service-bluetooth/CMakeLists.txt +1 -0
@@ 22,4 22,5 @@ target_link_libraries(${PROJECT_NAME}
module-bluetooth
service-desktop
module-sys
+ json::json
)
M module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp => module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp +1 -1
@@ 1,7 1,7 @@
// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <string>
#include <variant>
#include <service-db/Settings.hpp>
M module-services/service-bluetooth/service-bluetooth/SettingsSerializer.hpp => module-services/service-bluetooth/service-bluetooth/SettingsSerializer.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <Device.hpp>
class SettingsSerializer
M module-services/service-cellular/CMakeLists.txt => module-services/service-cellular/CMakeLists.txt +1 -0
@@ 55,6 55,7 @@ target_link_libraries(${PROJECT_NAME}
service-audio
service-evtmgr
ucs2
+ json::json
PUBLIC
time
utf8
M module-services/service-cellular/service-cellular/PacketDataTypes.hpp => module-services/service-cellular/service-cellular/PacketDataTypes.hpp +1 -1
@@ 10,7 10,7 @@
#include <Utils.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
namespace packet_data
{
M module-services/service-db/CMakeLists.txt => module-services/service-db/CMakeLists.txt +2 -1
@@ 1,4 1,4 @@
-project(service-db)
+project(service-db)
message("${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}" )
@@ 32,6 32,7 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PRIVATE
module-db
+ json::json
PUBLIC
utf8
)
M module-services/service-db/agents/settings/FactorySettings.hpp => module-services/service-db/agents/settings/FactorySettings.hpp +1 -1
@@ 5,7 5,7 @@
#include <Database/Database.hpp>
#include <purefs/filesystem_paths.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <fstream>
#include <module-services/service-db/service-db/SettingsMessages.hpp>
#include "Settings_queries.hpp"
M module-services/service-desktop/CMakeLists.txt => module-services/service-desktop/CMakeLists.txt +2 -1
@@ 1,4 1,4 @@
-project(service-desktop)
+project(service-desktop)
message( "${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}" )
set(SOURCES
@@ 63,6 63,7 @@ target_link_libraries(${PROJECT_NAME}
utf8
utils-bootconfig
Microsoft.GSL::GSL
+ json::json
PUBLIC
module-cellular
eventstore
M module-services/service-desktop/ServiceDesktop.cpp => module-services/service-desktop/ServiceDesktop.cpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "service-appmgr/service-appmgr/messages/DOMRequest.hpp"
@@ 13,7 13,7 @@
#include <Common/Query.hpp>
#include <MessageType.hpp>
#include <Service/Worker.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <log.hpp>
#include <module-apps/application-desktop/ApplicationDesktop.hpp>
#include <service-db/service-db/Settings.hpp>
M module-services/service-desktop/endpoints/Endpoint.hpp => module-services/service-desktop/endpoints/Endpoint.hpp +1 -1
@@ 7,7 7,7 @@
#include <parser/ParserUtils.hpp>
#include <parser/MessageHandler.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <Common/Query.hpp>
#include <Service/Service.hpp>
#include <string>
M module-services/service-desktop/endpoints/ResponseContext.hpp => module-services/service-desktop/endpoints/ResponseContext.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <parser/HttpEnums.hpp>
namespace parserFSM::endpoint
M module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp => module-services/service-desktop/endpoints/backup/BackupEndpoint.cpp +1 -1
@@ 9,7 9,7 @@
#include <service-desktop/DesktopMessages.hpp>
#include <service-desktop/ServiceDesktop.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <purefs/filesystem_paths.hpp>
#include <filesystem>
M module-services/service-desktop/endpoints/backup/BackupRestore.hpp => module-services/service-desktop/endpoints/backup/BackupRestore.hpp +1 -1
@@ 5,7 5,7 @@
#include <Service/Service.hpp>
#include <filesystem>
-#include <json/json11.hpp>
+#include <json11.hpp>
namespace sys
{
M module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp => module-services/service-desktop/endpoints/calendarEvents/CalendarEventsHelper.cpp +0 -1
@@ 8,7 8,6 @@
#include "Service/Common.hpp"
#include <service-db/DBServiceAPI.hpp>
#include <log.hpp>
-#include "json/json11.hpp"
#include <queries/calendar/QueryEventsGetAll.hpp>
#include <queries/calendar/QueryEventsGet.hpp>
#include <queries/calendar/QueryEventsAdd.hpp>
M module-services/service-desktop/endpoints/calllog/CalllogHelper.hpp => module-services/service-desktop/endpoints/calllog/CalllogHelper.hpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
@@ 11,7 11,7 @@
#include <Service/Common.hpp>
#include <Service/Service.hpp>
#include <application-phonebook/models/PhonebookModel.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <string>
M module-services/service-desktop/endpoints/contacts/ContactHelper.cpp => module-services/service-desktop/endpoints/contacts/ContactHelper.cpp +1 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ContactHelper.hpp"
@@ 16,7 16,6 @@
#include <ContactRecord.hpp>
#include <PhoneNumber.hpp>
#include <Service/Common.hpp>
-#include <json/json11.hpp>
#include <log.hpp>
#include <queries/RecordQuery.hpp>
#include <queries/phonebook/QueryContactGetByID.hpp>
M module-services/service-desktop/endpoints/contacts/ContactHelper.hpp => module-services/service-desktop/endpoints/contacts/ContactHelper.hpp +1 -1
@@ 11,7 11,7 @@
#include <Service/Common.hpp>
#include <Service/Service.hpp>
#include <application-phonebook/models/PhonebookModel.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <string>
M module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp => module-services/service-desktop/endpoints/deviceInfo/DeviceInfoEndpoint.cpp +1 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "DeviceInfoEndpoint.hpp"
@@ 7,7 7,6 @@
#include <parser/MessageHandler.hpp>
#include <EventStore.hpp>
-#include <json/json11.hpp>
#include <source/version.hpp>
#include <service-desktop/service-desktop/ServiceDesktop.hpp>
#include <version.hpp>
M module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp => module-services/service-desktop/endpoints/factoryReset/FactoryResetEndpoint.cpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "FactoryResetEndpoint.hpp"
@@ 8,7 8,7 @@
#include <service-desktop/DesktopMessages.hpp>
#include <service-desktop/ServiceDesktop.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <memory>
M module-services/service-desktop/endpoints/messages/MessageHelper.cpp => module-services/service-desktop/endpoints/messages/MessageHelper.cpp +0 -1
@@ 13,7 13,6 @@
#include <SMSTemplateRecord.hpp>
#include <Service/Common.hpp>
#include <ThreadRecord.hpp>
-#include <json/json11.hpp>
#include <queries/messages/sms/QuerySMSGet.hpp>
#include <queries/messages/sms/QuerySMSGetByID.hpp>
#include <queries/messages/sms/QuerySMSGetByThreadID.hpp>
M module-services/service-desktop/endpoints/messages/MessageHelper.hpp => module-services/service-desktop/endpoints/messages/MessageHelper.hpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
@@ 12,7 12,7 @@
#include <Service/Common.hpp>
#include <Service/Service.hpp>
#include <ThreadRecord.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
namespace sys
{
M module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp => module-services/service-desktop/endpoints/restore/RestoreEndpoint.cpp +0 -2
@@ 10,8 10,6 @@
#include <service-desktop/ServiceDesktop.hpp>
#include <service-desktop/endpoints/backup/BackupRestore.hpp>
-#include <json/json11.hpp>
-
#include <memory>
using namespace parserFSM;
M module-services/service-desktop/endpoints/security/SecurityEndpoint.cpp => module-services/service-desktop/endpoints/security/SecurityEndpoint.cpp +1 -2
@@ 1,9 1,8 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "SecurityEndpoint.hpp"
-
using namespace parserFSM;
auto SecurityEndpoint::handle(parserFSM::Context &context) -> void
M module-services/service-desktop/endpoints/security/SecurityEndpointHelper.cpp => module-services/service-desktop/endpoints/security/SecurityEndpointHelper.cpp +1 -1
@@ 7,7 7,7 @@
#include <service-appmgr/messages/PreventBlockingRequest.hpp>
#include <service-desktop/service-desktop/ServiceDesktop.hpp>
#include <module-apps/locks/data/PhoneLockMessages.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
namespace parserFSM
{
M module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp => module-services/service-desktop/endpoints/update/UpdateEndpoint.cpp +2 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "UpdateEndpoint.hpp"
@@ 9,7 9,7 @@
#include <endpoints/Context.hpp>
#include <endpoints/messages/MessageHelper.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <purefs/filesystem_paths.hpp>
#include <filesystem>
M module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp => module-services/service-desktop/endpoints/update/UpdateMuditaOS.cpp +1 -1
@@ 6,7 6,7 @@
#include <service-desktop/DesktopMessages.hpp>
#include <SystemManager/SystemManager.hpp>
#include <crc32.h>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <log/log.hpp>
#include <application-desktop/Constants.hpp>
#include <service-db/service-db/Settings.hpp>
M module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp => module-services/service-desktop/endpoints/update/UpdateMuditaOS.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <microtar.hpp>
#include <boot/bootconfig.hpp>
#include <purefs/filesystem_paths.hpp>
M module-services/service-desktop/parser/MessageHandler.hpp => module-services/service-desktop/parser/MessageHandler.hpp +2 -2
@@ 1,10 1,10 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
#include <Service/Service.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <log.hpp>
#include <string>
M module-services/service-desktop/parser/ParserFSM.cpp => module-services/service-desktop/parser/ParserFSM.cpp +1 -2
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "MessageHandler.hpp"
@@ 11,7 11,6 @@ namespace sys
#include <service-desktop/ServiceDesktop.hpp>
#include <log.hpp>
-#include <json/json11.hpp>
#include <memory>
#include <string>
M module-services/service-desktop/parser/ParserFSM.hpp => module-services/service-desktop/parser/ParserFSM.hpp +1 -1
@@ 6,7 6,7 @@
#include "MessageHandler.hpp"
#include "ParserUtils.hpp"
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <string>
M module-services/service-desktop/tests/test-contacts.cpp => module-services/service-desktop/tests/test-contacts.cpp +1 -1
@@ 5,7 5,7 @@
#include <endpoints/EndpointFactory.hpp>
#include <catch2/catch.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <purefs/filesystem_paths.hpp>
#include <utf8/UTF8.hpp>
M module-services/service-desktop/tests/unittest.cpp => module-services/service-desktop/tests/unittest.cpp +1 -1
@@ 16,7 16,7 @@
#include <SMSRecord.hpp>
#include <SMSTemplateRecord.hpp>
#include <catch2/catch.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include <purefs/filesystem_paths.hpp>
#include <utf8/UTF8.hpp>
#include <memory>
M module-utils/CMakeLists.txt => module-utils/CMakeLists.txt +1 -5
@@ 1,7 1,3 @@
-if(NOT WIN32)
- include(Colours)
-endif()
-
project(module-utils VERSION 1.0)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
@@ 15,7 11,6 @@ add_subdirectory(EventStore)
set (SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/i18n/i18n.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/json/json11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.cpp
${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.hpp
${CMAKE_CURRENT_SOURCE_DIR}/NumberHolderMatcher.hpp
@@ 42,6 37,7 @@ PUBLIC
module-vfs
${LIBPHONENUMBER_TARGET}
PRIVATE
+ json::json
crc32
time
)
M module-utils/bootconfig/CMakeLists.txt => module-utils/bootconfig/CMakeLists.txt +1 -0
@@ 20,4 20,5 @@ target_link_libraries( ${PROJECT_NAME}
module-vfs
crc32
Microsoft.GSL::GSL
+ json::json
)
M module-utils/bootconfig/include/boot/bootconfig.hpp => module-utils/bootconfig/include/boot/bootconfig.hpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <module-utils/json/json11.hpp>
+#include <json11.hpp>
#include <string>
#include <filesystem>
M module-utils/i18n/i18nImpl.hpp => module-utils/i18n/i18nImpl.hpp +1 -1
@@ 4,7 4,7 @@
#pragma once
#include <mutex.hpp>
-#include <json/json11.hpp>
+#include <json11.hpp>
#include "i18n.hpp"
namespace utils
M module-utils/ical/ParserICS.hpp => module-utils/ical/ParserICS.hpp +2 -2
@@ 1,9 1,9 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
#include <module-apps/application-calendar/data/dateCommon.hpp>
-#include "json/json11.hpp"
+#include <json11.hpp>
#include <memory>
/**
M module-vfs/CMakeLists.txt => module-vfs/CMakeLists.txt +1 -0
@@ 78,6 78,7 @@ target_link_libraries(${PROJECT_NAME}
module-utils
PRIVATE
littlefs::littlefs
+ json::json
)
if (${ENABLE_TESTS})
M module-vfs/src/purefs/vfs_subsystem.cpp => module-vfs/src/purefs/vfs_subsystem.cpp +1 -1
@@ 10,7 10,7 @@
#include <purefs/fs/thread_local_cwd.hpp>
#include <log.hpp>
#include <purefs/filesystem_paths.hpp>
-#include <module-utils/json/json11.hpp>
+#include <json11.hpp>
#include <sys/stat.h>
#include <fcntl.h>
M third-party/CMakeLists.txt => third-party/CMakeLists.txt +1 -0
@@ 10,6 10,7 @@ add_subdirectory(tinyexpr)
add_subdirectory(parallel-hashmap)
add_subdirectory(protobuf)
add_subdirectory(littlefs)
+add_subdirectory(json)
add_subdirectory(gsl)
add_subdirectory(re2)
if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
A third-party/json/CMakeLists.txt => third-party/json/CMakeLists.txt +13 -0
@@ 0,0 1,13 @@
+add_library(json)
+add_library(json::json ALIAS json)
+target_sources(json
+ PRIVATE
+ json11.cpp
+ PUBLIC
+ json11.hpp
+ )
+
+target_include_directories(json
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ )
R module-utils/json/json11.cpp => third-party/json/json11.cpp +0 -0
R module-utils/json/json11.hpp => third-party/json/json11.hpp +0 -0