From 213e49553ecaf68ce02471824d52e34dc5a8c593 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Thu, 5 Sep 2024 16:07:16 -0700 Subject: [PATCH] fix: update despacer library --- .gitmodules | 8 ++++---- despacer | 1 + dub.sdl | 2 +- dub.selections.json | 2 +- src/native/despacer | 1 - src/native/libc.d | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) create mode 160000 despacer delete mode 160000 src/native/despacer diff --git a/.gitmodules b/.gitmodules index a35beda..6aac511 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ -[submodule "src/native/despacer"] - path = src/native/despacer - url = https://github.com/aminya/despacer - branch = minijson +[submodule "despacer"] + path = despacer + url = https://github.com/aminya/despacer.git + branch = fix-dub diff --git a/despacer b/despacer new file mode 160000 index 0000000..4257e03 --- /dev/null +++ b/despacer @@ -0,0 +1 @@ +Subproject commit 4257e03a55f8c755e0caed54c849d245a63c00d1 diff --git a/dub.sdl b/dub.sdl index d708e0b..d750618 100644 --- a/dub.sdl +++ b/dub.sdl @@ -11,7 +11,7 @@ importPaths "./src/native" dependency "automem" version="0.6.7" preGenerateCommands "git submodule update --init" # despacer download -dependency "despacer" path="./src/native/despacer/bindings/d" +dependency "despacer" path="despacer" configuration "executable" { targetType "executable" diff --git a/dub.selections.json b/dub.selections.json index 7d54f94..f9bacd1 100644 --- a/dub.selections.json +++ b/dub.selections.json @@ -2,7 +2,7 @@ "fileVersion": 1, "versions": { "automem": "0.6.7", - "despacer": {"path":"src/native/despacer/bindings/d"}, + "despacer": {"path":"despacer/"}, "test_allocator": "0.3.4", "unit-threaded": "2.2.0" } diff --git a/src/native/despacer b/src/native/despacer deleted file mode 160000 index f1acbdb..0000000 --- a/src/native/despacer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f1acbdb05dfe9b32d00a6a68c082923019def073 diff --git a/src/native/libc.d b/src/native/libc.d index dc2e1e8..c8b19eb 100644 --- a/src/native/libc.d +++ b/src/native/libc.d @@ -12,7 +12,7 @@ import minijson.lib : minifyString; Return: the minified json string */ -extern (C) auto c_minifyString(in char* jsonCString, in bool hasComment = false) +extern (C) auto c_minifyString(char* jsonCString, bool hasComment = false) { import std : fromStringz, toStringz;