From 798a2fb45afee614205ae8d8f7680dc678e251da Mon Sep 17 00:00:00 2001
From: Mateusz Grzegorzek <mateusz.grzegorzek@mudita.com>
Date: Mon, 24 May 2021 11:25:59 +0200
Subject: [PATCH] [BH-361] Move date to separate directory

Move date to separate directory
---
 .gitmodules                                                   | 2 +-
 CMakeLists.txt                                                | 1 +
 board/rt1051/crashdump/crashcatcher_impl.cpp                  | 2 +-
 cmake/modules/PureCoverage.cmake                              | 1 -
 module-apps/CMakeLists.txt                                    | 1 +
 module-apps/application-calendar/data/dateCommon.hpp          | 2 +-
 module-apps/application-calendar/models/MonthModel.hpp        | 4 ++--
 .../widgets/EventDetailDescriptionItem.cpp                    | 2 +-
 module-apps/widgets/DateWidget.hpp                            | 4 ++--
 module-cellular/CMakeLists.txt                                | 1 +
 module-cellular/at/src/UrcCtze.cpp                            | 4 ++--
 third-party/CMakeLists.txt                                    | 1 +
 {module-utils => third-party}/date                            | 0
 13 files changed, 14 insertions(+), 11 deletions(-)
 rename {module-utils => third-party}/date (100%)

diff --git a/.gitmodules b/.gitmodules
index baa3f2f3522673326a4100751a7432957c6445ba..d186b9ba6e64a01e9e8b80bcaa12c452cf81fb4b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,7 +34,7 @@
 	path = test/Catch2
 	url = https://github.com/catchorg/Catch2
 [submodule "module-utils/date"]
