package dependency clean-ups (#531)

this change just cleans up dependency declarations in xmake.lua files, discovered while exploring a more to xrepo which catches dependency problems since it will not just place all includes in a single directory, unlike vcpkg.

* removed spurious asio dependency from zenserver-test
* removed rocksdb reference
* add missing asio package dependency
* removed catch2 reference (no longer available)
* added explicit cpr reference
* made some zencore package dependencies public (this is necessary because some public zencore headers pull in package headers. If you use a more strict package manager than vcpkg then you get compilation errors whenever these includes are pulled in unless you declare the dependency explicitly)

8 files changed, 16 insertions, 63 deletions

diff --git a/src/zen/xmake.lua b/src/zen/xmake.lua
index b8eb23839..e8d6fe122 100644
--- a/src/zen/xmake.lua
+++ b/src/zen/xmake.lua
@@ -27,4 +27,4 @@ target("zen")
         add_syslinks("bsm")
     end
 
-    add_packages("vcpkg::cxxopts", "vcpkg::mimalloc", "vcpkg::fmt")
+    add_packages("vcpkg::cpr", "vcpkg::cxxopts", "vcpkg::mimalloc", "vcpkg::fmt")
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua
index 73e3b9198..5420464fa 100644
--- a/src/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
@@ -31,15 +31,19 @@ target('zencore')
     add_deps("zenbase")
     add_packages(
         "vcpkg::blake3", 
-        "vcpkg::doctest", 
-        "vcpkg::fmt",
-        "vcpkg::gsl-lite",
         "vcpkg::json11",
-        "vcpkg::lz4",
         "vcpkg::mimalloc",
         "vcpkg::openssl", -- required for crypto
-        "vcpkg::spdlog", 
-        "vcpkg::xxhash")
+        "vcpkg::spdlog")
+
+    add_packages(
+        "vcpkg::doctest", 
+        "vcpkg::fmt",
+        "vcpkg::gsl-lite", 
+        "vcpkg::lz4",
+        "vcpkg::xxhash",
+        {public=true}
+    )
 
     if is_plat("linux") then
         add_syslinks("rt")
diff --git a/src/zenhttp/xmake.lua b/src/zenhttp/xmake.lua
index e90fdfd1c..b6ffbe467 100644
--- a/src/zenhttp/xmake.lua
+++ b/src/zenhttp/xmake.lua
@@ -9,13 +9,13 @@ target('zenhttp')
     add_includedirs("include", {public=true})
     add_deps("zencore", "transport-sdk")
     add_packages(
+        "vcpkg::asio",
         "vcpkg::cpr",
         "vcpkg::curl",  -- required by cpr
         "vcpkg::openssl", -- required by curl
         "vcpkg::zlib",  -- required by curl
         "vcpkg::gsl-lite",
-        "vcpkg::http-parser",
-        "vcpkg::cpr"
+        "vcpkg::http-parser"
     )
     add_options("httpsys")
 
diff --git a/src/zennet-test/xmake.lua b/src/zennet-test/xmake.lua
index bbede7739..8d8c0a598 100644
--- a/src/zennet-test/xmake.lua
+++ b/src/zennet-test/xmake.lua
@@ -7,7 +7,6 @@ target("zennet-test")
     add_files("*.cpp")
     add_deps("zencore", "zenutil", "zennet")
     add_packages("vcpkg::mimalloc")
-    add_packages("vcpkg::catch2")
     add_packages("vcpkg::doctest")
 
     if is_plat("macosx") then
diff --git a/src/zennet/xmake.lua b/src/zennet/xmake.lua
index 9b240e024..a9f67e7e2 100644
--- a/src/zennet/xmake.lua
+++ b/src/zennet/xmake.lua
@@ -8,5 +8,6 @@ target('zennet')
     add_includedirs("include", {public=true})
     add_deps("zencore", "zenutil")
     add_packages(
-        "vcpkg::gsl-lite"
+        "vcpkg::gsl-lite",
+        "vcpkg::asio"
     )
diff --git a/src/zenserver-test/xmake.lua b/src/zenserver-test/xmake.lua
index 4c278ac86..17d0a3cb7 100644
--- a/src/zenserver-test/xmake.lua
+++ b/src/zenserver-test/xmake.lua
@@ -8,7 +8,7 @@ target("zenserver-test")
     add_files("zenserver-test.cpp", {unity_ignored  = true })
     add_deps("zencore", "zenutil", "zenhttp")
     add_deps("zenserver", {inherit=false})
-    add_packages("vcpkg::http-parser", "vcpkg::mimalloc")
+    add_packages("vcpkg::cpr", "vcpkg::http-parser", "vcpkg::mimalloc")
 
     if is_plat("macosx") then
         add_ldflags("-framework CoreFoundation")
diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp
index 34f058807..6aa58ee14 100644
--- a/src/zenserver-test/zenserver-test.cpp
+++ b/src/zenserver-test/zenserver-test.cpp
@@ -59,8 +59,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #	include <process.h>
 #endif
 
-#include <asio.hpp>
-
 //////////////////////////////////////////////////////////////////////////
 
 #include "projectclient.h"
@@ -2342,54 +2340,6 @@ private:
 	std::vector<std::unique_ptr<ZenServerInstance> > m_Instances;
 };
 
-class IoDispatcher
-{
-public:
-	IoDispatcher(asio::io_context& IoCtx) : m_IoCtx(IoCtx) {}
-	~IoDispatcher() { Stop(); }
-
-	void Run()
-	{
-		Stop();
-
-		m_Running = true;
-
-		m_IoThread = std::thread([this]() {
-			try
-			{
-				m_IoCtx.run();
-			}
-			catch (std::exception& Error)
-			{
-				m_Error = Error;
-			}
-		});
-	}
-
-	void Stop()
-	{
-		if (m_Running)
-		{
-			m_Running = false;
-
-			if (m_IoThread.joinable())
-			{
-				m_IoThread.join();
-			}
-		}
-	}
-
-	bool IsRunning() const { return m_Running; }
-
-	const std::exception& Error() { return m_Error; }
-
-private:
-	asio::io_context& m_IoCtx;
-	std::thread		  m_IoThread;
-	std::exception	  m_Error;
-	std::atomic_bool  m_Running{false};
-};
-
 TEST_CASE("http.basics")
 {
 	using namespace std::literals;
diff --git a/src/zenserver/xmake.lua b/src/zenserver/xmake.lua
index 123690be2..127213ebd 100644
--- a/src/zenserver/xmake.lua
+++ b/src/zenserver/xmake.lua
@@ -52,7 +52,6 @@ target("zenserver")
         "vcpkg::json11",
         "vcpkg::lua",
         "vcpkg::mimalloc",
-        "vcpkg::rocksdb",
         "vcpkg::sol2"
     )