haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,373 Commits
16 Branches
56 Tags
222 MiB
Commit Graph

3373 Commits (cd76f59af6852d577c334e75a9fae16b1f3b572f)

Author SHA1 Message Date
Niels Lohmann cd76f59af6
👷 add more GitHub actions workflows 2020-05-12 20:26:17 +02:00
Niels Lohmann b1c1eb145e
🔧 fix maintainer target 2020-05-12 19:36:33 +02:00
Niels Lohmann abeb80411b
📝 fix example 2020-05-12 16:28:26 +02:00
Niels Lohmann 52f5f3d29f
📝 fix example 2020-05-12 16:27:55 +02:00
Niels Lohmann e9a845f08a
📝 fix example output 2020-05-12 16:13:33 +02:00
Niels Lohmann 8e0ae9b46f
⬆️ update Doxyfile 2020-05-12 14:37:35 +02:00
Niels Lohmann afc30a14a7
🔧 set Wandbox script to use HTTPS 2020-05-12 14:37:22 +02:00
Niels Lohmann 1de30bc611
Merge pull request #2100 from nlohmann/fix_coveralls 
Fix Coveralls integration
 2020-05-12 12:26:22 +02:00
Niels Lohmann 76c01501f7
🔧 fix pedantic maintainer targets 2020-05-11 20:03:13 +02:00
Niels Lohmann 66dfa22de2
⚗️ try to fix SSL issue 2020-05-11 14:24:38 +02:00
Niels Lohmann 0ad595709d
⚗️ try to fix SSL issue 2020-05-11 13:40:43 +02:00
Niels Lohmann cbb2d4e4d8
⚗️ try to fix SSL issue 2020-05-11 13:29:40 +02:00
Niels Lohmann 8389c1961b
⚗️ try to fix SSL issue 2020-05-11 13:19:22 +02:00
Niels Lohmann 19b21e61e5
⚗️ try to fix SSL issue 2020-05-11 13:05:53 +02:00
Niels Lohmann 697305819f
⚗️ try to fix SSL issue 2020-05-11 12:37:24 +02:00
Niels Lohmann 18cbcc4135
⚗️ try to fix SSL issue 2020-05-11 12:25:41 +02:00
Niels Lohmann a3a803a389
📝 add FOSSA status badge 2020-05-10 13:49:26 +02:00
Niels Lohmann 5bfb27c865
🚨 fix some warnings 2020-05-08 12:32:28 +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 2304629a3f
📌 use JSON test data v1.0.0 2020-05-04 16:00:00 +02:00
Niels Lohmann e7a88b2d7f
💚 fix AppVeyor and Travis builds 2020-05-03 19:33:01 +02:00
Niels Lohmann 634fa87e5a
Merge pull request #2080 from nlohmann/remove_doozer 
Remove Doozer CI
 2020-05-03 13:58:29 +02:00
Niels Lohmann 24237af983
🎨 fix format 2020-05-03 13:40:23 +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
Niels Lohmann 929f5d398c
🔨 fix coverage tests 2020-05-02 23:24:21 +02:00
Niels Lohmann 752c62b4bd
🔨 remove double tests 2020-05-02 16:07:09 +02:00
Niels Lohmann f0050c9ba0
Merge pull request #2019 from dota17/contains_v2 
fix #1982:json_pointer.contains() exception is incorrectly raised
 2020-05-02 11:04:57 +02:00
Niels Lohmann bec554936c
🔨 fix paths 2020-05-02 10:56:01 +02:00
Niels Lohmann 08c9472184
🔨 simplify workflow 2020-05-01 21:06:41 +02:00
Niels Lohmann 3ae7237f5a
🔨 clean up 2020-05-01 21:01:47 +02:00
Niels Lohmann cfb2f34ebb
🔨 fix benchmarks 2020-05-01 20:59:47 +02:00
Niels Lohmann d0ef591ce2
Merge branches 'develop' and 'external_test_data' of https://github.com/nlohmann/json into external_test_data 2020-05-01 20:23:08 +02:00
Niels Lohmann ec5cfdd307
🔨 properly find and use Git 2020-05-01 16:18:04 +02:00
Niels Lohmann d144459f1e
➕ add git 2020-05-01 16:14:13 +02:00
Niels Lohmann f58383b8ee
🔊 output on failure 2020-05-01 15:22:18 +02:00
Niels Lohmann 7ade3a0efb
➖ remove dependency to FetchContent 2020-05-01 15:14:37 +02:00
Niels Lohmann dbf1a1f413
♻️ download test data from external repository 2020-05-01 14:32:37 +02:00
Niels Lohmann 2251741b53
Merge pull request #2077 from ArthurSonzogni/develop-2 
Fix README.md. Missing ```
 2020-05-01 14:08:59 +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
Niels Lohmann c9f404dc98
Merge pull request #2076 from rmisev/patch-1 
Fix error message about invalid surrogate pairs
 2020-05-01 12:47:39 +02:00
Niels Lohmann b27d8a3253
Merge pull request #2074 from ArthurSonzogni/develop 
Add CMake fetchcontent documentation and tests
 2020-05-01 12:42:29 +02:00
Rimas Misevičius 6f1800889a Fix tests 2020-05-01 00:59:12 +03:00
Rimas Misevičius 4c053e3ec9 Fix tests 2020-05-01 00:48:24 +03:00
Rimas Misevičius 6815968a42 Fix error message about invalid surrogate pairs 
I tested following strings with invalid surrogate pair and unpaired surrogate in files:

1. `"a\uD800\uD800x"`
2. `"a\uD800x"`

The error messge was: "... invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; ..."

I think it must be: "... invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; ..."
 2020-05-01 00:23:04 +03: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
Niels Lohmann db013c9428
Merge pull request #2071 from nlohmann/issue2067 
Properly pass serialize_binary to dump function
 2020-04-29 19:39:58 +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
Niels Lohmann b1fe6ee0d1
Merge pull request #2069 from nlohmann/issue2064 
Fix returning reference to local temporary object
 2020-04-28 20:56:48 +02:00