Skip to content

Commit

Permalink
Merge pull request #141 from grosser/grosser/27
Browse files Browse the repository at this point in the history
drop rubies before 2.7
  • Loading branch information
grosser authored May 20, 2024
2 parents 0f6bfaa + 900a113 commit 0f0c6d7
Show file tree
Hide file tree
Showing 8 changed files with 302 additions and 213 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: [ '2.5', '2.6', '2.7' ]
ruby: [ '3.0', '3.1', '3.2', '3.3' ]
task: [ 'default' ]
gemfile: [ 'rails52' ]
gemfile: [ 'rails71' ]
include:
- ruby: '2.5' # lowest supported version
- ruby: '3.0' # lowest supported version
task: rubocop
gemfile: rails52
gemfile: rails71
name: ${{ matrix.ruby }} ${{ matrix.gemfile }} rake ${{ matrix.task }}
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ require:
- rubocop-packaging

AllCops:
TargetRubyVersion: 2.5 # keep in sync with minimum version
TargetRubyVersion: 3.0 # keep in sync with minimum version
Exclude:
- vendor/**/*
- gemfiles/vendor/**/*
Expand Down
51 changes: 31 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,38 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activemodel (5.2.2)
activesupport (= 5.2.2)
activerecord (5.2.2)
activemodel (= 5.2.2)
activesupport (= 5.2.2)
arel (>= 9.0)
activesupport (5.2.2)
activemodel (7.1.3.3)
activesupport (= 7.1.3.3)
activerecord (7.1.3.3)
activemodel (= 7.1.3.3)
activesupport (= 7.1.3.3)
timeout (>= 0.4.0)
activesupport (7.1.3.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (9.0.0)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.8)
bump (0.7.0)
concurrent-ruby (1.1.3)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
diff-lcs (1.3)
drb (2.2.1)
forking_test_runner (1.3.0)
parallel_tests (>= 1.3.7)
forwardable (1.3.3)
i18n (1.2.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
mini_portile2 (2.8.1)
minitest (5.11.3)
mini_portile2 (2.8.6)
minitest (5.23.0)
mutex_m (0.2.0)
parallel (1.21.0)
parallel_tests (2.27.0)
parallel
Expand Down Expand Up @@ -71,15 +80,17 @@ GEM
ruby-progressbar (1.11.0)
single_cov (1.3.0)
singleton (0.2.0)
sqlite3 (1.6.0)
sqlite3 (1.7.3)
mini_portile2 (~> 2.8.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
sqlite3 (1.7.3-x86_64-linux)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.1.0)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
activerecord
Expand All @@ -92,7 +103,7 @@ DEPENDENCIES
rubocop
rubocop-packaging
single_cov
sqlite3
sqlite3 (~> 1.4)

BUNDLED WITH
2.5.10
4 changes: 2 additions & 2 deletions fast_gettext.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Gem::Specification.new name, FastGettext::VERSION do |s|
s.homepage = "https://github.com/grosser/#{name}"
s.files = Dir["{lib/**/*.{rb,mo,rdoc},Readme.md,CHANGELOG,LICENSE}"]
s.licenses = ["MIT", "Ruby"]
s.required_ruby_version = '>= 2.5.0'
s.required_ruby_version = '>= 3.0.0'
s.add_runtime_dependency 'prime'

s.add_development_dependency 'rake'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'sqlite3', '~> 1.4' # need to match what activerecord requires
s.add_development_dependency 'rspec'
s.add_development_dependency 'activerecord'
s.add_development_dependency 'i18n'
Expand Down
184 changes: 0 additions & 184 deletions gemfiles/rails52.gemfile.lock

This file was deleted.

2 changes: 1 addition & 1 deletion gemfiles/rails52.gemfile → gemfiles/rails71.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ source "https://rubygems.org"

gemspec path: "../"

gem "rails", "~> 5.2.0"
gem "rails", "~> 7.1.0"
Loading

0 comments on commit 0f0c6d7

Please sign in to comment.