-	path = module-utils/date
+	path = third-party/date
 	url = ../date.git
 [submodule "module-audio/Audio/decoder/minimp3"]
 	path = module-audio/Audio/decoder/minimp3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9107636260b0cf58246b64361c44f6b29c759ae0..2a8d7f58481194569d1264236dd5c466b093a199 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,6 +204,7 @@ set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES LINK_FLAGS "-Xlinker -Map
 # They have to be arranged in specific order because of circular dependencies that need to be correctly resolved
 # In case of doubt please contact me: mateusz.piesta@mudita.com
 target_link_libraries(${PROJECT_NAME}
+        date::date
         module-apps
         service-desktop
         service-bluetooth
diff --git a/board/rt1051/crashdump/crashcatcher_impl.cpp b/board/rt1051/crashdump/crashcatcher_impl.cpp
index ad415518a150fe33350af4ee134d1bef9bfc4f76..b100d24156b1c214d6a6984b0fded1f65f84d4cf 100644
--- a/board/rt1051/crashdump/crashcatcher_impl.cpp
+++ b/board/rt1051/crashdump/crashcatcher_impl.cpp
@@ -6,7 +6,7 @@
 #include <CrashCatcher.h>
 
 #include <log/log.hpp>
-#include <module-utils/date/include/date/date.h>
+#include <date/date.h>
 #include "crashdumpwriter.hpp"
 
 const CrashCatcherMemoryRegion *CrashCatcher_GetMemoryRegions(void)
diff --git a/cmake/modules/PureCoverage.cmake b/cmake/modules/PureCoverage.cmake
index 135a4412d303012e745917ae69b3b41d66150dc4..99176e971ac081dd17854e25f82be2ec248031fa 100644
--- a/cmake/modules/PureCoverage.cmake
+++ b/cmake/modules/PureCoverage.cmake
@@ -28,7 +28,6 @@ if(COVERAGE_ENABLE)
         module-db/Database/sqlite3.c
         module-lwip/lib/.*
         module-os/.*
-        module-utils/date/include/date/date.h
         module-utils/gsl/.*
         module-utils/json/.*
         module-utils/libphonenumber/.*
diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index 1893c0eafafefa0382bf9d5375d2d7305c73ceed..4d7f1865722e60bbd8339cae7229d6e6ea577b8f 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -117,6 +117,7 @@ add_subdirectory(locks)
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
+        date::date
         service-appmgr
         service-antenna
         service-audio
diff --git a/module-apps/application-calendar/data/dateCommon.hpp b/module-apps/application-calendar/data/dateCommon.hpp
index ab241081915899d0f7aa14c6a4bb48b438a5ffa8..2a60805fceccdb036df501d33f109540fde6bea6 100644
--- a/module-apps/application-calendar/data/dateCommon.hpp
+++ b/module-apps/application-calendar/data/dateCommon.hpp
@@ -4,7 +4,7 @@
 #ifndef DATECOMMON_H
 #define DATECOMMON_H
 
-#include <module-utils/date/include/date/date.h>
+#include <date/date.h>
 #include <module-utils/time/DateAndTimeSettings.hpp>
 #include <time/time_conversion.hpp>
 #include <Utils.hpp>
diff --git a/module-apps/application-calendar/models/MonthModel.hpp b/module-apps/application-calendar/models/MonthModel.hpp
index 6f528a79272c45e54f0a3419a48a0d7a4b7ba685..ff4f8f71682f411323380e128044b36b2be2cba5 100644
--- a/module-apps/application-calendar/models/MonthModel.hpp
+++ b/module-apps/application-calendar/models/MonthModel.hpp
@@ -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
@@ -8,7 +8,7 @@
 #include <gui/widgets/GridLayout.hpp>
 #include <gui/widgets/Item.hpp>
 #include <Text.hpp>
-#include <module-utils/date/include/date/date.h>
+#include <date/date.h>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp b/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp
index a33372c9ef588292df2c1f95b39d68727b0dc682..a7abb777c6ce883862e23dd7c982911ba5082d48 100644
--- a/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp
+++ b/module-apps/application-calendar/widgets/EventDetailDescriptionItem.cpp
@@ -5,7 +5,7 @@
 #include "application-calendar/widgets/CalendarStyle.hpp"
 #include <Style.hpp>
 #include <time/time_conversion.hpp>
-#include <module-utils/date/include/date/date.h>
+#include <date/date.h>
 #include <module-utils/time/TimeRangeParser.hpp>
 
 namespace gui
diff --git a/module-apps/widgets/DateWidget.hpp b/module-apps/widgets/DateWidget.hpp
index 6c6aad7e8b262c19ee5439d1dd51d7f9bbbb4c96..41e7e26370091ec07c327b611262adffddca652c 100644
--- a/module-apps/widgets/DateWidget.hpp
+++ b/module-apps/widgets/DateWidget.hpp
@@ -1,11 +1,11 @@
-// 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 <BoxLayout.hpp>
 #include <Label.hpp>
-#include <module-utils/date/include/date/date.h>
+#include <date/date.h>
 
 namespace gui
 {
diff --git a/module-cellular/CMakeLists.txt b/module-cellular/CMakeLists.txt
index 7fbc2068edd453f0982aebf63cf9b5148d5243eb..1b8fdbb4f377e2654f4ba6ba4f9cad9ce6b5977b 100644
--- a/module-cellular/CMakeLists.txt
+++ b/module-cellular/CMakeLists.txt
@@ -86,6 +86,7 @@ target_link_libraries(${PROJECT_NAME}
     module-sys
     module-db
     module-bsp
+    date::date
 )
 
 if (${ENABLE_TESTS})
diff --git a/module-cellular/at/src/UrcCtze.cpp b/module-cellular/at/src/UrcCtze.cpp
index facb292dac9b808cdfb6d1c7f947669ba5bbfb9b..e79387ad682da452024e6b3b0d77af9e081781f2 100644
--- a/module-cellular/at/src/UrcCtze.cpp
+++ b/module-cellular/at/src/UrcCtze.cpp
@@ -1,11 +1,11 @@
-// 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 "../UrcCtze.hpp"
 #include <log/debug.hpp>
 #include <module-utils/time/time_conversion.hpp>
 
-#include <module-utils/date/include/date/date.h>
+#include <date/date.h>
 
 using namespace at::urc;
 
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 2b329fc6b8eb3816d8ba8488b045583bc2f8fbb4..c9c53c9ad6dbe71a11060fb96be0952d7f4a2341 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -2,3 +2,4 @@
 add_subdirectory(crc32)
 add_subdirectory(magic_enum)
 add_subdirectory(microtar)
+add_subdirectory(date)
diff --git a/module-utils/date b/third-party/date
similarity index 100%
rename from module-utils/date
rename to third-party/date