Merge branch 'develop'

CHANGES.md

@@ -1,3 +1,11 @@
+v2.6.2
+
+* ensure maps are always enabled when compiling via mix
+
+v2.6.1
+
+* hex.pm maintenance release
+
 v2.6.0
 
 * equivalent to v2.5.3 but created for semver reasons

README.md

@@ -1,4 +1,4 @@
-# jsx (v2.6.0) #
+# jsx (v2.6.2) #
 
 
 an erlang application for consuming, producing and manipulating [json][json]. 

mix.exs

@@ -4,7 +4,7 @@ use Mix.Project
   def project do
     [
       app: :jsx,
-      version: "2.6.0",
+      version: "2.6.2",
       description: "an erlang application for consuming, producing and manipulating json. inspired by yajl",
       deps: deps(Mix.env),
       package: package,
@@ -13,11 +13,10 @@ use Mix.Project
     ]
   end
 
-  defp opts(:dev), do: [d: :TEST]
+  defp opts(:dev), do: [d: :TEST] ++ opts(:prod)
-  defp opts(_), do: []
+  defp opts(_), do: [d: :maps_support, d: :maps_always]
 
-  defp deps(:dev), do: [{:mixunit, "~> 0.9.1", [optional: true]}]
+  defp deps(_), do: [{:mixunit, git: "git@github.com:talentdeficit/mixunit.git", only: :dev}]
-  defp deps(_), do: []
 
   defp package do
     [

mix.lock

@@ -0,0 +1 @@
+%{"mixunit": {:git, "git@github.com:talentdeficit/mixunit.git", "9cf0098a069e70f65300e2939d0c2c06abb71cd1", []}}

rebar.lock

@@ -0,0 +1 @@
+[].

src/jsx.app.src

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