Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[valijson] Update to version 0.6 #20269

Merged
merged 2 commits into from
Sep 22, 2021
Merged

[valijson] Update to version 0.6 #20269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e294a9c
Update varijson to version 0.6
misirlou-tg Sep 21, 2021
c8baf93
Run x-add-version
misirlou-tg Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions ports/valijson/fix-nlohmann-json.patch
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ports/valijson/fix-optional.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp
index 8ff285c..84e9fd6 100644
index c9bc47b..c73c7fb 100644
--- a/include/valijson/internal/optional.hpp
+++ b/include/valijson/internal/optional.hpp
@@ -11,7 +11,7 @@ namespace opt = std;
@@ -9,6 +9,6 @@ namespace opt = std;
# endif
# endif
#else
-# include <compat/optional.hpp>
+# include <valijson/compat/optional.hpp>
namespace opt = std::experimental;
#endif

28 changes: 18 additions & 10 deletions ports/valijson/fix-picojson.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp
index b6d17c9..6d04c52 100644
index 4f5e5b6..0da2bf2 100644
--- a/include/valijson/adapters/picojson_adapter.hpp
+++ b/include/valijson/adapters/picojson_adapter.hpp
@@ -29,7 +29,7 @@

#include <string>
@@ -29,10 +29,10 @@

#ifdef _MSC_VER
#pragma warning(disable: 4706)
-#include <picojson.h>
+#include <picojson/picojson.h>
#pragma warning(default: 4706)
#else
-#include <picojson.h>
+#include <picojson/picojson.h>
#endif

#include <valijson/adapters/adapter.hpp>
#include <valijson/adapters/basic_adapter.hpp>
diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp
index 2ca4d46..b983648 100644
index 36420d2..8660c30 100644
--- a/include/valijson/utils/picojson_utils.hpp
+++ b/include/valijson/utils/picojson_utils.hpp
@@ -4,7 +4,7 @@

#include <iostream>
@@ -4,10 +4,10 @@

#ifdef _MSC_VER
#pragma warning(disable: 4706)
-#include <picojson.h>
+#include <picojson/picojson.h>
#pragma warning(default: 4706)
#else
-#include <picojson.h>
+#include <picojson/picojson.h>
#endif

#include <valijson/utils/file_utils.hpp>

7 changes: 3 additions & 4 deletions ports/valijson/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tristanpenman/valijson
REF dd084d747448bb56ddfeab5946b4f2f4617b99c4
SHA512 ee241eefc816360608f86792a4c25abadea79cbffc94d7e31a2dbd0a483ed4d7a303b6d2410b99ab7694e58a3d299f0df0baa52fa16f89e9233d90b190a4d799
REF v0.6
SHA512 a493d17159e479be7fe29d45c610c7d4fdd2c2f9ba897923129734fb07257dbb41fddde4c4263dbf0aa5c7101cd1555568a048beba2f60d2b32e625dd9690749
HEAD_REF master
PATCHES fix-nlohmann-json.patch
fix-picojson.patch
PATCHES fix-picojson.patch
fix-optional.patch
)

Expand Down
3 changes: 1 addition & 2 deletions ports/valijson/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "valijson",
"version-string": "2018-11-17",
"port-version": 2,
"version": "0.6",
"description": "Header-only C++ library for JSON Schema validation"
}
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6685,8 +6685,8 @@
"port-version": 0
},
"valijson": {
"baseline": "2018-11-17",
"port-version": 2
"baseline": "0.6",
"port-version": 0
},
"value-ptr-lite": {
"baseline": "0.2.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/valijson.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7edd27211e0ef58ea307fe1fc4f34aea18cb8529",
"version": "0.6",
"port-version": 0
},
{
"git-tree": "c40f3039f56bbe5301d45b0bf0430b4852907608",
"version-string": "2018-11-17",
Expand Down