Merge pull request #190 from zendesk/jury.razumau/ruby_32

add ruby 3.2, drop ruby 2.6 and rails 4.2
zendesk · Jun 1, 2023 · 925def9 · 925def9
2 parents ea985a2 + 3effe73
commit 925def9
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 218 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,28 +12,17 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.6'
           - '2.7'
           - '3.0'
           - '3.1'
+          - '3.2'
         gemfile:
-          - rails4.2
-          - rails5.1
-          - rails5.2
-          - rails6.0
           - rails6.1
           - rails7.0
-        exclude:
-          - {ruby: '2.6', gemfile: rails7.0}
-          - {ruby: '2.7', gemfile: rails4.2}
-          - {ruby: '3.0', gemfile: rails4.2}
-          - {ruby: '3.0', gemfile: rails5.1}
-          - {ruby: '3.0', gemfile: rails5.2}
-          - {ruby: '3.0', gemfile: rails6.0}
-          - {ruby: '3.1', gemfile: rails4.2}
-          - {ruby: '3.1', gemfile: rails5.1}
-          - {ruby: '3.1', gemfile: rails5.2}
-          - {ruby: '3.1', gemfile: rails6.0}
+        include:
+          - {ruby: '2.7', gemfile: rails5.1}
+          - {ruby: '2.7', gemfile: rails5.2}
+          - {ruby: '2.7', gemfile: rails6.0}
     steps:
       - uses: zendesk/checkout@v3
       - uses: zendesk/setup-ruby@v1

diff --git a/curly-templates.gemspec b/curly-templates.gemspec
@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ["--charset=UTF-8"]
 
-  s.add_dependency("actionpack", [">= 4.2", "< 7.1"])
+  s.add_dependency("actionpack", [">= 5.1", "< 7.1"])
   s.add_dependency("sorted_set")
 
-  s.add_development_dependency("railties", [">= 4.2", "< 7.1"])
+  s.add_development_dependency("railties", [">= 5.1", "< 7.1"])
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", ">= 3")
 

diff --git a/gemfiles/rails4.2.gemfile b/gemfiles/rails4.2.gemfile
diff --git a/gemfiles/rails4.2.gemfile.lock b/gemfiles/rails4.2.gemfile.lock
diff --git a/gemfiles/rails5.1.gemfile.lock b/gemfiles/rails5.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     curly-templates (3.1.0)
-      actionpack (>= 4.2, < 7.1)
+      actionpack (>= 5.1, < 7.1)
       sorted_set
 
 GEM
@@ -166,7 +166,7 @@ DEPENDENCIES
   genspec (>= 0.3.0)
   github-markup
   rails (~> 5.1.0)
-  railties (>= 4.2, < 7.1)
+  railties (>= 5.1, < 7.1)
   rake
   redcarpet
   rspec (>= 3)

diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     curly-templates (3.1.0)
-      actionpack (>= 4.2, < 7.1)
+      actionpack (>= 5.1, < 7.1)
       sorted_set
 
 GEM
@@ -172,7 +172,7 @@ DEPENDENCIES
   genspec (>= 0.3.0)
   github-markup
   rails (~> 5.2.0)
-  railties (>= 4.2, < 7.1)
+  railties (>= 5.1, < 7.1)
   rake
   redcarpet
   rspec (>= 3)

diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
@@ -11,7 +11,7 @@ PATH
   remote: ..
   specs:
     curly-templates (3.1.0)
-      actionpack (>= 4.2, < 7.1)
+      actionpack (>= 5.1, < 7.1)
       sorted_set
 
 GEM
@@ -194,7 +194,7 @@ DEPENDENCIES
   genspec!
   github-markup
   rails (~> 6.0.0)
-  railties (>= 4.2, < 7.1)
+  railties (>= 5.1, < 7.1)
   rake
   redcarpet
   rspec (>= 3)

diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/zendesk/genspec.git
-  revision: 228a684f3d4f7e1499c55feb7b022681ad1af342
+  revision: 76116991caf40ef940076f702f70a141ced84ce2
   branch: rails-7
   specs:
     genspec (0.3.2)
@@ -11,7 +11,7 @@ PATH
   remote: ..
   specs:
     curly-templates (3.1.0)
-      actionpack (>= 4.2, < 7.1)
+      actionpack (>= 5.1, < 7.1)
       sorted_set
 
 GEM
@@ -95,17 +95,17 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.2)
     minitest (5.16.3)
     nio4r (2.5.8)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-darwin)
+    nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
-    racc (1.6.0)
+    racc (1.6.2)
     rack (2.2.4)
     rack-test (2.0.2)
       rack (>= 1.3)
@@ -197,7 +197,7 @@ DEPENDENCIES
   genspec!
   github-markup
   rails (~> 6.1.0)
-  railties (>= 4.2, < 7.1)
+  railties (>= 5.1, < 7.1)
   rake
   redcarpet
   rspec (>= 3)

diff --git a/gemfiles/rails7.0.gemfile.lock b/gemfiles/rails7.0.gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/zendesk/genspec.git
-  revision: 228a684f3d4f7e1499c55feb7b022681ad1af342
+  revision: 76116991caf40ef940076f702f70a141ced84ce2
   branch: rails-7
   specs:
     genspec (0.3.2)
@@ -11,7 +11,7 @@ PATH
   remote: ..
   specs:
     curly-templates (3.1.0)
-      actionpack (>= 4.2, < 7.1)
+      actionpack (>= 5.1, < 7.1)
       sorted_set
 
 GEM
@@ -101,7 +101,7 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.2)
     minitest (5.16.3)
     net-imap (0.3.1)
       net-protocol
@@ -112,14 +112,14 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-darwin)
+    nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
-    racc (1.6.0)
+    racc (1.6.2)
     rack (2.2.4)
     rack-test (2.0.2)
       rack (>= 1.3)
@@ -205,7 +205,7 @@ DEPENDENCIES
   genspec!
   github-markup
   rails (~> 7.0.0)
-  railties (>= 4.2, < 7.1)
+  railties (>= 5.1, < 7.1)
   rake
   redcarpet
   rspec (>= 3)