Drop support for Ruby 2.5

janko · Dec 4, 2024 · d032d12 · d032d12
1 parent b0c7a81
commit d032d12
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["ruby-2.5", "ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "ruby-3.2", "ruby-3.3", "jruby-9.4"]
+        ruby: ["ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "ruby-3.2", "ruby-3.3", "jruby-9.4"]
         gemfile: ["rails-5.0", "rails-5.1", "rails-5.2", "rails-6.0", "rails-6.1", "rails-7.0", "rails-7.1", "rails-7.2", "rails-8.0"]
         exclude:
           - ruby: "ruby-3.3"
@@ -72,14 +72,6 @@ jobs:
             gemfile: "rails-7.1"
           - ruby: "ruby-2.6"
             gemfile: "rails-7.0"
-          - ruby: "ruby-2.5"
-            gemfile: "rails-8.0"
-          - ruby: "ruby-2.5"
-            gemfile: "rails-7.2"
-          - ruby: "ruby-2.5"
-            gemfile: "rails-7.1"
-          - ruby: "ruby-2.5"
-            gemfile: "rails-7.0"
     env:
       BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.gemfile }}
 

diff --git a/gemfiles/Gemfile.rails-6.0 b/gemfiles/Gemfile.rails-6.0
@@ -9,7 +9,7 @@ gem "rake", "~> 12.0"
 gem "warning"
 
 gem "rails", "~> 6.0.0"
-gem "turbo-rails", "~> 1.4" if RUBY_VERSION >= "2.6"
+gem "turbo-rails", "~> 1.4"
 gem "sqlite3", "~> 1.4",                platforms: :mri
 gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 

diff --git a/gemfiles/Gemfile.rails-6.1 b/gemfiles/Gemfile.rails-6.1
@@ -9,7 +9,7 @@ gem "rake", "~> 12.0"
 gem "warning"
 
 gem "rails", "~> 6.1.0"
-gem "turbo-rails", "~> 1.4" if RUBY_VERSION >= "2.6"
+gem "turbo-rails", "~> 1.4"
 gem "sqlite3", "~> 1.4",                platforms: :mri
 gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 

diff --git a/lib/generators/rodauth/mailer_generator.rb b/lib/generators/rodauth/mailer_generator.rb
@@ -83,11 +83,7 @@ def configuration_chunk(email)
         end
 
         def erb_eval(content)
-          if ERB.version[/\d+\.\d+\.\d+/].to_s >= "2.2.0"
-            ERB.new(content, trim_mode: "-").result(binding)
-          else
-            ERB.new(content, 0, "-").result(binding)
-          end
+          ERB.new(content, trim_mode: "-").result(binding)
         end
 
         def emails

diff --git a/lib/generators/rodauth/migration_generator.rb b/lib/generators/rodauth/migration_generator.rb
@@ -54,11 +54,7 @@ def migration_content
         end
 
         def erb_eval(content)
-          if ERB.version[/\d+\.\d+\.\d+/].to_s >= "2.2.0"
-            ERB.new(content, trim_mode: "-").result(binding)
-          else
-            ERB.new(content, 0, "-").result(binding)
-          end
+          ERB.new(content, trim_mode: "-").result(binding)
         end
 
         def migration_chunk(feature)

diff --git a/rodauth-rails.gemspec b/rodauth-rails.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/janko/rodauth-rails"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 2.6"
 
   spec.files         = Dir["README.md", "LICENSE.txt", "lib/**/*", "*.gemspec"]
   spec.require_paths = ["lib"]