From 59be1bce62ee270a6c3da85593f3433d845060e1 Mon Sep 17 00:00:00 2001
From: WebFreak001 <gh@webfreak.org>
Date: Tue, 13 Feb 2024 17:53:55 +0100
Subject: [PATCH] update dependencies

---
 dub.selections.json                     | 29 +++++++++++++------------
 workspace-d/dub.sdl                     |  5 +----
 workspace-d/dub.selections.json         | 12 +++++-----
 workspace-d/source/workspaced/com/dub.d | 23 ++++++++++++++++----
 4 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/dub.selections.json b/dub.selections.json
index 8cda98f9..58b2c3b8 100644
--- a/dub.selections.json
+++ b/dub.selections.json
@@ -6,29 +6,29 @@
 		"botan-math": "1.0.3",
 		"cachetools": "0.4.1",
 		"dcd": "0.16.0-beta.2",
-		"dfmt": "0.15.0",
+		"dfmt": "0.15.1",
 		"diet-complete": "0.0.3",
 		"diet-ng": "1.8.1",
-		"dscanner": "0.16.0-beta.2",
-		"dub": "1.33.1",
+		"dscanner": "0.16.0-beta.4",
+		"dub": "1.36.0",
 		"emsi_containers": "0.9.0",
-		"eventcore": "0.9.25",
+		"eventcore": "0.9.28",
 		"fuzzymatch": "1.0.0",
 		"inifiled": "1.3.3",
 		"isfreedesktop": "0.1.1",
 		"libasync": "0.8.6",
 		"libddoc": "0.8.0",
 		"libdparse": "0.23.2",
-		"memutils": "1.0.9",
-		"mir-algorithm": "3.20.4",
-		"mir-core": "1.5.5",
-		"mir-cpuid": "1.2.10",
-		"mir-ion": "2.1.8",
+		"memutils": "1.0.10",
+		"mir-algorithm": "3.21.0",
+		"mir-core": "1.7.0",
+		"mir-cpuid": "1.2.11",
+		"mir-ion": "2.2.1",
 		"mir-linux-kernel": "1.0.1",
-		"msgpack-d": "1.0.4",
-		"openssl": "3.3.0",
+		"msgpack-d": "1.0.5",
+		"openssl": "3.3.3",
 		"openssl-static": "1.0.2+3.0.8",
-		"requests": "2.1.2",
+		"requests": "2.1.3",
 		"rm-rf": "0.1.0",
 		"sdlfmt": "0.1.1",
 		"sdlite": "1.1.2",
@@ -38,8 +38,9 @@
 		"taggedalgebraic": "0.11.22",
 		"test_allocator": "0.3.4",
 		"unit-threaded": "0.10.8",
-		"vibe-core": "2.2.0",
-		"vibe-d": "0.9.6",
+		"vibe-container": "1.1.0",
+		"vibe-core": "2.7.4",
+		"vibe-d": "0.9.7",
 		"xdgpaths": "0.2.5"
 	}
 }
diff --git a/workspace-d/dub.sdl b/workspace-d/dub.sdl
index 7197026c..f2feb168 100644
--- a/workspace-d/dub.sdl
+++ b/workspace-d/dub.sdl
@@ -7,10 +7,7 @@ license "MIT"
 dependency "dfmt" version="~>0.15.0"
 dependency "inifiled" version="1.3.3"
 dependency "serve-d:dcd" path=".."
-# we can't upgrade to 1.34.0 yet! PR https://github.com/dlang/dub/pull/2703 must
-# be merged first to avoid a regression with building that cannot stabily be
-# fixed without hardcoding DUB paths into the code here.
-dependency "dub" version="1.33.1"
+dependency "dub" version="~>1.36.0"
 dependency "emsi_containers" version="0.9.0"
 dependency "dscanner" version="~>0.16.0-beta.1"
 dependency "libdparse" version="~>0.23.0"
diff --git a/workspace-d/dub.selections.json b/workspace-d/dub.selections.json
index 83ef9735..25d27318 100644
--- a/workspace-d/dub.selections.json
+++ b/workspace-d/dub.selections.json
@@ -2,17 +2,17 @@
 	"fileVersion": 1,
 	"versions": {
 		"dcd": "0.16.0-beta.2",
-		"dfmt": "0.15.0",
-		"dscanner": "0.16.0-beta.2",
-		"dub": "1.33.1",
+		"dfmt": "0.15.1",
+		"dscanner": "0.16.0-beta.4",
+		"dub": "1.36.0",
 		"emsi_containers": "0.9.0",
 		"inifiled": "1.3.3",
 		"isfreedesktop": "0.1.1",
 		"libddoc": "0.8.0",
 		"libdparse": "0.23.2",
-		"mir-algorithm": "3.20.4",
-		"mir-core": "1.5.5",
-		"msgpack-d": "1.0.4",
+		"mir-algorithm": "3.21.0",
+		"mir-core": "1.7.0",
+		"msgpack-d": "1.0.5",
 		"serve-d": {"path":".."},
 		"silly": "1.1.1",
 		"standardpaths": "0.8.2",
diff --git a/workspace-d/source/workspaced/com/dub.d b/workspace-d/source/workspaced/com/dub.d
index 881f9540..5d4f59ee 100644
--- a/workspace-d/source/workspaced/com/dub.d
+++ b/workspace-d/source/workspaced/com/dub.d
@@ -120,7 +120,7 @@ class DubComponent : ComponentWrapper
 	{
 		trace("Starting dub on instance ", refInstance ? refInstance.cwd : "(global)");
 		_dubRunning = false;
-		_dub = new Dub(instance.cwd, null, SkipPackageSuppliers.none);
+		_dub = new ServedDub(instance.cwd);
 		_dub.packageManager.getOrLoadPackage(NativePath(instance.cwd));
 		_dub.loadPackage();
 		_dub.project.validate();
@@ -216,7 +216,7 @@ class DubComponent : ComponentWrapper
 		if (restartDub)
 			restart();
 
-		GeneratorSettings settings;
+		GeneratorSettings settings = _dub.baseGeneratorSettings;
 		settings.platform = _platform;
 		settings.config = _configuration;
 		settings.buildType = _buildType;
@@ -712,7 +712,7 @@ class DubComponent : ComponentWrapper
 
 		string cwd = instance.cwd;
 
-		GeneratorSettings settings;
+		GeneratorSettings settings = _dub.baseGeneratorSettings;
 		settings.platform = buildPlatform;
 		settings.config = _configuration;
 		settings.buildType = _buildType;
@@ -814,7 +814,7 @@ class DubComponent : ComponentWrapper
 	}
 
 private:
-	Dub _dub;
+	ServedDub _dub;
 	bool _dubRunning = false;
 	string _configuration;
 	string _archType = "";
@@ -1028,3 +1028,18 @@ struct ArchType
 	/// UI label override or null if none
 	string label;
 }
+
+class ServedDub : Dub
+{
+	this(string root_path = ".")
+	{
+		super(root_path, null, SkipPackageSuppliers.none);
+	}
+
+	GeneratorSettings baseGeneratorSettings() const @safe pure nothrow @nogc
+	{
+		GeneratorSettings s;
+		s.cache = this.m_dirs.cache;
+		return s;
+	}
+}