From d98df17dd764405b9955d4770c50a37d267239b0 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Mon, 20 Apr 2015 19:56:13 -0700 Subject: [PATCH 1/6] v2.6.0 --- CHANGES.md | 4 ++++ README.md | 2 +- mix.exs | 4 ++-- src/jsx.app.src | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 966f4eb..8b32304 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +v2.6.0 + +* equivalent to v2.5.3 but created for semver reasons + v2.5.3 * add a `mix.exs` to be buildable by both mix and rebar diff --git a/README.md b/README.md index 4827e73..343ca70 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# jsx (v2.5.3) # +# jsx (v2.6.0) # an erlang application for consuming, producing and manipulating [json][json]. diff --git a/mix.exs b/mix.exs index d8aab4c..c1ab1d7 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ use Mix.Project def project do [ app: :jsx, - version: "2.5.3", + version: "2.6.0", description: "an erlang application for consuming, producing and manipulating json. inspired by yajl", deps: deps(Mix.env), package: package, @@ -16,7 +16,7 @@ use Mix.Project defp opts(:dev), do: [d: :TEST] defp opts(_), do: [] - defp deps(:dev), do: [{:mixunit, "~> 0.9.1", :optional}] + defp deps(:dev), do: [{:mixunit, "~> 0.9.1", [optional: true]}] defp deps(_), do: [] defp package do diff --git a/src/jsx.app.src b/src/jsx.app.src index 50f00b5..ff7b2fd 100644 --- a/src/jsx.app.src +++ b/src/jsx.app.src @@ -1,7 +1,7 @@ {application, jsx, [ {description, "a streaming, evented json parsing toolkit"}, - {vsn, "2.5.3"}, + {vsn, "2.6.0"}, {modules, [ jsx, jsx_encoder, From cd2e69e167a388a08533a91dd64829d45086ad5b Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 12 May 2015 15:13:37 -0700 Subject: [PATCH 2/6] change `mixunit` from an optional dependency to a :dev only dependency --- mix.exs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mix.exs b/mix.exs index c1ab1d7..e402409 100644 --- a/mix.exs +++ b/mix.exs @@ -16,8 +16,7 @@ use Mix.Project defp opts(:dev), do: [d: :TEST] defp opts(_), do: [] - defp deps(:dev), do: [{:mixunit, "~> 0.9.1", [optional: true]}] - defp deps(_), do: [] + defp deps(), do: [{:mixunit, "~> 0.9.1", [only: :dev]}] defp package do [ From 58b9887780050123a6ae9f1f8532dc5a61d11ec3 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 12 May 2015 15:15:39 -0700 Subject: [PATCH 3/6] v2.6.1 --- CHANGES.md | 4 ++++ README.md | 2 +- mix.exs | 4 ++-- src/jsx.app.src | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8b32304..eb7d8f2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +v2.6.1 + +* hex.pm maintenance release + v2.6.0 * equivalent to v2.5.3 but created for semver reasons diff --git a/README.md b/README.md index 343ca70..36d1da6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# jsx (v2.6.0) # +# jsx (v2.6.1) # an erlang application for consuming, producing and manipulating [json][json]. diff --git a/mix.exs b/mix.exs index e402409..b6addfd 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ use Mix.Project def project do [ app: :jsx, - version: "2.6.0", + version: "2.6.1", description: "an erlang application for consuming, producing and manipulating json. inspired by yajl", deps: deps(Mix.env), package: package, @@ -16,7 +16,7 @@ use Mix.Project defp opts(:dev), do: [d: :TEST] defp opts(_), do: [] - defp deps(), do: [{:mixunit, "~> 0.9.1", [only: :dev]}] + defp deps(_), do: [{:mixunit, "~> 0.9.1", [only: :dev]}] defp package do [ diff --git a/src/jsx.app.src b/src/jsx.app.src index ff7b2fd..a724cbb 100644 --- a/src/jsx.app.src +++ b/src/jsx.app.src @@ -1,7 +1,7 @@ {application, jsx, [ {description, "a streaming, evented json parsing toolkit"}, - {vsn, "2.6.0"}, + {vsn, "2.6.1"}, {modules, [ jsx, jsx_encoder, From dfcba6e471ba3a1a5b0d05350238ea11a25e6b47 Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 12 May 2015 18:47:57 -0700 Subject: [PATCH 4/6] update mix deps --- mix.exs | 2 +- mix.lock | 1 + rebar.lock | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 mix.lock create mode 100644 rebar.lock diff --git a/mix.exs b/mix.exs index b6addfd..3cfbb27 100644 --- a/mix.exs +++ b/mix.exs @@ -16,7 +16,7 @@ use Mix.Project defp opts(:dev), do: [d: :TEST] defp opts(_), do: [] - defp deps(_), do: [{:mixunit, "~> 0.9.1", [only: :dev]}] + defp deps(_), do: [{:mixunit, git: "git@github.com:talentdeficit/mixunit.git", only: :dev}] defp package do [ diff --git a/mix.lock b/mix.lock new file mode 100644 index 0000000..4317a5d --- /dev/null +++ b/mix.lock @@ -0,0 +1 @@ +%{"mixunit": {:git, "git@github.com:talentdeficit/mixunit.git", "9cf0098a069e70f65300e2939d0c2c06abb71cd1", []}} diff --git a/rebar.lock b/rebar.lock new file mode 100644 index 0000000..57afcca --- /dev/null +++ b/rebar.lock @@ -0,0 +1 @@ +[]. From ba77cccd494ac8568186c836e7cda0ed41c1c54d Mon Sep 17 00:00:00 2001 From: Dima Aleksandrov Date: Tue, 19 May 2015 13:17:13 +0200 Subject: [PATCH 5/6] always add maps_support to mix compiled build --- mix.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mix.exs b/mix.exs index 3cfbb27..3c2068b 100644 --- a/mix.exs +++ b/mix.exs @@ -13,8 +13,8 @@ use Mix.Project ] end - defp opts(:dev), do: [d: :TEST] - defp opts(_), do: [] + defp opts(:dev), do: [d: :TEST] ++ opts(:prod) + defp opts(_), do: [d: :maps_support, d: :maps_always] defp deps(_), do: [{:mixunit, git: "git@github.com:talentdeficit/mixunit.git", only: :dev}] From c86b56795b07e0ede13b3bc6f2e8b698f53ce5ff Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Thu, 11 Jun 2015 19:54:29 -0700 Subject: [PATCH 6/6] v2.6.2 --- CHANGES.md | 4 ++++ README.md | 2 +- mix.exs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index eb7d8f2..94e78dc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +v2.6.2 + +* ensure maps are always enabled when compiling via mix + v2.6.1 * hex.pm maintenance release diff --git a/README.md b/README.md index 36d1da6..e0ebf61 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# jsx (v2.6.1) # +# jsx (v2.6.2) # an erlang application for consuming, producing and manipulating [json][json]. diff --git a/mix.exs b/mix.exs index 3c2068b..ee41a63 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ use Mix.Project def project do [ app: :jsx, - version: "2.6.1", + version: "2.6.2", description: "an erlang application for consuming, producing and manipulating json. inspired by yajl", deps: deps(Mix.env), package: package,