haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-05 13:56:59 +02:00
Code Issues Packages Projects Releases Wiki Activity
4030 commits 16 branches 56 tags 222 MiB
Commit graph

528 commits

Author SHA1 Message Date
Francois Chabot d3caf93ab0
Merge branch 'develop' into 1813-user-input 2020-05-28 03:40:34 -04:00
Francois Chabot 3a91a05db6 added custom input to readme 2020-05-28 03:13:39 -04:00
Quentin Barbarat e44418ea26
readme: fix typo in CMake FetchContent example 2020-05-27 13:51:13 +02:00
Niels Lohmann 325e8ab8ab
🔧 explicitly switch on tests in CI 2020-05-27 13:22:14 +02:00
Niels Lohmann ed5c28d00c
👥 update contributor list 2020-05-27 13:07:24 +02:00
Niels Lohmann 27fe50dc92
📝 add example for contains #2133 
Closes #2133.
 2020-05-26 12:46:04 +02:00
Antony Kellermann 49000cd77d Update documentation to reflect addition of Arch Linux CI testing. 2020-05-25 20:46:39 -04:00
Niels Lohmann 5dec7166ea
Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-18 09:13:22 +02:00
Niels Lohmann 16d78a82e0
👷 add link to GitHub workflows 2020-05-18 09:12:18 +02:00
Niels Lohmann 904642f261
♻️ rename internal_binary_t with binary_t 2020-05-17 22:50:27 +02:00
Niels Lohmann fc267af909
📝 update CI list 2020-05-14 17:53:00 +02:00
Niels Lohmann 33ae93beed
📝 update CI list 2020-05-14 07:55:01 +02:00
Niels Lohmann ec68bb3387
📝 update CI list 2020-05-13 20:18:56 +02:00
Niels Lohmann 6778ad8b0a
📝 update year 2020-05-12 22:26:55 +02:00
Niels Lohmann 7dbe5cf904
📝 update badges 2020-05-12 21:43:33 +02:00
Niels Lohmann a3a803a389
📝 add FOSSA status badge 2020-05-10 13:49:26 +02:00
Niels Lohmann a50a14088c
Merge pull request #2081 from nlohmann/external_test_data 
Use external test data
 2020-05-04 20:58:02 +02:00
Niels Lohmann 2f0d37d7d2
🔥 remove fastcov 2020-05-02 23:48:11 +02:00
Niels Lohmann 9c0c58d948
🔥 remove Doozer CI 2020-05-02 23:41:28 +02:00
ArthurSonzogni f26689e006 Fix README.md 
About pull request:
https://github.com/nlohmann/json/pull/2074

An error has been introduced by accepting the suggestions:
4be4a038cc

