Skip to content

Commit

Permalink
🔖 set version to 3.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed Jul 31, 2022
1 parent 9aafcbe commit ce0e13c
Show file tree
Hide file tree
Showing 153 changed files with 433 additions and 248 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ body:
label: Library version
description: >
Which version of the library did you use? If it is a released version,
please enter the version number (e.g., 3.10.5). Otherwise, please enter
please enter the version number (e.g., 3.11.0). Otherwise, please enter
the commit hash. If you got the library from another source as the
GitHub repository (e.g., via a package manager), please also state
this.
Expand Down
2 changes: 1 addition & 1 deletion .reuse/templates/json.jinja2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__ _____ _____ _____
__| | __| | | | JSON for Modern C++
| | |__ | | | | | | version 3.10.5
| | |__ | | | | | | version 3.11.0
|_____|_____|_____|_|___| https://github.com/nlohmann/json

{% for copyright_line in copyright_lines %}
Expand Down
2 changes: 1 addition & 1 deletion .reuse/templates/json_support.jinja2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (supporting code)
| | |__ | | | | | | version 3.10.5
| | |__ | | | | | | version 3.11.0
|_____|_____|_____|_|___| https://github.com/nlohmann/json

{% for copyright_line in copyright_lines %}
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors:
email: mail@nlohmann.me
website: https://nlohmann.me
title: "JSON for Modern C++"
version: 3.10.5
version: 3.11.0
date-released: 2022-01-03
license: MIT
repository-code: "https://github.com/nlohmann"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
## PROJECT
## name and version
##
project(nlohmann_json VERSION 3.10.5 LANGUAGES CXX)
project(nlohmann_json VERSION 3.11.0 LANGUAGES CXX)

##
## MAIN_PROJECT CHECK
Expand Down
255 changes: 220 additions & 35 deletions ChangeLog.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ Example:
```cmake
include(FetchContent)
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz)
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.0/json.tar.xz)
FetchContent_MakeAvailable(json)
target_link_libraries(foo PRIVATE nlohmann_json::nlohmann_json)
Expand Down
Binary file modified docs/avatars.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/docset/docset.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "JSON for Modern C++",
"version": "3.10.5",
"version": "3.11.0",
"archive": "JSON_for_Modern_C++.tgz",
"author": {
"name": "Niels Lohmann",
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/basic_json__CompatibleType.output
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{"one":1,"three":3,"two":2}
{"one":1.2,"three":3.4,"two":2.3}
{"one":true,"three":false,"two":true}
{"one":true,"three":false,"two":true}
{"one":true,"three":true,"two":true}

["one","two",3,4.5,false]
[1,2,3,4]
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/max_size.output
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
1
1
1
256204778801521550
1152921504606846975
115292150460684697
576460752303423487
1
10 changes: 5 additions & 5 deletions docs/examples/meta.output
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"compiler": {
"c++": "201103",
"family": "clang",
"version": "13.0.0 (clang-1300.0.29.30)"
"family": "gcc",
"version": "11.3.0"
},
"copyright": "(C) 2013-2022 Niels Lohmann",
"name": "JSON for Modern C++",
"platform": "apple",
"url": "https://github.com/nlohmann/json",
"version": {
"major": 3,
"minor": 10,
"patch": 5,
"string": "3.10.5"
"minor": 11,
"patch": 0,
"string": "3.11.0"
}
}
2 changes: 1 addition & 1 deletion docs/examples/nlohmann_json_version.output
Original file line number Diff line number Diff line change
@@ -1 +1 @@
JSON for Modern C++ version 3.10.5
JSON for Modern C++ version 3.11.0
4 changes: 2 additions & 2 deletions docs/examples/std_hash.output
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ hash(null) = 2654435769
hash(false) = 2654436030
hash(0) = 2654436095
hash(0U) = 2654436156
hash("") = 11160318156688833227
hash("") = 6142509191626859748
hash({}) = 2654435832
hash([]) = 2654435899
hash({"hello": "world"}) = 3701319991624763853
hash({"hello": "world"}) = 4469488738203676328
Binary file modified docs/json.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions docs/mkdocs/docs/integration/cmake.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ and use the namespaced imported target from the generated package configuration:
cmake_minimum_required(VERSION 3.1)
project(ExampleProject LANGUAGES CXX)

find_package(nlohmann_json 3.10.5 REQUIRED)
find_package(nlohmann_json 3.11.0 REQUIRED)

add_executable(example example.cpp)
target_link_libraries(example PRIVATE nlohmann_json::nlohmann_json)
Expand Down Expand Up @@ -77,7 +77,7 @@ to the following.

```cmake title="thirdparty/CMakeLists.txt"
if(EXAMPLE_USE_EXTERNAL_JSON)
find_package(nlohmann_json 3.10.5 REQUIRED)
find_package(nlohmann_json 3.11.0 REQUIRED)
else()
set(JSON_BuildTests OFF CACHE INTERNAL "")
add_subdirectory(nlohmann_json)
Expand All @@ -100,7 +100,7 @@ automatically download a release as a dependency at configure type.

include(FetchContent)

FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz)
FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.0/json.tar.xz)
FetchContent_MakeAvailable(json)

add_executable(example example.cpp)
Expand All @@ -115,7 +115,7 @@ automatically download a release as a dependency at configure type.
```cmake
FetchContent_Declare(json
GIT_REPOSITORY https://github.com/nlohmann/json
GIT_TAG v3.10.5
GIT_TAG v3.11.0
)
```

Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/adl_serializer.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/byte_container_with_subtype.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
8 changes: 4 additions & 4 deletions include/nlohmann/detail/abi_macros.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand All @@ -12,15 +12,15 @@

#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
#if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
#if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 10 || NLOHMANN_JSON_VERSION_PATCH != 5
#if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 0
#warning "Already included a different version of the library!"
#endif
#endif
#endif

#define NLOHMANN_JSON_VERSION_MAJOR 3 // NOLINT(modernize-macro-to-enum)
#define NLOHMANN_JSON_VERSION_MINOR 10 // NOLINT(modernize-macro-to-enum)
#define NLOHMANN_JSON_VERSION_PATCH 5 // NOLINT(modernize-macro-to-enum)
#define NLOHMANN_JSON_VERSION_MINOR 11 // NOLINT(modernize-macro-to-enum)
#define NLOHMANN_JSON_VERSION_PATCH 0 // NOLINT(modernize-macro-to-enum)

#ifndef JSON_DIAGNOSTICS
#define JSON_DIAGNOSTICS 0
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/conversions/from_json.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/conversions/to_chars.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/conversions/to_json.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/exceptions.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/hash.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/input/binary_reader.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/input/input_adapters.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/input/json_sax.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/input/lexer.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/input/parser.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/input/position_t.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/iterators/internal_iterator.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/iterators/iter_impl.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/iterators/iteration_proxy.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/iterators/iterator_traits.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/iterators/primitive_iterator.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/json_pointer.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/json_ref.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/macro_scope.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/macro_unscope.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/meta/call_std/begin.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/meta/call_std/end.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/meta/cpp_future.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
2 changes: 1 addition & 1 deletion include/nlohmann/detail/meta/detected.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.10.5
// | | |__ | | | | | | version 3.11.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
Expand Down
Loading

0 comments on commit ce0e13c

Please sign in to comment.