Merge branch 'develop'

This commit is contained in:
alisdair sullivan 2016-12-08 10:11:02 -08:00
commit aaf915e173
4 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,9 @@
v2.8.1
* enable `debug_info` when used via mix
* accept `erlang:timestamp` as input to the parser
v2.8.0 v2.8.0
* add `JSX_FORCE_MAPS` env var for forcing decoding to maps rather than * add `JSX_FORCE_MAPS` env var for forcing decoding to maps rather than

View file

@ -1,4 +1,4 @@
# jsx (v2.8.0) # # jsx (v2.8.1) #
an erlang application for consuming, producing and manipulating [json][json]. an erlang application for consuming, producing and manipulating [json][json].
@ -10,7 +10,7 @@ current status: [![Build Status](https://secure.travis-ci.org/talentdeficit/jsx.
**jsx** is released under the terms of the [MIT][MIT] license **jsx** is released under the terms of the [MIT][MIT] license
copyright 2010-2015 alisdair sullivan copyright 2010-2016 alisdair sullivan
## really important note ## ## really important note ##

View file

@ -4,7 +4,7 @@ use Mix.Project
def project do def project do
[ [
app: :jsx, app: :jsx,
version: "2.8.0", version: "2.8.1",
description: "an erlang application for consuming, producing and manipulating json. inspired by yajl", description: "an erlang application for consuming, producing and manipulating json. inspired by yajl",
deps: deps(Mix.env), deps: deps(Mix.env),
package: package(), package: package(),

View file

@ -1,7 +1,7 @@
{application, jsx, {application, jsx,
[ [
{description, "a streaming, evented json parsing toolkit"}, {description, "a streaming, evented json parsing toolkit"},
{vsn, "2.8.0"}, {vsn, "2.8.1"},
{modules, [ {modules, [
jsx, jsx,
jsx_encoder, jsx_encoder,