Enable building against vibe.d 0.10.x.

dlang · Sep 9, 2024 · 5e2a8de · 5e2a8de
1 parent cb01957
commit 5e2a8de
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/dub.sdl b/dub.sdl
@@ -31,13 +31,13 @@ configuration "library" {
 }
 
 configuration "library-nonet" {
-	dependency "vibe-d:http" version=">=0.9.0 <0.10.0" optional=true
+	dependency "vibe-d:http" version=">=0.9.0 <0.11.0" optional=true
 	targetType "library"
 	excludedSourceFiles "source/app.d"
 }
 
 configuration "dynamic-library-nonet" {
-	dependency "vibe-d:http" version=">=0.9.0 <0.10.0" optional=true
+	dependency "vibe-d:http" version=">=0.9.0 <0.11.0" optional=true
 	targetType "dynamicLibrary"
 	excludedSourceFiles "source/app.d"
 }
diff --git a/dub.selections.json b/dub.selections.json
@@ -1,21 +1,19 @@
 {
 	"fileVersion": 1,
 	"versions": {
-		"botan": "1.12.19",
-		"botan-math": "1.0.3",
 		"diet-ng": "1.8.1",
-		"eventcore": "0.9.30",
-		"libasync": "0.8.6",
-		"libev": "5.0.0+4.04",
-		"libevent": "2.0.2+2.0.16",
-		"memutils": "1.0.10",
+		"eventcore": "0.9.32",
 		"mir-linux-kernel": "1.0.1",
 		"openssl": "3.3.3",
 		"openssl-static": "1.0.5+3.0.8",
 		"stdx-allocator": "2.77.5",
 		"taggedalgebraic": "0.11.23",
 		"vibe-container": "1.3.1",
-		"vibe-core": "2.8.5",
-		"vibe-d": "0.9.8"
+		"vibe-core": "2.9.0",
+		"vibe-d": "0.10.0",
+		"vibe-http": "1.1.1",
+		"vibe-inet": "1.0.0",
+		"vibe-serialization": "1.0.4",
+		"vibe-stream": "1.1.0"
 	}
 }
diff --git a/source/dub/internal/vibecompat/data/json.d b/source/dub/internal/vibecompat/data/json.d
@@ -11,7 +11,8 @@
 */
 module dub.internal.vibecompat.data.json;
 
-version (Have_vibe_d_data) public import vibe.data.json;
+version (Have_vibe_d_data) public import vibe.data.json; // vibe.d 0.9.x
+else version (Have_vibe_serialization) public import vibe.data.json; // vibe.d 0.10.x+
 else:
 
 import dub.internal.vibecompat.data.utils;

diff --git a/source/dub/internal/vibecompat/data/serialization.d b/source/dub/internal/vibecompat/data/serialization.d
@@ -91,7 +91,8 @@
 */
 module dub.internal.vibecompat.data.serialization;
 
-version (Have_vibe_d_data) public import vibe.data.serialization;
+version (Have_vibe_d_data) public import vibe.data.serialization; // vibe.d 0.9.x
+else version (Have_vibe_serialization) public import vibe.data.serialization; // vibe.d 0.10.x+
 else:
 
 import dub.internal.vibecompat.data.utils;

diff --git a/source/dub/internal/vibecompat/data/utils.d b/source/dub/internal/vibecompat/data/utils.d
@@ -7,7 +7,8 @@
 */
 module dub.internal.vibecompat.data.utils;
 
-version (Have_vibe_d_data) {}
+version (Have_vibe_d_data) {} // vibe.d 0.9.x
+else version (Have_vibe_serialization) {} // vibe.d 0.10.x+
 else:
 
 public import std.traits;

diff --git a/source/dub/internal/vibecompat/inet/url.d b/source/dub/internal/vibecompat/inet/url.d
@@ -9,7 +9,8 @@ module dub.internal.vibecompat.inet.url;
 
 public import dub.internal.vibecompat.inet.path;
 
-version (Have_vibe_d_inet) public import vibe.inet.url;
+version (Have_vibe_d_inet) public import vibe.inet.url; // vibe.d 0.9.x
+else version (Have_vibe_inet) public import vibe.inet.url; // vibe.d 0.10.x+
 else:
 
 import std.algorithm;