From 190f239edf683d4097070615801b128a350c093a Mon Sep 17 00:00:00 2001
From: Orien Madgwick <_@orien.io>
Date: Sat, 26 Dec 2020 10:37:49 +1100
Subject: [PATCH 1/2] Allow running on Ruby 3.0

---
 Gemfile.lock      | 8 +++++---
 cfn-model.gemspec | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index df14570..a5c7f4d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,10 +39,12 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    simplecov (0.18.1)
+    simplecov (0.20.0)
       docile (~> 1.1)
-      simplecov-html (~> 0.11.0)
-    simplecov-html (0.11.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     unicode-display_width (1.6.1)
 
 PLATFORMS
diff --git a/cfn-model.gemspec b/cfn-model.gemspec
index b7577a1..c738b89 100644
--- a/cfn-model.gemspec
+++ b/cfn-model.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.require_paths << 'lib'
 
-  s.required_ruby_version = '~> 2.2'
+  s.required_ruby_version = '>= 2.2.0'
 
   s.add_development_dependency 'rubocop'
 

From c373fe948d43bf45ee34cb9509156b5713bb099e Mon Sep 17 00:00:00 2001
From: Kevin Formsma <kevin.formsma@gmail.com>
Date: Mon, 18 Jan 2021 17:04:23 -0500
Subject: [PATCH 2/2] Remove support for EOL ruby versions

---
 Gemfile.lock      | 6 +++---
 cfn-model.gemspec | 2 +-
 parse_samples.sh  | 2 +-
 publish.sh        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a5c7f4d..c18fba5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,7 +10,7 @@ GEM
   specs:
     ast (2.4.0)
     diff-lcs (1.3)
-    docile (1.3.2)
+    docile (1.3.5)
     jaro_winkler (1.5.4)
     kwalify (0.7.2)
     parallel (1.19.1)
@@ -39,7 +39,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    simplecov (0.20.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -57,4 +57,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.1.4
+   2.2.3
diff --git a/cfn-model.gemspec b/cfn-model.gemspec
index c738b89..6c3a691 100644
--- a/cfn-model.gemspec
+++ b/cfn-model.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.require_paths << 'lib'
 
-  s.required_ruby_version = '>= 2.2.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.add_development_dependency 'rubocop'
 
diff --git a/parse_samples.sh b/parse_samples.sh
index 5a6878d..5a9acd2 100755
--- a/parse_samples.sh
+++ b/parse_samples.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -l
 
-rvm use 2.2.1
+rvm use 2.5.8
 rvm --force gemset delete cfn_model
 rvm gemset use cfn_model --create
 
diff --git a/publish.sh b/publish.sh
index adc3cac..cd9f2ec 100755
--- a/publish.sh
+++ b/publish.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -ex
-export minor_version="0.5"
+export minor_version="0.6"
 set -o pipefail
 
 gem_name=cfn-model