Skip to content

Commit

Permalink
Release 2.0 (#36)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
trobro authored Nov 14, 2020
1 parent a149c15 commit e4b0547
Show file tree
Hide file tree
Showing 100 changed files with 4,574 additions and 974 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: test
on: [push, pull_request]
jobs:
test:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- name: linux-prev-release
os: ubuntu-18.04
env:
BUILD_TYPE: Release
- name: linux-latest-debug
os: ubuntu-20.04
env:
BUILD_TYPE: Debug
HJSON_CXX_FLAGS: "-g -fsanitize=address -fsanitize=leak -fno-omit-frame-pointer -fstack-protector-all -fsanitize=undefined -fno-sanitize-recover"
- name: linux-latest-release
os: ubuntu-20.04
env:
BUILD_TYPE: Release
- name: linux-strtod
os: ubuntu-20.04
env:
BUILD_TYPE: Release
HJSON_NUMBER_PARSER: StrToD
- name: mac-release
os: macos-latest
env:
BUILD_TYPE: Release
- name: mac-strtod
os: macos-latest
env:
BUILD_TYPE: Release
HJSON_NUMBER_PARSER: StrToD
- name: windows-debug
os: windows-latest
env: {}
- name: windows-strtod
os: windows-latest
env:
HJSON_NUMBER_PARSER: StrToD
- name: windows-charconv
os: windows-latest
env:
HJSON_NUMBER_PARSER: CharConv
env: ${{ matrix.env }}
steps:
- uses: actions/checkout@v2
- 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
shell: bash
63 changes: 0 additions & 63 deletions .travis.yml

This file was deleted.

6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
cmake_minimum_required(VERSION 3.8)
cmake_minimum_required(VERSION 3.10)

if(${CMAKE_VERSION} VERSION_LESS 3.15)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
else()
cmake_policy(VERSION 3.15)
endif()

include_guard(GLOBAL)

project(hjson
VERSION 1.6
VERSION 2.0
DESCRIPTION "Human readable JSON"
LANGUAGES CXX)

Expand Down
Loading

0 comments on commit e4b0547

Please sign in to comment.