Skip to content

Commit d032d12

Browse files
committed
Drop support for Ruby 2.5
1 parent b0c7a81 commit d032d12

File tree

6 files changed

+6
-22
lines changed

6 files changed

+6
-22
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
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"]
18+
ruby: ["ruby-2.6", "ruby-2.7", "ruby-3.0", "ruby-3.1", "ruby-3.2", "ruby-3.3", "jruby-9.4"]
1919
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"]
2020
exclude:
2121
- ruby: "ruby-3.3"
@@ -72,14 +72,6 @@ jobs:
7272
gemfile: "rails-7.1"
7373
- ruby: "ruby-2.6"
7474
gemfile: "rails-7.0"
75-
- ruby: "ruby-2.5"
76-
gemfile: "rails-8.0"
77-
- ruby: "ruby-2.5"
78-
gemfile: "rails-7.2"
79-
- ruby: "ruby-2.5"
80-
gemfile: "rails-7.1"
81-
- ruby: "ruby-2.5"
82-
gemfile: "rails-7.0"
8375
env:
8476
BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.gemfile }}
8577

gemfiles/Gemfile.rails-6.0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gem "rake", "~> 12.0"
99
gem "warning"
1010

1111
gem "rails", "~> 6.0.0"
12-
gem "turbo-rails", "~> 1.4" if RUBY_VERSION >= "2.6"
12+
gem "turbo-rails", "~> 1.4"
1313
gem "sqlite3", "~> 1.4", platforms: :mri
1414
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
1515

gemfiles/Gemfile.rails-6.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ gem "rake", "~> 12.0"
99
gem "warning"
1010

1111
gem "rails", "~> 6.1.0"
12-
gem "turbo-rails", "~> 1.4" if RUBY_VERSION >= "2.6"
12+
gem "turbo-rails", "~> 1.4"
1313
gem "sqlite3", "~> 1.4", platforms: :mri
1414
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
1515

lib/generators/rodauth/mailer_generator.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ def configuration_chunk(email)
8383
end
8484

8585
def erb_eval(content)
86-
if ERB.version[/\d+\.\d+\.\d+/].to_s >= "2.2.0"
87-
ERB.new(content, trim_mode: "-").result(binding)
88-
else
89-
ERB.new(content, 0, "-").result(binding)
90-
end
86+
ERB.new(content, trim_mode: "-").result(binding)
9187
end
9288

9389
def emails

lib/generators/rodauth/migration_generator.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,7 @@ def migration_content
5454
end
5555

5656
def erb_eval(content)
57-
if ERB.version[/\d+\.\d+\.\d+/].to_s >= "2.2.0"
58-
ERB.new(content, trim_mode: "-").result(binding)
59-
else
60-
ERB.new(content, 0, "-").result(binding)
61-
end
57+
ERB.new(content, trim_mode: "-").result(binding)
6258
end
6359

6460
def migration_chunk(feature)

rodauth-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
1111
spec.homepage = "https://github.com/janko/rodauth-rails"
1212
spec.license = "MIT"
1313

14-
spec.required_ruby_version = ">= 2.5"
14+
spec.required_ruby_version = ">= 2.6"
1515

1616
spec.files = Dir["README.md", "LICENSE.txt", "lib/**/*", "*.gemspec"]
1717
spec.require_paths = ["lib"]

0 commit comments

Comments
 (0)