diff --git a/ddoc/dub.sdl b/ddoc/dub.sdl index 16e1800dee..5322178ad2 100644 --- a/ddoc/dub.sdl +++ b/ddoc/dub.sdl @@ -1,6 +1,6 @@ name "ddoc_preprocessor" description "Preprocesses source code before running Ddoc over it" -dependency "libdparse" version="~>0.8.7" +dependency "libdparse" version="~>0.10.12" dependency "dmd" path="../../dmd" versions "DdocOptions" buildRequirements "disallowDeprecations" diff --git a/ddoc/dub.selections.json b/ddoc/dub.selections.json index 86b245c64c..1ed457312f 100644 --- a/ddoc/dub.selections.json +++ b/ddoc/dub.selections.json @@ -2,7 +2,7 @@ "fileVersion": 1, "versions": { "dmd": {"path":"../../dmd"}, - "libdparse": "0.8.7", - "stdx-allocator": "2.77.2" + "libdparse": "0.10.13", + "stdx-allocator": "2.77.5" } } diff --git a/ddoc/source/assert_writeln_magic.d b/ddoc/source/assert_writeln_magic.d index 649952ba00..6fe9dfa3da 100644 --- a/ddoc/source/assert_writeln_magic.d +++ b/ddoc/source/assert_writeln_magic.d @@ -1,8 +1,4 @@ #!/usr/bin/env dub -/++ dub.sdl: -dependency "libdparse" version="0.7.2-alpha.4" -name "assert_writeln_magic" -+/ /* * Tries to convert `assert`s into user-friendly `writeln` calls. * The objective of this tool is to be conservative as @@ -76,7 +72,13 @@ class TestVisitor(Out) : ASTVisitor return; // only look at `a == b` within the AssertExpression - if (typeid(expr.assertion) != typeid(CmpExpression)) + // we need to support the old libdparse 0.8 (for ddox) + static if (__traits(compiles, expr.assertion)) { + const args = expr; // libdparse 0.8 + } else { + const args = expr.assertArguments; // newer libdparse + } + if (typeid(args.assertion) != typeid(CmpExpression)) return; lastAssert = expr; diff --git a/dpl-docs/dub.json b/dpl-docs/dub.json index b86ae551cb..e6a27ed01a 100644 --- a/dpl-docs/dub.json +++ b/dpl-docs/dub.json @@ -1,7 +1,7 @@ { "name": "dpl-docs", "dependencies": { - "ddox": "~>0.16.11", + "ddox": "~>0.16.12", "ddoc_preprocessor": { "path": "../ddoc" } diff --git a/dpl-docs/dub.selections.json b/dpl-docs/dub.selections.json index dea152c312..b78d42bcc6 100644 --- a/dpl-docs/dub.selections.json +++ b/dpl-docs/dub.selections.json @@ -4,20 +4,20 @@ "botan": "1.12.10", "botan-math": "1.0.3", "ddoc_preprocessor": {"path":"../ddoc"}, - "ddox": "0.16.11", + "ddox": "0.16.12", "diet-ng": "1.5.0", "dmd": {"path":"../../dmd"}, - "eventcore": "0.8.35", - "hyphenate": "1.1.1", + "eventcore": "0.8.40", + "hyphenate": "1.1.2", "libasync": "0.8.3", - "libdparse": "0.8.7", + "libdparse": "0.8.8", "libevent": "2.0.2+2.0.16", - "memutils": "0.4.11", - "mir-linux-kernel": "1.0.0", + "memutils": "0.4.13", + "mir-linux-kernel": "1.0.1", "openssl": "1.1.6+1.0.1g", - "stdx-allocator": "2.77.2", - "taggedalgebraic": "0.10.11", - "vibe-core": "1.4.0", + "stdx-allocator": "2.77.5", + "taggedalgebraic": "0.10.12", + "vibe-core": "1.4.6", "vibe-d": "0.8.4" } }