From 1856c9de93b6fcbcdcddce221b70fb7eebbb31cc Mon Sep 17 00:00:00 2001
From: Jacek Sieka <jacek@status.im>
Date: Tue, 21 Feb 2023 16:47:16 +0100
Subject: [PATCH] remove task-runner dependency

As of #9596, task-runner is no longer used.

Due to how the build system works, task-runner was providing nim-stew,
nim-bearssl and nim-chronos to the project, even though these are also
top-level dependencies - effectively this means there were multiple
versions of these libraries in the source tree and it is not entirely
intuitive which is actually used - adding to the confusion, the
submodule was pinning different versions.

This PR removes task-runner and resets the other dependencies to the
versions in task-runner thus minimising collateral changes.

A duplicate copy of bearssl is also removed.
---
 .gitmodules            | 6 ------
 src/app/core/main.nim  | 7 +++----
 vendor/bearssl         | 1 -
 vendor/nim-bearssl     | 2 +-
 vendor/nim-chronos     | 2 +-
 vendor/nim-stew        | 2 +-
 vendor/nim-task-runner | 1 -
 7 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 160000 vendor/bearssl
 delete mode 160000 vendor/nim-task-runner

diff --git a/.gitmodules b/.gitmodules
index 76b4e08bd7..01182400d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,9 +20,6 @@
 [submodule "vendor/nimage"]
 	path = vendor/nimage
 	url = https://github.com/Ethosa/nimage/
-[submodule "vendor/bearssl"]
-	path = vendor/bearssl
-	url = https://github.com/status-im/nim-bearssl
 [submodule "vendor/nim-confutils"]
 	path = vendor/nim-confutils
 	url = https://github.com/status-im/nim-confutils.git
@@ -44,9 +41,6 @@
 [submodule "vendor/nim-stew"]
 	path = vendor/nim-stew
 	url = https://github.com/status-im/nim-stew.git
-[submodule "vendor/nim-task-runner"]
-	path = vendor/nim-task-runner
-	url = https://github.com/status-im/nim-task-runner.git
 [submodule "vendor/nimcrypto"]
 	path = vendor/nimcrypto
 	url = https://github.com/cheatfate/nimcrypto.git
diff --git a/src/app/core/main.nim b/src/app/core/main.nim
index db2559d93b..4969482e27 100644
--- a/src/app/core/main.nim
+++ b/src/app/core/main.nim
@@ -1,14 +1,13 @@
-import NimQml, task_runner
+import NimQml
 import
   eventemitter,
   ./fleets/fleet_configuration,
-  ./tasks/marathon,
   ./tasks/threadpool,
   ./signals/signals_manager,
   ./custom_urls/urls_manager
 
 export eventemitter
-export marathon, task_runner, signals_manager, fleet_configuration
+export signals_manager, fleet_configuration
 
 type StatusFoundation* = ref object
   events*: EventEmitter
@@ -36,4 +35,4 @@ proc initUrlSchemeManager*(self: StatusFoundation, urlSchemeEvent: StatusEvent,
     protocolUriOnStart)
 
 proc userLoggedIn*(self: StatusFoundation) =
-  self.urlsManager.userLoggedIn()
\ No newline at end of file
+  self.urlsManager.userLoggedIn()
diff --git a/vendor/bearssl b/vendor/bearssl
deleted file mode 160000
index ba5f468798..0000000000
--- a/vendor/bearssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ba5f4687987817902c2727e30b35cb5ad1e61203
diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl
index dc62f4fccd..eebf730ccd 160000
--- a/vendor/nim-bearssl
+++ b/vendor/nim-bearssl
@@ -1 +1 @@
-Subproject commit dc62f4fccd2d40c884009ae8f2b14bb6a86a55cf
+Subproject commit eebf730ccda5b5fade2a8f48b3da1496f2c47ba5
diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index bce0f878d1..dcf197a8c7 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit bce0f878d16bea14395dc8944ff8dbdeffe33496
+Subproject commit dcf197a8c7891252fc611508a7d364d4953001d9
diff --git a/vendor/nim-stew b/vendor/nim-stew
index 1db43c7234..932fa6cef1 160000
--- a/vendor/nim-stew
+++ b/vendor/nim-stew
@@ -1 +1 @@
-Subproject commit 1db43c7234acb9554e3e80bf2e7b61c4cf0435cf
+Subproject commit 932fa6cef129126064e8c6eda46dcca6fbd555ad
diff --git a/vendor/nim-task-runner b/vendor/nim-task-runner
deleted file mode 160000
index a87f3f85be..0000000000
--- a/vendor/nim-task-runner
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a87f3f85be052fb3332358f95079a059cf1daf15