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.
This commit is contained in:
Jacek Sieka 2023-02-21 16:47:16 +01:00 committed by Jonathan Rainville
parent c560e9b960
commit 1856c9de93
7 changed files with 6 additions and 15 deletions

6
.gitmodules vendored
View File

@ -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

View File

@ -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()
self.urlsManager.userLoggedIn()

1
vendor/bearssl vendored

@ -1 +0,0 @@
Subproject commit ba5f4687987817902c2727e30b35cb5ad1e61203

2
vendor/nim-bearssl vendored

@ -1 +1 @@
Subproject commit dc62f4fccd2d40c884009ae8f2b14bb6a86a55cf
Subproject commit eebf730ccda5b5fade2a8f48b3da1496f2c47ba5

2
vendor/nim-chronos vendored

@ -1 +1 @@
Subproject commit bce0f878d16bea14395dc8944ff8dbdeffe33496
Subproject commit dcf197a8c7891252fc611508a7d364d4953001d9

2
vendor/nim-stew vendored

@ -1 +1 @@
Subproject commit 1db43c7234acb9554e3e80bf2e7b61c4cf0435cf
Subproject commit 932fa6cef129126064e8c6eda46dcca6fbd555ad

@ -1 +0,0 @@
Subproject commit a87f3f85be052fb3332358f95079a059cf1daf15