[valijson] Update to version 0.6 (#20269)

* Update varijson to version 0.6

Removing fix-nlohmann-json.patch, this patch is no longer needed

* Run x-add-version

7 files changed, 31 insertions, 47 deletions

diff --git a/ports/valijson/fix-nlohmann-json.patch b/ports/valijson/fix-nlohmann-json.patch
deleted file mode 100644
index 7465837d5..000000000
--- a/ports/valijson/fix-nlohmann-json.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/valijson/adapters/nlohmann_json_adapter.hpp b/include/valijson/adapters/nlohmann_json_adapter.hpp
-index f77a2bf..3f6fb5f 100644
---- a/include/valijson/adapters/nlohmann_json_adapter.hpp
-+++ b/include/valijson/adapters/nlohmann_json_adapter.hpp
-@@ -28,7 +28,7 @@
- #define __VALIJSON_ADAPTERS_NLOHMANN_JSON_ADAPTER_HPP
- 
- #include <string>
--#include <json.hpp>
-+#include <nlohmann/json.hpp>
- 
- #include <valijson/adapters/adapter.hpp>
- #include <valijson/adapters/basic_adapter.hpp>
-diff --git a/include/valijson/utils/nlohmann_json_utils.hpp b/include/valijson/utils/nlohmann_json_utils.hpp
-index 01838d8..4a5b5e4 100644
---- a/include/valijson/utils/nlohmann_json_utils.hpp
-+++ b/include/valijson/utils/nlohmann_json_utils.hpp
-@@ -4,7 +4,7 @@
- 
- #include <iostream>
- 
--#include <json.hpp>
-+#include <nlohmann/json.hpp>
- #include <valijson/utils/file_utils.hpp>
- 
- namespace valijson {
diff --git a/ports/valijson/fix-optional.patch b/ports/valijson/fix-optional.patch
index 5ce75843c..307d630a5 100644
--- a/ports/valijson/fix-optional.patch
+++ b/ports/valijson/fix-optional.patch
@@ -1,8 +1,8 @@
 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
@@ -10,4 +10,3 @@ index 8ff285c..84e9fd6 100644
 +#  include <valijson/compat/optional.hpp>
  namespace opt = std::experimental;
  #endif
- 
diff --git a/ports/valijson/fix-picojson.patch b/ports/valijson/fix-picojson.patch
index bb1b4d51b..ae276f8eb 100644
--- a/ports/valijson/fix-picojson.patch
+++ b/ports/valijson/fix-picojson.patch
@@ -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>
- 
diff --git a/ports/valijson/portfile.cmake b/ports/valijson/portfile.cmake
index ec32fa100..3481d8678 100644
--- a/ports/valijson/portfile.cmake
+++ b/ports/valijson/portfile.cmake
@@ -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
 )
 
diff --git a/ports/valijson/vcpkg.json b/ports/valijson/vcpkg.json
index 92fcdf98b..f78a85c40 100644
--- a/ports/valijson/vcpkg.json
+++ b/ports/valijson/vcpkg.json
@@ -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"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 6e394c072..dfae0f45f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6769,8 +6769,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",
diff --git a/versions/v-/valijson.json b/versions/v-/valijson.json
index 211c2a0d9..e63eb9a9d 100644
--- a/versions/v-/valijson.json
+++ b/versions/v-/valijson.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "7edd27211e0ef58ea307fe1fc4f34aea18cb8529",
+      "version": "0.6",
+      "port-version": 0
+    },
+    {
       "git-tree": "c40f3039f56bbe5301d45b0bf0430b4852907608",
       "version-string": "2018-11-17",
       "port-version": 2