Skip to content

[pull] master from open-source-parsers:master #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 109 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
9059f5c
Roll version numbers for 1.9.4 release (#1223)
baylesj Sep 26, 2020
72db276
version.h: fix the version number in the header
mathstuf Oct 1, 2020
c60ebf7
test: ensure the version numbers agree
mathstuf Oct 1, 2020
5d1cb30
clang-format
cdunn2001 Oct 10, 2020
1664b6b
Try meson/ninja from pypi
cdunn2001 Oct 10, 2020
bb9db78
Do not allow failures on osx
cdunn2001 Oct 10, 2020
5f4e104
Merge pull request #1229 from open-source-parsers/pypi
cdunn2001 Oct 10, 2020
30170d6
Fix c++20 compilation problem for clang10 and fix potential bug due t…
Oct 13, 2020
ceae0e3
Fix clang-tidy warnings (#1231)
oppm Nov 6, 2020
8954092
ENH: Prevent cmake in source builds (#1091)
hjmjohnson Nov 6, 2020
9409824
Fix a precision bug of valueToString, prevent to give an error result…
sclei Dec 15, 2020
be4a512
Remove trailing space characters (#1256)
cdunn2001 Jan 10, 2021
5c4219b
Update version in dox
cdunn2001 Jan 10, 2021
fe9663e
`Json::ValueIterator` operators `*` and `->` need to be const
BillyDonahue Dec 21, 2020
eab8ebe
Disable also Visual Studio warning C4275 (std::exception used as base…
rickyviking Jan 4, 2021
c9a9762
minor fixes for 64 bits and refactor code
GermanAizek Jan 15, 2021
ac28702
Fixed pkg-config Version
dvigne Jan 26, 2021
da9e17d
allow selection of Windows MSVC runtime
yxlao Jan 18, 2021
fda274d
Fix Value::resize to fill all array elements (#1265)
BillyDonahue Feb 10, 2021
09c5ecd
only append _static suffix for microsoft toolchains
skoehler Feb 3, 2021
b1bd848
fix sign-conversion warning (#1268)
BillyDonahue Feb 20, 2021
1ee39a6
add comment for emitUTF8 in header
PinkD Mar 2, 2021
94cda30
Rearrange Comments::set (#1278)
BillyDonahue Mar 18, 2021
b640795
- exported targets go to separate generated file and package config …
sergeyrachev Feb 27, 2021
62f3e03
- declare namespaced export target to simplify the library usage
sergeyrachev Feb 27, 2021
cee42e0
- empty line at end of file
sergeyrachev Feb 27, 2021
a3914b7
- narrowed lines to be aligned with overall file line width
sergeyrachev Mar 6, 2021
2af4a4c
- workaround for CMake < 3.18 ALIAS target limitation to not point to…
sergeyrachev Apr 2, 2021
993e4e2
- isolated namespace targets into separate file
sergeyrachev Apr 14, 2021
bb34617
Merge branch 'cmake-config-improvements' #1271
cdunn2001 May 5, 2021
ed1ab7a
Avoid getline(s, EOF)
cdunn2001 May 5, 2021
5fabc5e
conversion errors only if warnings as errors enabled (#1284)
SpaceIm May 6, 2021
375a111
Add support for Bazel build system (#1275)
mglb May 6, 2021
65bb1b1
CMake: Remove ancient version checks (#1299)
ferdnyc Jun 23, 2021
c39fbda
minor fix for code examples (#1317)
jack-ullery Aug 12, 2021
94a6220
Document skipBom in CharReaderBuilder (#1332)
axic Sep 21, 2021
fa747b1
clang-format is not available by default
cdunn2001 Oct 26, 2021
29f9853
Fix cmake config for POSITION_INDEPENDENT_CODE enabling it just when …
fjtrujy Oct 25, 2021
b22302e
Merge pull request #1347 from fjtrujy/position_independent_code
cdunn2001 Nov 3, 2021
54a5432
Drop compile-time deprecation warning
cdunn2001 Nov 3, 2021
c4904b2
Bump micro version
cdunn2001 Nov 3, 2021
5defb4e
Merge pull request #1351 from open-source-parsers/drop-deprecation-wa…
cdunn2001 Nov 3, 2021
2d55c74
Parse large floats as infinity (#1349) (#1353)
terokinnunen Dec 15, 2021
a1f1613
Fix various typos (#1350)
luzpaz Dec 15, 2021
42e892d
Use default rather than hard-coded 8 for maximum aggregate member ali…
jrtc27 Jan 12, 2022
8190e06
Fix wrong usage of doxygen groups (#1417)
mwestphal Jul 14, 2022
3d9bf8e
feat: adds front and back methods to Value type (#1458)
Jun 7, 2023
69098a1
Avoid using cmake glob vars if we are a subproject (#1459)
nkh-lab Jun 27, 2023
cd8173c
Create c-cpp.yml
baylesj Sep 9, 2024
01b11d2
Create meson_build_and_run (#1553)
baylesj Sep 9, 2024
79ade90
Rename meson_build_and_run to meson.yml
baylesj Sep 9, 2024
6668fa5
Delete .github/workflows/c-cpp.yml
baylesj Sep 9, 2024
5c003ec
Fix clang format issues (#1555)
baylesj Sep 9, 2024
d2a9495
Delete .travis.yml (#1557)
baylesj Sep 9, 2024
73c9450
Delete .travis_scripts directory (#1556)
baylesj Sep 9, 2024
c8166dd
add comment space directive (#1558)
baylesj Sep 9, 2024
255ebc5
Create clang-format.yml
baylesj Sep 9, 2024
cc28be0
Update clang-format.yml
baylesj Sep 9, 2024
4290915
Update clang-format.yml
baylesj Sep 9, 2024
ccea7db
Clang format updates (#1560)
baylesj Sep 10, 2024
65d92a4
Update meson.yml (#1554)
baylesj Sep 10, 2024
073ad7e
Update meson.yml
baylesj Sep 10, 2024
c3a9866
Update clang-format.yml
baylesj Sep 10, 2024
0a9b9d9
Fix a parser bug where tokens are misidentified as commas. (#1502)
vslashg Sep 10, 2024
3c2205c
Fix out-of-bounds read. (#1503)
vslashg Sep 10, 2024
e1a3c64
Fix asserts in Value::setComment (#1445)
vslashg Sep 10, 2024
034976a
add a valueToQuotedString overload (#1397)
phlptp Sep 10, 2024
78893d3
Update clang-format.yml
baylesj Sep 10, 2024
57de64b
Add code coverage (#1561)
baylesj Sep 10, 2024
caf5fb0
Update meson.yml (#1562)
baylesj Sep 10, 2024
badbbc7
Update clang-format.yml
baylesj Sep 10, 2024
fd1abe4
build(meson): use find_program('python3') (#1386)
Tachi107 Sep 10, 2024
d39b0df
Bump CMake policy version to avoid deprecation warning (#1499)
roehling Sep 10, 2024
c857395
Update link in amalgamate.py (#1335)
NotWearingPants Sep 10, 2024
c04c0c2
CharReader: Add StructuredError (#1409)
martinduffy1 Sep 10, 2024
483f1c3
Fix compile on windows with clang (#1480)
TsynkPavel Sep 10, 2024
31754ce
Fixed setting JSONCPP_USE_SECURE_MEMORY definition (#1479)
TsynkPavel Sep 10, 2024
742c645
Update readFromString.cpp (#1477)
gnudles Sep 10, 2024
62f7f3e
Add security policy (#1484)
pnacht Sep 10, 2024
a4a083c
remove ccache micro management (#1448)
SpaceIm Sep 10, 2024
d791737
Create cmake.yml (#1563)
baylesj Sep 10, 2024
d13801e
Update meson.yml (#1564)
baylesj Sep 10, 2024
8d1ea70
Update cmake.yml
baylesj Sep 10, 2024
fdb529b
Move removeIndex's result instead of copying (#1516)
jedav Sep 10, 2024
2072e2b
Use current source / binary dir when assuring out of source builds (#…
appgurueu Sep 10, 2024
48d2e10
Opportunistically take advantage of C++20 move-in/out-of stringstream…
beevvy Sep 10, 2024
fa0dff1
Protect target JsonCpp::JsonCpp against multi-include (#1435)
rjoomen Sep 10, 2024
f459022
Update CMakeLists.txt (#1528)
matthieugleg Sep 10, 2024
4b1bd44
Create a jsoncppConfig.cmake file, even if building under meson (#1486)
wdouglass Sep 10, 2024
162ead3
include/json/value.h is changed (#1462)
KeremTAN Sep 10, 2024
99e8ca6
meson.build: fix the version number (#1432)
heitbaum Sep 10, 2024
3aa1192
Introduce CharReaderBuilder::ecma404Mode (#1333)
axic Sep 10, 2024
2067f66
cmake export configuration: allow repeating find_package(jsoncpp) cal…
zeroxia Sep 10, 2024
7f36cdb
Added Value::find with String key (#1467)
petukhovtd Sep 10, 2024
89e2973
Don't use build dir build interfaces (#1419)
Scotty1701 Sep 10, 2024
76ff1db
Fixes PreventInSourceBuilds.cmake to work with add_subdirectory (#1383)
morbo84 Sep 11, 2024
54fc4e2
json_value.cpp bug in the edges of uint/int (#1519)
YaalLek Sep 11, 2024
871f0cc
Release 1.9.6 and move versions to 1.9.7 (#1566)
baylesj Sep 12, 2024
07e3d1b
Fix deallocate for working on old compiers (#1478)
TsynkPavel Sep 12, 2024
8214f71
Fix typo in JSONCPP_USE_SECURE_MEMORY vs JSONCPP_USING_SECURE_MEMORY …
tfc Sep 12, 2024
bd25fc5
fix(build): remove `check_required_components` for meson build (#1570)
chenrui333 Sep 30, 2024
2b3815c
the cgi module was removed from Python3.13 (#1578)
a-detiste Dec 3, 2024
3f86349
Fix name of static library when targeting MinGW. (#1579)
mmuetzel Dec 3, 2024
dca8a24
Fix comparison warnings caused by 54fc4e2 (#1575)
JensMertelmeyer Dec 5, 2024
07a8fe6
Drop pre-C++11 alternatives (#1593)
BillyDonahue Jan 10, 2025
60ccc1f
feat: support std::string_view in Value API (#1584)
evalon32 Jan 10, 2025
ba00447
Added Value::findType with String key (#1574)
SwintonStreet Jan 10, 2025
037752d
Set up for Bazel module builds. (#1597)
bcsgh Mar 12, 2025
ca98c98
Add a BUILD.bazel file for //example. (#1602)
bcsgh Mar 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BasedOnStyle: LLVM
DerivePointerAlignment: false
PointerAlignment: Left

SpacesBeforeTrailingComments: 1
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WarningsAsErrors: ''
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
FormatStyle: none
CheckOptions:
CheckOptions:
- key: modernize-use-using.IgnoreMacros
value: '0'
...
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: clang-format check
on: [check_run, pull_request, push]

jobs:
formatting-check:
name: formatting check
runs-on: ubuntu-latest
strategy:
matrix:
path:
- 'src'
- 'examples'
- 'include'
steps:
- uses: actions/checkout@v4
- name: runs clang-format style check for C/C++/Protobuf programs.
uses: jidicula/[email protected]
with:
clang-format-version: '18'
check-path: ${{ matrix.path }}
18 changes: 18 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: cmake
on: [check_run, push, pull_request]
jobs:
cmake-publish:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: checkout project
uses: actions/checkout@v4

- name: build project
uses: threeal/[email protected]

65 changes: 65 additions & 0 deletions .github/workflows/meson.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: meson build and test
run-name: update pushed to ${{ github.ref }}
on: [check_run, push, pull_request]

jobs:
meson-publish:
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: checkout repository
uses: actions/checkout@v4

- name: setup python
uses: actions/setup-python@v5

- name: meson build
uses: BSFishy/[email protected]
with:
meson-version: 1.5.1
ninja-version: 1.11.1.1
action: build

- name: meson test
uses: BSFishy/[email protected]
with:
meson-version: 1.5.1
ninja-version: 1.11.1.1
action: test

meson-coverage:
runs-on: ubuntu-latest

steps:
- name: checkout repository
uses: actions/checkout@v4

- name: setup python
uses: actions/setup-python@v5

- name: meson build
uses: BSFishy/[email protected]
with:
meson-version: 1.5.1
ninja-version: 1.11.1.1
setup-options: -Db_coverage=true
action: build

- name: meson test
uses: BSFishy/[email protected]
with:
meson-version: 1.5.1
ninja-version: 1.11.1.1
setup-options: -Db_coverage=true
action: test

- name: generate code coverage report
uses: threeal/[email protected]
with:
coveralls-send: true
github-token: ${{ secrets.GITHUB_TOKEN }}
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/libs/
/doc/doxyfile
/dist/
/.cache/

# MSVC project files:
*.sln
Expand All @@ -30,6 +31,7 @@
CMakeFiles/
/pkg-config/jsoncpp.pc
jsoncpp_lib_static.dir/
compile_commands.json

# In case someone runs cmake in the root-dir:
/CMakeCache.txt
Expand All @@ -50,3 +52,10 @@ jsoncpp_lib_static.dir/

# DS_Store
.DS_Store

# temps
/version

# Bazel output paths
/bazel-*
/MODULE.bazel.lock
71 changes: 0 additions & 71 deletions .travis.yml

This file was deleted.

130 changes: 0 additions & 130 deletions .travis_scripts/cmake_builder.sh

This file was deleted.

Loading