One was about removing ~~~, but it was meant to be replaced by ``` in
reality. This caused the README.md to be slightly broken.
 2020-05-01 13:55:24 +02:00
Niels Lohmann 798dbb5c19
📝 add detail 2020-05-01 13:19:49 +02:00
Arthur Sonzogni 4be4a038cc
Apply suggestions from code review 
Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
 2020-04-29 21:08:39 +02:00
ArthurSonzogni c331706644 Add CMake fetchcontent documentation and tests 
Github issue:
https://github.com/nlohmann/json/issues/2073

nlohmann::json documents 2 way of depending on it using CMake
1) Copy-paste the project/source into your own project.
2) Install nlohman::json and then use find_package.

(1) pollutes your git repository, (2) requires everyone to install the
dependencies themselves.

Since 2018, CMake provide some kind of 'package manager' features using
[FetchContent](https://cmake.org/cmake/help/v3.17/module/FetchContent.html)
It gives the following:
~~~cmake
include(FetchContent)

FetchContent_Declare(json
  GIT_REPOSITORY https://github.com/nlohmann/json
  GIT_TAG v3.7.3)

FetchContent_GetProperties(json)
if(NOT json_POPULATED)
  FetchContent_Populate(json)
  add_subdirectory( ${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
~~~

Then declares the dependency in the target using it:
~~~cmake
target_link_library(my_project PRIVATE nlohmann_json::nlohmann_json
~~~

This patch updates the documentation and provides tests.
 2020-04-29 18:28:06 +02:00
Alexander Myasnikov b01bc05b2b
updated wandbox link 2020-04-23 13:32:42 +03:00
Evgenii Sopov d164a2bf09 Added wsjcpp.yml: C++ Source Package Manager 2020-04-11 16:30:04 +07:00
Niels Lohmann c6b298799a
👷 remove failing Travis workers 2020-04-07 09:09:44 +02:00
Niels Lohmann 554e8c7356
Merge pull request #2002 from alexandermyasnikov/develop 
fix error 'setw' is not a member of 'std' in Wandbox example
 2020-04-05 21:58:21 +02:00
Niels Lohmann 379ed1f67e
💰 add sponsor 2020-04-05 15:23:00 +02:00
Alexander Myasnikov 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example 2020-03-21 18:34:40 +03:00
Niels Lohmann 19843b038c
Merge pull request #1933 from dota17/dota17-FAQ 
Update README.md : add a FAQ about memory release
 2020-03-19 11:25:47 +01:00
Niels Lohmann ebb5a4c09f
💰 add sponsor 2020-03-19 11:14:50 +01:00
chenguoping 2ccdfebaa7 fix typo 2020-03-14 18:10:55 +08:00
Alexander “weej” Jones 5fdb1d08aa
README: Fix string representation of dumped json 
As is it's confusing and inconsistent with the indented form right below. The backslash escapes make it confusing.
 2020-03-10 19:37:20 +00:00
Chen 42566c6bef
Update README.md 2020-02-17 15:40:52 +08:00
Chen 88097a250f
Update README.md : add a FAQ about memory release 2020-02-10 21:03:57 +08:00
Antoine Cœur 8d92ca865f Some typos 2020-02-02 17:29:37 +08:00
Niels Lohmann 6a6790ab68
Merge pull request #1917 from jothepro/update-links-to-hunter 
Readme: Updated links to hunter repo & docs
 2020-01-31 11:47:42 +01:00
Dave Lee f25a1287f9
Fix link to parse function in README 2020-01-29 14:19:00 -08:00
jothepro 0257533866
Updated links to hunter repo & docs 
hunter was recently passed over to a new maintainer, this is why the github url & the link to the documentation have changed.
 2020-01-29 22:33:59 +01:00
Joël Lamotte ab538ba523
Formatting 
(proper naming suggested by `build2`'s author)
 2020-01-21 17:49:23 +01:00
Joël Lamotte 708e107d8e
Adds instruction for using Build2's package manager 
I created a `nlohmann-json` package for `build2` (https://build2.org) that have been published on the central public repository https://cppget.org : https://cppget.org/nlohmann-json (at the moment you can see that there is only one version: 3.7.3).

The repository of the package code is there: https://github.com/build2-packaging/nlohmann-json and is owned by the build2 community now. (with build2 you can use either a repository like cppget.org or a git repository so both are useful to users for different use cases).

This patch just add the basic information as to how to use this library with build2.
 2020-01-20 14:50:15 +01:00
Paul Jurczak bc95563814
Update README.md 2020-01-18 14:25:03 -07:00
Niels Lohmann b568619c4a
💰 add sponsor section 2019-12-15 19:26:51 +01:00
Carlos Gomes Martinho ac9df48453
style: format readme 2019-12-01 10:23:24 +01:00
Carlos Gomes Martinho f44e8ac090
revert: adding conan badge 2019-12-01 10:22:48 +01:00
Carlos Gomes Martinho 134a5faa2b
docs: add central repository as conan source to readme 2019-11-29 13:49:53 +01:00
Konstantin Podsvirov f586bc014f README: Package in MSYS2 renamed to nlohmann-json 
This is done to correctly match with the
corresponding package in Archlinux.
 2019-11-23 05:02:20 +03:00
Niels Lohmann c0f52edbc3
📝 add badges 2019-11-22 21:17:31 +01:00
Niels Lohmann 3f044dad81
📝 add Xocde 11.2.1 to CI list 2019-11-22 08:00:41 +01:00
Niels Lohmann 0f6a58eeaf
👥 update contributors 2019-11-06 17:35:04 +01:00
Niels Lohmann 3790bd9ae0
👷 add Xcode 10.2 2019-11-04 06:22:39 +01:00
Niels Lohmann e779714dd8
👷 add Xcode 10.2 2019-11-03 20:45:21 +01:00
Niels Lohmann 0db1692f45
👥 update contributors 2019-11-02 10:24:06 +01:00
Niels Lohmann 1307862b1d
Merge pull request #1694 from eli-schwartz/release-include-meson 
release: add singleinclude and meson.build to include.zip
 2019-11-02 09:28:51 +01:00
Niels Lohmann f7e7a62358
📝 add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER 2019-10-23 20:58:06 +02:00
Eli Schwartz f4332d4097
README: describe how to use json as a meson subproject 
Also call out to the guidelines for using pkg-config dependencies first,
and reference it for other build systems as well.

Although the possibility of installing with a pkg-config file is
somewhat hidden away in the meson docs, it's been deemed less invasive
due to not distracting away from cmake. So it will have to do.
 2019-10-17 15:38:06 -04:00
0xflotus d7579b8cbf
did you mean 'serialization'? 2019-09-30 18:11:44 +02:00
Niels Lohmann 99d7518d21
📝 add OSS Fuzz status badge 2019-09-24 21:01:06 +02:00
Niels Lohmann bf4156056b
✏️ fix a typo 2019-08-27 20:18:04 +02:00
Niels Lohmann d275d05514
📝 update documentation 2019-07-28 20:54:02 +02:00
Niels Lohmann 6c7cde181c
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2019-07-14 20:58:29 +02:00
Konstantin Podsvirov 6a3cdb281e
Package Manager: MSYS2 (pacman) 
Add a package installation instructions for MSYS2 software distro.
 2019-07-12 22:27:17 +03:00
Niels Lohmann 346e9813c5
🚧 add more annotations 2019-07-02 20:25:51 +02:00
Isaac Nickaein 0c214949f5 ✏️ Fix links to create an issue page 2019-06-04 11:27:25 +04:30
Isaac Nickaein b22c577e83 ✏️ Fix brew instructions in README 2019-06-04 11:25:44 +04:30
Isaac Nickaein 0d55ddc5bf ✏️ Fix a typo in README 2019-06-04 11:24:22 +04:30
Isaac Nickaein 40c3d5024a
Fix broken links to documentation 
Fixes #1597 and some other links
 2019-05-12 22:04:01 +04:30
Niels Lohmann cf6b6692aa
Merge branch 'develop' into feature/fastcov 2019-04-06 09:03:35 +02:00
Niels Lohmann f0bc16d899
🔨 overworked coverage targets 2019-04-06 09:02:17 +02:00
Niels Lohmann 63fe1cbbcf
📝 updated README 2019-04-05 18:29:57 +02:00
Viktor Kirilov 82af0ecdc1
Merge branch 'develop' into doctest 2019-03-26 23:32:32 +02:00
Niels Lohmann 24d91cf36f
📝 added Doozer to README 2019-03-26 10:49:14 +01:00
onqtam 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest 2019-03-24 17:21:44 +02:00
Niels Lohmann b37392b7ac
🔖 set version to 3.6.0 2019-03-20 00:19:07 +01:00
Niels Lohmann a6f9b4e36d
👥 added contributors 2019-03-19 17:18:33 +01:00
Viktor Kirilov 365944b0bc
Merge branch 'develop' into doctest 2019-03-18 16:59:36 +02:00
Niels Lohmann 02b3494711
🔥 removing unstable macOS builds on Traivs 2019-03-16 08:28:44 +01:00
Niels Lohmann d39842e68f
Merge pull request #1330 from ax3l/topic-installEmbed 
CMake: Optional Install if Embedded
 2019-03-13 11:13:09 +01:00
Niels Lohmann c11bead2ae
👷 removing more retired Travis images 2019-03-11 21:22:30 +01:00
Niels Lohmann 16d9cdce45
📝 updated documentation of CI 2019-03-11 15:19:50 +01:00
Niels Lohmann e3729ba0a5
💚 fix compiler selection 2019-03-11 07:44:40 +01:00
Niels Lohmann e5c7fd488d
👷 trying new Travis workers 2019-03-10 22:56:14 +01:00
njlr 8aeee4f7e3
Update README.md 
* Updates Buckaroo instructions to v2
 2019-02-25 09:44:38 +00:00
Isaac Nickaein 088a245218
Fix typo in README.ME 
Fixes https://github.com/nlohmann/json/issues/1486.
 2019-02-22 01:05:00 +03:30
Niels Lohmann 68ec3eb8d6
Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon 
remove extra semicolon from readme
 2019-01-25 13:36:18 +01:00
Mark Beckwith cca6d0dbae
docs: README type 
Just another small typo I found in the README.
 2019-01-24 10:49:45 -06:00
Matěj Plch dc21cbb751
remove extra semicolon 
in example of NLOHMANN_JSON_SERIALIZE_ENUM
 2019-01-22 10:13:12 +01:00
onqtam 2f44ac1def moved from Catch to doctest for unit tests 2019-01-15 22:02:16 +02:00
Bruno Oliveira b025d66eb5 Add instructions about using nlohmann/json with the conda package manager 2019-01-15 11:06:26 -02:00
Jef LeCompte 7f73915d4f
Updated year in README.md 2019-01-11 08:54:03 -05:00
Michele Caini 6546cad7bf
Fixed broken links in the README file 2019-01-10 08:54:53 +01:00
Niels Lohmann 847dd2a954
Merge pull request #1420 from skypjack/patch-1 
Fixed broken links in the README file
 2019-01-09 22:33:40 +01:00
Niels Lohmann 937b642e0e
📝 added description on how to use NuGet package #1132 
Closes #1132.
 2019-01-09 21:08:06 +01:00
Michele Caini b8be0f64ae
Fixed broken links to operator[]() and at() 2019-01-09 15:11:54 +01:00
Michele Caini 619bf9c20d
Fixed broke links to RFC7159 2019-01-09 15:05:09 +01:00
Mark Beckwith a559ff8fc6
typo in README 
inintended -> unintended
 2019-01-08 13:24:07 -06:00
Niels Lohmann 98f4e31c3e
📝 formatted picture 2018-12-21 18:33:46 +01:00
Niels Lohmann 58c269b039
📝 updated documentation 2018-12-21 18:27:56 +01:00
Niels Lohmann 117c1d14fb
📝 added contributors to 3.5.0 2018-12-20 22:20:47 +01:00
kjpus 767a3a327d
Link to issue #958 broken 2018-12-04 10:03:10 -05:00