From d032d1216891744f412d2a3dfb916475e041ab8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janko=20Marohni=C4=87?= Date: Thu, 5 Dec 2024 00:01:25 +0100 Subject: [PATCH] Drop support for Ruby 2.5 --- .github/workflows/ci.yml | 10 +--------- gemfiles/Gemfile.rails-6.0 | 2 +- gemfiles/Gemfile.rails-6.1 | 2 +- lib/generators/rodauth/mailer_generator.rb | 6 +----- lib/generators/rodauth/migration_generator.rb | 6 +----- rodauth-rails.gemspec | 2 +- 6 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e00cd94..3e2d8a0 100644 --- 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 index aa60cd3..1e7b440 100644 --- 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 index f01285f..e5731df 100644 --- 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 index cb85506..7ecdb24 100644 --- 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 index 87142bf..23e269e 100644 --- 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 index 0d91f70..9c47802 100644 --- 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"]