From 6971ea72525dae40888ee6fc03d1305ec08663c0 Mon Sep 17 00:00:00 2001
From: Eloy <ej.perezgomez@gmail.com>
Date: Sun, 24 Jun 2018 12:17:20 +0200
Subject: [PATCH 1/2] Drop support for Ruby 2.2

---
 .travis.yml                             | 1 -
 README.de.md                            | 4 ++--
 README.es.md                            | 4 ++--
 README.md                               | 6 +++---
 README.ru.md                            | 4 ++--
 sinatra-contrib/sinatra-contrib.gemspec | 2 +-
 sinatra.gemspec                         | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index decdad50eb..832dc434a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ addons:
   - g++-4.8
 
 rvm:
-  - 2.2.10
   - 2.3.8
   - 2.4.5
   - 2.5.3
diff --git a/README.de.md b/README.de.md
index 876cdc0042..74ed3fdf13 100644
--- a/README.de.md
+++ b/README.de.md
@@ -3120,9 +3120,9 @@ thin --threaded start
 Die folgenden Versionen werden offiziell unterstützt:
 
 <dl>
-  <dt>Ruby 2.2</dt>
+  <dt>Ruby 2.3</dt>
   <dd>
-    2.2 wird vollständig unterstützt. Es gibt derzeit keine Pläne die
+    2.3 wird vollständig unterstützt. Es gibt derzeit keine Pläne die
     offizielle Unterstützung zu beenden
   </dd>
 
diff --git a/README.es.md b/README.es.md
index 5cd530e141..de07c3b9eb 100644
--- a/README.es.md
+++ b/README.es.md
@@ -3083,9 +3083,9 @@ thin --threaded start
 Las siguientes versiones de Ruby son soportadas oficialmente:
 
 <dl>
-  <dt>Ruby 2.2</dt>
+  <dt>Ruby 2.3</dt>
     <dd>
-      2.2 Es totalmente compatible y recomendado. Actualmente no hay planes
+      2.3 Es totalmente compatible y recomendado. Actualmente no hay planes
       soltar el apoyo oficial para ello.
     </dd>
 
diff --git a/README.md b/README.md
index 336ac2b994..cbc30098c2 100644
--- a/README.md
+++ b/README.md
@@ -3050,9 +3050,9 @@ thin --threaded start
 
 The following Ruby versions are officially supported:
 <dl>
-  <dt>Ruby 2.2</dt>
+  <dt>Ruby 2.3</dt>
   <dd>
-    2.2 is fully supported and recommended. There are currently no plans to
+    2.3 is fully supported and recommended. There are currently no plans to
     drop official support for it.
   </dd>
 
@@ -3070,7 +3070,7 @@ The following Ruby versions are officially supported:
   </dd>
 </dl>
 
-Versions of Ruby prior to 2.2.2 are no longer supported as of Sinatra 2.0.
+Versions of Ruby prior to 2.3 are no longer supported as of Sinatra 2.0.3.
 
 We also keep an eye on upcoming Ruby versions.
 
diff --git a/README.ru.md b/README.ru.md
index b23ac9433d..a94abe6874 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -3089,9 +3089,9 @@ thin --threaded start
 
 Следующие версии Ruby официально поддерживаются:
 <dl>
-  <dt>Ruby 2.2</dt>
+  <dt>Ruby 2.3</dt>
   <dd>
-    Версия 2.2 полностью поддерживается и рекомендуется. В настоящее время нет 
+    Версия 2.3 полностью поддерживается и рекомендуется. В настоящее время нет 
   планов отказаться от официальной поддержки.
   </dd>
 
diff --git a/sinatra-contrib/sinatra-contrib.gemspec b/sinatra-contrib/sinatra-contrib.gemspec
index 7d0d785265..4503946d79 100644
--- a/sinatra-contrib/sinatra-contrib.gemspec
+++ b/sinatra-contrib/sinatra-contrib.gemspec
@@ -34,7 +34,7 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
 EOF
   end
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.add_dependency "sinatra", version
   s.add_dependency "mustermann", "~> 1.0"
diff --git a/sinatra.gemspec b/sinatra.gemspec
index bbe03b3a15..945f6ad8a8 100644
--- a/sinatra.gemspec
+++ b/sinatra.gemspec
@@ -46,7 +46,7 @@ RubyGems 2.0 or newer is required to protect against public gem pushes. You can
 EOF
   end
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.add_dependency 'rack', '~> 2.0'
   s.add_dependency 'tilt', '~> 2.0'

From 0fc7009a3c38a5d286d36ce9538a096384696a7c Mon Sep 17 00:00:00 2001
From: Jordan Owens <jkowens@gmail.com>
Date: Fri, 13 Mar 2020 16:26:36 -0400
Subject: [PATCH 2/2] Update note about dropping Ruby 2.2 support

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cbc30098c2..7d224c5f7e 100644
--- a/README.md
+++ b/README.md
@@ -3070,7 +3070,7 @@ The following Ruby versions are officially supported:
   </dd>
 </dl>
 
-Versions of Ruby prior to 2.3 are no longer supported as of Sinatra 2.0.3.
+Versions of Ruby prior to 2.3 are no longer supported as of Sinatra 2.1.0.
 
 We also keep an eye on upcoming Ruby versions.