From 15f71142ec15347a68654cba22f5ece7a48fef8c Mon Sep 17 00:00:00 2001
From: Jan Jurzitza <gh@webfreak.org>
Date: Wed, 22 Jul 2020 07:43:18 +0200
Subject: [PATCH] use d-test-utils & bump libdparse to 0.15.x

Because this release fixes the private protection issue through new
dsymbol (since 0.11.0) we also need to bump libdparse to at least 0.15.0
so no older libdparse versions are supported.
---
 .gitmodules  |  3 +++
 .travis.sh   | 12 ++++++++++--
 .travis.yml  |  5 ++++-
 d-test-utils |  1 +
 dsymbol      |  2 +-
 dub.json     |  4 ++--
 libdparse    |  2 +-
 7 files changed, 22 insertions(+), 7 deletions(-)
 create mode 160000 d-test-utils

diff --git a/.gitmodules b/.gitmodules
index 59e5312..02de1fd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,3 +14,6 @@
 [submodule "stdx-allocator"]
 	path = stdx-allocator
 	url = https://github.com/dlang-community/stdx-allocator
+[submodule "d-test-utils"]
+	path = d-test-utils
+	url = https://github.com/dlang-community/d-test-utils.git
diff --git a/.travis.sh b/.travis.sh
index 31d68f3..8c47256 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -3,8 +3,16 @@
 set -e
 
 if [[ $BUILD == dub ]]; then
-    dub build --build=release --config=client
-    dub build --build=release --config=server
+    if [[ -n $LIBDPARSE_VERSION ]]; then
+        rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=release --config=client
+        rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=release --config=server
+    elif [[ -n $DSYMBOL_VERSION ]]; then
+        rdmd ./d-test-utils/test_with_package.d $DSYMBOL_VERSION dsymbol -- dub build --build=release --config=client
+        rdmd ./d-test-utils/test_with_package.d $DSYMBOL_VERSION dsymbol -- dub build --build=release --config=server
+    else
+        echo 'Cannot run test without LIBDPARSE_VERSION nor DSYMBOL_VERSION environment variable'
+        exit 1
+    fi
 elif [[ $DC == ldc2 ]]; then
     git submodule update --init --recursive
     make ldc -j2
diff --git a/.travis.yml b/.travis.yml
index a5ac3ac..046ecee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,10 @@ os:
 
 env:
   - BUILD=
-  - BUILD=dub
+  - BUILD=dub LIBDPARSE_VERSION=min
+  - BUILD=dub LIBDPARSE_VERSION=max
+  - BUILD=dub DSYMBOL_VERSION=min
+  - BUILD=dub DSYMBOL_VERSION=max
 
 branches:
   only:
diff --git a/d-test-utils b/d-test-utils
new file mode 160000
index 0000000..206a2e6
--- /dev/null
+++ b/d-test-utils
@@ -0,0 +1 @@
+Subproject commit 206a2e6abd97b4462f3a320e4f2d23986fad3cff
diff --git a/dsymbol b/dsymbol
index f4a481c..71168a8 160000
--- a/dsymbol
+++ b/dsymbol
@@ -1 +1 @@
-Subproject commit f4a481cdc23b58ce544c2e91a39d5c0d406b67ac
+Subproject commit 71168a8449958e1807a8ba22c8a4df15456bae83
diff --git a/dub.json b/dub.json
index be04c88..d88424a 100644
--- a/dub.json
+++ b/dub.json
@@ -7,8 +7,8 @@
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "dsymbol": "~>0.9.0",
-    "libdparse": "~>0.13.0",
+    "dsymbol": ">=0.11.0 <0.12.0",
+    "libdparse": ">=0.15.0 <0.16.0",
     ":common": "*",
     "stdx-allocator": "~>2.77.5",
     "emsi_containers": "~>0.8.0-alpha.15"
diff --git a/libdparse b/libdparse
index 5270739..f9a8284 160000
--- a/libdparse
+++ b/libdparse
@@ -1 +1 @@
-Subproject commit 5270739bcd1962418784c7760773e24d28b6009b
+Subproject commit f9a82848fe98a84f38a66df950514c3556e7fb2d