Squashed 'libraries/json/' changes from 183390c10..8c2057113

8c2057113 Merge branch 'release/3.2.0'
9f3857ef6 🔖 set version to 3.2.0
7608a64e1 🔨 fixed amalgamation
a7b02bdce 🔖 preparing 3.2.0 release
c6a482b16 📝 added example for sax_parse
5ad52f416 ⬆️ Catch 1.12.0
3811daa8a 📝 release preparation
6899fa304 Merge branch 'develop' of https://github.com/nlohmann/json into develop
57faaf42c 🚨 fixed a compiler warning
f78ac4fbd Merge pull request #1200 from thyu/develop
3004a7395 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax
e33b31e6a 🐛 fixed callback-related issue (nlohmann/json#971 (comment))
b5c54b41f 📝 overworked documentation
07494e06d 🚨 fixed some compiler warnings
d5b21b051 Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax
0cc3db4f1 add static_asserts on SAX interface
38f8a51a8 use abstract sax class in parser tests
9bbb13309 remove no_limit constant and default values
442886d04 use templates in the sax interface instead of virtuals
f6febbe35 split meta.hpp, add detected_t (used to define concepts)
3ac2d81a9 🔨 fixed a MinGW error #1193
be2065dce 🚨 fixing a MinGW warning #1192
fed70f6bf 🎨 reindented code
0e748f2f8 Merge pull request #1187 from devsisters/json-internal-catch
861ee400c Merge pull request #1176 from grembo/develop
3ce432535 📝 updated documentation of used compilers
ba4a19d4a 👷 added more CI workers
043eff5ba 👷 added more CI workers
05b27e83b Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4.
d5aaeb4cc Make section names unique in loops, as catch doesn't support duplicate sections, see also catchorg/Catch2#816 (comment)
3760a38b7 🏁 implicit conversion is not allowed with MSVC
5b1441166 🏁 trying to fix C2440 error
347e77bdc 🚑 fix for #1169
04372a8c5 🏁 fix for #1168
d0e60de43 Add new JSON_INTERNAL_CATCH macro function
7bfc406de 📝 added note about CocoaPods #1148
d456a2d77 Merge pull request #1151 from sonulohani/bigObjFix
b8ad3388e Fixed compiler error in VS 2015 for debug mode nlohmann/json#1114
39dd775e3 🔨 cleanup after #1134
86a96b059 Merge pull request #1134 from Daniel599/feature/items_iterator
396a914f9 🔨 added macro to disable compiler check #1128
bab582650 Merge pull request #1144 from jrakow/cppreference-link-fix
515cfc2d8 Merge pull request #1142 from jrakow/develop
963d06a13 📝 fix links to cppreference named requirements
9f00db48d 📝 link to cppreference via HTTPS
ec2ebd5ec meson: add multiple headers target
0bb36bb14 meson: fix include directory
62457729e 📝 mentioned MinGW in README
09c0df4a2 👷 choosing correct image
1bbc4a085 👷 using Ninja to speed up build
d8fe13fc8 🔨 fixed escaping for MinGW
e59b93092 👷 trying a more recent compiler
937d68e2e 👷 forgot old PATH
989ad9b75 👷 using help from https://stackoverflow.com/a/48509334/266378
067e28828 👷 set build type
7bbc06b48 👷 forgot quotes
441e5d87e 👷 experimenting with AppVeyor and MinGW
7fa4ddf93 💄 fixed indentation
bf348ca8a Merge pull request #1028 from gracicot/develop
ed6a0686d 🔨 small refactoring to improve branch coverage
c8bfdfd96 👷 tryping different platforms for AppVeyor
c02de445b 🚨 fixed more compiler warnings
66dd1a846 🚨 fixed more compiler warnings
850922269 🚨 removed compiler warnings
0460b9097 📝 fix for #1052 #1139
85f35a1d5 📝 documentation fix
e7c1638d1 💄 cleanup
1c81e9f5a Merge pull request #1130 from agrianius/develop
d505ed7b3 Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion
2c920a103 run make amalgamate
2b37d7ed8 from_json: add overload for std::unordered_map
299469cfd from_json: add missing template arguments for std::map
1566ad405 fixed compile error for #1045; to_json for iternation_proxy_internal was needed
f574d7e08 simplify templates for operators, add more checks
cd28d872e forward declarations to make new compilers happy
3d3055909 define global operator< for const char* and alt_string
4feb8211c test (non)equality for alt_string implementation
14e6278c2 Merge branch 'develop' of github.com:gracicot/json into develop
7acd90b65 Fixed check for compatible string type
5676a2a07 Aligned template declaration
e0e7fa39e Re-added external_constructor with string compatible types
4778c02ab Set MSVC version from 1514 and older
714c59268 Disabled implicit conversion to string_view on MSVC 15.13 and older
e830bc502 Merge pull request #1117 from TinyTinni/develop
ecadcdb59 added char cast
48656a49f typo
64acb42aa remove stringstream dependency
8efbf8d7b 📝 documentation to avoid future issues like #1108
e5a67fc3f Merge branch 'develop' of https://github.com/nlohmann/json into develop
a49644ab7 🚑 adjusted Fuzzer to new parser
0efaf891e Merge pull request #1089 from theodelrieu/feature/map_conversion
c5e63fd68 Provide a from_json overload for std::map
db03d0931 Merge branch 'feature/key_ref' into develop (fixes #1098)
cf9299d22 Merge branch 'feature/sax2' into develop #971
3cdc4d784 📝 added documentation
adf09726b Merge branch 'develop' into feature/sax2
481ace65c 🔨 only calculate array index string when needed #1098
1c6b332dc 👌 mitigating cppcheck bug #1101
90eb0a91e ⚡ keys are now returned as const reference #1098
1f84cc2c8 ✅ adjusted test cases
717301d1b Merge branch 'testsuite' into feature/sax2
4639bb2c8 ✅ added more tests from recent nst's JSONTestSuite
e94862a64 🚑 fixed error in callback logic
ae213721b 🔨 removed unget function for wstring parsers
5ff2abb90 Merge branch 'develop' into feature/sax2
567fe9b7a Merge pull request #1078 from martin-mfg/patch-1
377e95665 fix typo in readme
5da596385 Update issue templates
7bbe7bb98 🔥 removed old issue template
14f01e198 🔧 update issue templates
86b0732a1 📝 added public key used for commits and releases
ed69e50ad 📄 added SPDX-License-Identifier
5bc4ff9da Merge branch 'feature/wstring' into develop
fa3e42f82 Merge branch 'develop' into feature/wstring
b5d1755df 🔥 removed commented-out test cases #1060
0ab8fab33 Merge pull request #1058 from dns13/patch-1
65b4d8251 Fix typo in single_include, too
53fb23009 Fix typo
46ec2fddf 📝 updated THANKS list
b8bfd1140 Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements
33a2154f8 Enable target namespaces and build dir project config
29362c6ac Merge pull request #1047 from jammehcow/patch-1
c02a3155d 👷 added Xcode 9.3 builder
8d8f89077 💩 first try on #1045
7f20e9ddc Fixed incorrect version number in README
031b88d31 Make the CMake install dir user-configurable
aaee18ce9 Added test for string conversion with string_view
7c503c64b Merge pull request #1043 from coryan/patch-1
4286b16b7 Fix trivial typo in comment.
cf91b4f2b Merge branch 'develop' into feature/wstring
f924df183 Merge branch 'develop' into feature/sax2
acf10d9af Merge pull request #1041 from ax3l/topic-spack
e1ea8369a Merge branch 'develop' into feature/sax2
40f279c59 Merge branch 'feature/issue1021' into develop
18a0271a9 Merge branch 'develop' into feature/issue1021
1ae989638 Package Manager: Spack
83b143382 Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin
e439a1a9a CMake: 3.8+ is Sufficient
495436a5d Merge pull request #1026 from ktonon/develop
a35d414c3 Update CMake to latest on Travis
08a7233d1 🚑 fixed commit 1e08654
1e08654f9 🔨 cleanup
aa89c5e04 🔨 removing unget_character() function from input adapters #834
6678eb2b4 ✅ improved test coverage #1031
16c5bfeaa 👌 fixed compiler warnings #1031
727dd4664 🔨 trying to make tests run with MSVC #1031
ab89ae4e5 🔨 trying to make tests run with MSVC #1031
eb06d0531 🚧 added input adapter for wide strings #1031
ba6edd563 🔨 cleanup
850671b9f 🔨 using a vector<bool> for the parser hierarchy
4efa8cdb4 💚 fixed Valgrind options #1030
830c93fd0 📝 fixed example for operator> #1029
c78dbc366 Added test for conversion to string_view
53d8d5792 Amalgamate single include
5f723bbec 🔨 realized callback parser wirh SAX interface #971
896a9db46 🔨 improved code #1021
73cc5089e Using target_compile_features to specify C++ 11 standard
a9baab76c 🚑 fix for #1021
4f6b2b642 🔨 changed SAX interface
2537677e4 ✅ improved test coverage
9e1abb484 ✅ improved coverage
1e38ffc01 ✅ more tests
25f56ff20 📝 updated documentation
99ecca55c ✅ improved test coverage
9e07e9b4e ✨ implemented non-throwing binary reader
a271ee5f1 ♻️ proper use of SAX parser for binary formats
943d64105 🔨 some refactoring
22929fe18 🚧 started a SAX/DOM/callback parser
375b05a17 🔨 cleanup
606a25195 ✅ improved test coverage
c87ffad45 ♻️ implemented a non-recursive parser
2a5506ed9 Amalgamated headers
816570799 basic_json now supports getting many type of strings
27cf05af8 Merge branch 'develop' into feature/sax2
d2dd27dc3 Merge branch 'release/3.1.2' into develop
a52e8355b ⏪ oops
21410d50a 🏁 moved /Wall to CMake
829ed74d6 🏁 experimenting with /Wall
1262d474e 🏁 fixed an MSVC warning
282bafae4 🔨 fixed compilation error
abac6a0e8 Merge branch 'develop' into feature/sax2
3d4f6a294 🔨 cleaner exception interface
ad47b0fbd ♻️ refactored binary readers to use a SAX parser
149d2fd09 💚 improved test coverage
6399cd303 Merge branch 'develop' into feature/sax2
35e43df62 Merge branch 'develop' into feature/sax2
7c1a78889 Merge branch 'develop' into feature/sax2
8b379948d 🔥 replaced acceptor with SAX parser
303a0c584 Merge branch 'develop' into feature/sax2
5beab8055 🔨 using the SAX-DOM parser
faf2546a1 🔨 simplified SAX-DOM parser
5b9d03cfd 🔨 added SAX-DOM-Parser
9d2742952 🔨 added error messages to SAX interface
86991d520 Merge branch 'develop' into feature/sax2
3ff945533 🔨 added a SAX-DOM-Parser
21352c4d8 ♻️ refactored SAX parser
981e226ca Merge branch 'develop' into feature/sax2
8d6b3d44d 👌 fixed some compiler warnings
8c7f46f7d 🔨 removed a logic error and improved coverage
922f7a3d0 ✅ added more tests for SAX parsing
ac230e8b4 🔨 fixed test cases to be more robust
374ebacc5 ✨ added a SAX parser #971

git-subtree-dir: libraries/json
git-subtree-split: 8c20571136f2d5351b379a06ad6591bd980880fe

.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/Bug_report.md

@@ -1,22 +1,19 @@
-**Bug Report**
-
-- What is the issue you have?
-
-- Please describe the steps to reproduce the issue. Can you provide a small but working code example?
-
-- What is the expected behavior?
-
-- And what is the actual behavior instead?
-
-- Which compiler and operating system are you using? Is it a [supported compiler](https://github.com/nlohmann/json#supported-compilers)?
-
-- Did you use a released version of the library or the version from the `develop` branch?
-
-- If you experience a compilation error: can you [compile and run the unit tests](https://github.com/nlohmann/json#execute-unit-tests)?
-
-
-**Feature Request**
-
-- Describe the feature in as much detail as possible.
-
-- Include sample usage where appropriate.
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+- What is the issue you have?
+
+- Please describe the steps to reproduce the issue. Can you provide a small but working code example?
+
+- What is the expected behavior?
+
+- And what is the actual behavior instead?
+
+- Which compiler and operating system are you using? Is it a [supported compiler](https://github.com/nlohmann/json#supported-compilers)?
+
+- Did you use a released version of the library or the version from the `develop` branch?
+
+- If you experience a compilation error: can you [compile and run the unit tests](https://github.com/nlohmann/json#execute-unit-tests)?

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,9 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+- Describe the feature in as much detail as possible.
+
+- Include sample usage where appropriate.

.travis.yml

@@ -155,6 +155,12 @@ matrix:
   - os: osx
     osx_image: xcode9.2
 
+  - os: osx
+    osx_image: xcode9.3
+
+  - os: osx
+    osx_image: xcode9.4
+
   # Linux / GCC
 
   - os: linux
@@ -189,15 +195,23 @@ matrix:
         sources: ['ubuntu-toolchain-r-test']
         packages: ['g++-7', 'ninja-build']
 
+  - os: linux
+    compiler: gcc
+    env: COMPILER=g++-8
+    addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: ['g++-8', 'ninja-build']
+
   - os: linux
     compiler: gcc
     env:
-      - COMPILER=g++-7
+      - COMPILER=g++-8
       - CXXFLAGS=-std=c++17
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-7', 'ninja-build']
+        packages: ['g++-8', 'ninja-build']
 
   # Linux / Clang
 
@@ -257,15 +271,23 @@ matrix:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
         packages: ['g++-6', 'clang-5.0', 'ninja-build']
 
+  - os: linux
+    compiler: clang
+    env: COMPILER=clang++-6.0
+    addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0']
+        packages: ['g++-6', 'clang-6.0', 'ninja-build']
+
   - os: linux
     compiler: clang
     env:
-      - COMPILER=clang++-5.0
+      - COMPILER=clang++-6.0
       - CXXFLAGS=-std=c++1z
     addons:
       apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
-        packages: ['g++-6', 'clang-5.0', 'ninja-build']
+        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0']
+        packages: ['g++-6', 'clang-6.0', 'ninja-build']
 
 ################
 # build script #
@@ -277,6 +299,7 @@ script:
      if [[ (-x $(which brew)) ]]; then
        brew update
        brew install cmake ninja
+       brew upgrade cmake
        cmake --version
      fi
 

CMakeLists.txt

@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.8)
 
 ##
 ## PROJECT
 ## name and version
 ##
-project(nlohmann_json VERSION 3.1.2 LANGUAGES CXX)
+project(nlohmann_json VERSION 3.2.0 LANGUAGES CXX)
 
 ##
 ## INCLUDE
@@ -22,13 +22,15 @@ option(JSON_MultipleHeaders "Use non-amalgamated version of the library." OFF)
 ## CONFIGURATION
 ##
 set(NLOHMANN_JSON_TARGET_NAME               ${PROJECT_NAME})
-set(NLOHMANN_JSON_CONFIG_INSTALL_DIR        "lib/cmake/${PROJECT_NAME}")
+set(NLOHMANN_JSON_CONFIG_INSTALL_DIR        "lib/cmake/${PROJECT_NAME}"
+  CACHE INTERNAL "")
 set(NLOHMANN_JSON_INCLUDE_INSTALL_DIR       "include")
 set(NLOHMANN_JSON_TARGETS_EXPORT_NAME       "${PROJECT_NAME}Targets")
 set(NLOHMANN_JSON_CMAKE_CONFIG_TEMPLATE     "cmake/config.cmake.in")
-set(NLOHMANN_JSON_CMAKE_CONFIG_DIR          "${CMAKE_CURRENT_BINARY_DIR}/cmake_config")
+set(NLOHMANN_JSON_CMAKE_CONFIG_DIR          "${CMAKE_CURRENT_BINARY_DIR}")
 set(NLOHMANN_JSON_CMAKE_VERSION_CONFIG_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
 set(NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Config.cmake")
+set(NLOHMANN_JSON_CMAKE_PROJECT_TARGETS_FILE "${NLOHMANN_JSON_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Targets.cmake")
 
 if (JSON_MultipleHeaders)
     set(NLOHMANN_JSON_INCLUDE_BUILD_DIR "${PROJECT_SOURCE_DIR}/include/")
@@ -43,6 +45,8 @@ endif()
 ## create target and add include path
 ##
 add_library(${NLOHMANN_JSON_TARGET_NAME} INTERFACE)
+add_library(${PROJECT_NAME}::${NLOHMANN_JSON_TARGET_NAME} ALIAS ${NLOHMANN_JSON_TARGET_NAME})
+target_compile_features(${NLOHMANN_JSON_TARGET_NAME} INTERFACE cxx_std_11)
 
 target_include_directories(
     ${NLOHMANN_JSON_TARGET_NAME}
@@ -51,8 +55,8 @@ target_include_directories(
     $<INSTALL_INTERFACE:include>
 )
 
-## add debug view defintion file for msvc (natvis) [cmake <= 3.2.2 does not support export of source files]
-if (MSVC AND CMAKE_VERSION VERSION_GREATER "3.2.2")
+## add debug view definition file for msvc (natvis)
+if (MSVC)
     set(NLOHMANN_ADD_NATVIS TRUE)
     set(NLOHMANN_NATVIS_FILE "nlohmann_json.natvis")
     target_sources(
@@ -62,7 +66,7 @@ if (MSVC AND CMAKE_VERSION VERSION_GREATER "3.2.2")
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${NLOHMANN_NATVIS_FILE}>  
     )
 endif()
-           
+
 ##
 ## TESTS
 ## create and configure the unit test target
@@ -102,12 +106,18 @@ if (NLOHMANN_ADD_NATVIS)
         DESTINATION .
 )
 endif()
+export(
+    TARGETS ${NLOHMANN_JSON_TARGET_NAME}
+    NAMESPACE ${PROJECT_NAME}::
+    FILE ${NLOHMANN_JSON_CMAKE_PROJECT_TARGETS_FILE}
+)
 install(
     TARGETS ${NLOHMANN_JSON_TARGET_NAME}
     EXPORT ${NLOHMANN_JSON_TARGETS_EXPORT_NAME}
     INCLUDES DESTINATION ${NLOHMANN_JSON_INCLUDE_INSTALL_DIR}
 )
 install(
     EXPORT ${NLOHMANN_JSON_TARGETS_EXPORT_NAME}
+    NAMESPACE ${PROJECT_NAME}::
     DESTINATION ${NLOHMANN_JSON_CONFIG_INSTALL_DIR}
 )