From 43f6c5f88497187d5a0173e080b97c2a97298302 Mon Sep 17 00:00:00 2001
From: Piotr Kuczynski <piotr.kuczynski@gmail.com>
Date: Wed, 30 Dec 2015 15:52:43 +0100
Subject: [PATCH] Upgrade ruby and rails to latest versions.

---
 .ruby-version              |  2 +-
 Appraisals                 |  6 +++---
 config.gemspec             | 13 ++++++-------
 gemfiles/rails_4.1.gemfile |  2 +-
 gemfiles/rails_4.2.gemfile |  2 +-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 399088bf..b1b25a5f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.6
+2.2.2
diff --git a/Appraisals b/Appraisals
index 8562f6cf..fdc75738 100644
--- a/Appraisals
+++ b/Appraisals
@@ -7,9 +7,9 @@ appraise "rails-4" do
 end
 
 appraise "rails-4.1" do
-  gem "rails", "4.1.12"
+  gem "rails", "4.1.14"
 end
 
 appraise "rails-4.2" do
-  gem "rails", "4.2.3"
-end
\ No newline at end of file
+  gem "rails", "4.2.5"
+end
diff --git a/config.gemspec b/config.gemspec
index bf527bc3..d26ca111 100644
--- a/config.gemspec
+++ b/config.gemspec
@@ -22,22 +22,21 @@ Gem::Specification.new do |s|
   s.files += Dir.glob("doc/**/*")
 
   s.require_paths         = ["lib"]
-  s.required_ruby_version = ">= 2.0.0"
+  s.required_ruby_version = ">= 2.2.2"
 
   s.add_dependency "activesupport",           ">= 3.0"
-  s.add_dependency "deep_merge",              "~> 1.0.0"
+  s.add_dependency "deep_merge",              "~> 1.0.1"
 
-  s.add_development_dependency "bundler",     "~> 1.10.5"
+  s.add_development_dependency "bundler",     "~> 1.11.2"
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "pry"
 
   # Testing
   s.add_development_dependency "appraisal",   "~> 2.1.0"
-  s.add_development_dependency "rails",       "~> 4.2.3"
-  s.add_development_dependency "rspec",       "~> 3.3.0"
-  s.add_development_dependency "rspec-rails", "~> 3.3.3"
-  s.add_development_dependency "test-unit",   "~> 3.1.3"
+  s.add_development_dependency "rails",       "~> 4.2.5"
+  s.add_development_dependency "rspec",       "~> 3.4.0"
+  s.add_development_dependency "rspec-rails", "~> 3.4.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rubocop"
 
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
index 9db4c7cb..0f439d7a 100644
--- a/gemfiles/rails_4.1.gemfile
+++ b/gemfiles/rails_4.1.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.1.13"
+gem "rails", "4.1.14"
 
 gemspec :path => "../"
diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
index d81f5896..17fcb1bd 100644
--- a/gemfiles/rails_4.2.gemfile
+++ b/gemfiles/rails_4.2.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "4.2.4"
+gem "rails", "4.2.5"
 
 gemspec :path => "../"