From 466ad05c3307106ccf77128f4f990960b9ae813e Mon Sep 17 00:00:00 2001
From: German Velasco <germsvel@users.noreply.github.com>
Date: Tue, 13 Mar 2018 10:37:28 -0400
Subject: [PATCH] Bump version to 2.2.0 (#276)

Bump version to 2.2.0. Notable changes include,

- Support for lists in sequences (PR #227)
- Using `Macro.underscore/1` so that factory names don't break in elixir
1.6 (PR #275)
---
 CHANGELOG.md | 15 +++++++++++++++
 README.md    |  4 ++--
 mix.exs      |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a34e615..4948079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,21 @@ complete changelog, see the git history for each version via the version links.
 
 [hex package page]: https://hex.pm/packages/ex_machina
 
+## [2.2.0]
+
+### Added
+
+- Adds support for using lists in sequences ([#227]).
+
+### Fixed
+
+- Elixir 1.6.x changed the behavior of `Regex.split/3` which caused factory
+  names to break. Added a fix in ([#275]).
+
+[2.2.0]: https://github.com/thoughtbot/ex_machina/compare/v2.1.0...v2.2.0
+[#227]: https://github.com/thoughtbot/ex_machina/pull/227
+[#275]: https://github.com/thoughtbot/ex_machina/pull/275
+
 ## [2.1.0]
 
 ### Added
diff --git a/README.md b/README.md
index 3d4df26..3976863 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ In `mix.exs`, add the ExMachina dependency:
 def deps do
   # Get the latest from hex.pm. Works with Ecto 2.0
   [
-    {:ex_machina, "~> 2.1"},
+    {:ex_machina, "~> 2.2"},
   ]
 end
 ```
@@ -43,7 +43,7 @@ In `mix.exs`, add the ExMachina dependency:
 ```elixir
 def deps do
   [
-    {:ex_machina, "~> 2.1", only: :test},
+    {:ex_machina, "~> 2.2", only: :test},
   ]
 end
 ```
diff --git a/mix.exs b/mix.exs
index 3a87856..5d66fb7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -2,7 +2,7 @@ defmodule ExMachina.Mixfile do
   use Mix.Project
 
   @project_url "https://github.com/thoughtbot/ex_machina"
-  @version "2.1.0"
+  @version "2.2.0"
 
   def project() do
     [