Skip to content

Commit e4b0547

Browse files
authored
Release 2.0 (#36)
* enum class for Hjson::Value types * changed default options * assignment and arithmetic operators for all primitive C++ types * read and write comments * convenience file functions * MarshalWithOptions() replaced by Marshal() overload * DefaultOptions() replaced by brace-or-equal-initializers in EncoderOptions
1 parent a149c15 commit e4b0547

File tree

100 files changed

+4574
-974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+4574
-974
lines changed

.github/workflows/test.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: test
2+
on: [push, pull_request]
3+
jobs:
4+
test:
5+
name: ${{ matrix.name }}
6+
runs-on: ${{ matrix.os }}
7+
strategy:
8+
fail-fast: false
9+
matrix:
10+
include:
11+
- name: linux-prev-release
12+
os: ubuntu-18.04
13+
env:
14+
BUILD_TYPE: Release
15+
- name: linux-latest-debug
16+
os: ubuntu-20.04
17+
env:
18+
BUILD_TYPE: Debug
19+
HJSON_CXX_FLAGS: "-g -fsanitize=address -fsanitize=leak -fno-omit-frame-pointer -fstack-protector-all -fsanitize=undefined -fno-sanitize-recover"
20+
- name: linux-latest-release
21+
os: ubuntu-20.04
22+
env:
23+
BUILD_TYPE: Release
24+
- name: linux-strtod
25+
os: ubuntu-20.04
26+
env:
27+
BUILD_TYPE: Release
28+
HJSON_NUMBER_PARSER: StrToD
29+
- name: mac-release
30+
os: macos-latest
31+
env:
32+
BUILD_TYPE: Release
33+
- name: mac-strtod
34+
os: macos-latest
35+
env:
36+
BUILD_TYPE: Release
37+
HJSON_NUMBER_PARSER: StrToD
38+
- name: windows-debug
39+
os: windows-latest
40+
env: {}
41+
- name: windows-strtod
42+
os: windows-latest
43+
env:
44+
HJSON_NUMBER_PARSER: StrToD
45+
- name: windows-charconv
46+
os: windows-latest
47+
env:
48+
HJSON_NUMBER_PARSER: CharConv
49+
env: ${{ matrix.env }}
50+
steps:
51+
- uses: actions/checkout@v2
52+
- run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DHJSON_ENABLE_TEST=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DHJSON_NUMBER_PARSER=${HJSON_NUMBER_PARSER} -DCMAKE_CXX_FLAGS="${HJSON_CXX_FLAGS}" .. && cmake --build . --target runtest
53+
shell: bash

.travis.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
cmake_minimum_required(VERSION 3.8)
1+
cmake_minimum_required(VERSION 3.10)
22

33
if(${CMAKE_VERSION} VERSION_LESS 3.15)
44
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
55
else()
66
cmake_policy(VERSION 3.15)
77
endif()
88

9+
include_guard(GLOBAL)
10+
911
project(hjson
10-
VERSION 1.6
12+
VERSION 2.0
1113
DESCRIPTION "Human readable JSON"
1214
LANGUAGES CXX)
1315

0 commit comments

Comments
 (0)