From d08ab72ace7bf8169874255297b11693faeb1128 Mon Sep 17 00:00:00 2001
From: Henry Popp <hpopp@users.noreply.github.com>
Date: Sat, 9 Jan 2021 11:44:31 -0600
Subject: [PATCH] feat: json_library set to Jason by default (#182)

Also:
- Added initial Contributing section to readme
- Version set to 2.0.0-dev
---
 CHANGELOG.md  |  6 ++++++
 README.md     | 15 +++++++++++++++
 lib/pigeon.ex |  2 +-
 mix.exs       |  6 +++---
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ed06476..1b1a54e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.0.0 (dev)
+
+**Changed**
+
+- Default JSON library set to Jason.
+
 ## v1.6.0
 
 **Added**
diff --git a/README.md b/README.md
index 6f03d014..a0fa5f31 100644
--- a/README.md
+++ b/README.md
@@ -275,3 +275,18 @@ more complex.
      end
    end
    ```
+
+## Contributing
+
+### Testing
+
+Unit tests can be run with `mix test` or `mix coveralls.html`.
+
+### Formatting
+
+This project uses Elixir's `mix format` for formatting. Add a hook in your editor of choice to
+run it after a save. Be sure it respects this project's `.formatter.exs`.
+
+### Commits
+
+Git commit subjects use the [Karma style](http://karma-runner.github.io/5.0/dev/git-commit-msg.html).
diff --git a/lib/pigeon.ex b/lib/pigeon.ex
index 809a03c4..cf3c2ffa 100644
--- a/lib/pigeon.ex
+++ b/lib/pigeon.ex
@@ -95,7 +95,7 @@ defmodule Pigeon do
   """
   @spec json_library :: module
   def json_library do
-    Application.get_env(:pigeon, :json_library, Poison)
+    Application.get_env(:pigeon, :json_library, Jason)
   end
 
   @doc false
diff --git a/mix.exs b/mix.exs
index edcc69bb..d133ee94 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Pigeon.Mixfile do
   use Mix.Project
 
-  @version "1.6.0"
+  @version "2.0.0-dev"
 
   def project do
     [
@@ -57,9 +57,9 @@ defmodule Pigeon.Mixfile do
       {:ex_doc, "~> 0.18", only: :dev},
       {:gen_stage, "~> 0.12 or ~> 1.0"},
       {:httpoison, "~> 0.7 or ~> 1.0"},
+      {:jason, "~> 1.0", optional: true},
       {:joken, "~> 2.1"},
-      {:kadabra, "~> 0.4.3", optional: true},
-      {:poison, "~> 2.0 or ~> 3.0 or ~> 4.0"}
+      {:kadabra, "~> 0.4.3", optional: true}
     ]
   end