Skip to content

Commit

Permalink
Merge pull request #223 from countries/drop_eol_versions
Browse files Browse the repository at this point in the history
Drop support for Ruby 2.7, Rails 5.2 and 6.0. Add Ruby 3.3 to test matrix
  • Loading branch information
pmor authored Feb 17, 2024
2 parents 0c71bf5 + 87ce0c5 commit 17fd25c
Show file tree
Hide file tree
Showing 12 changed files with 141 additions and 380 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [2.7, '3.0', 3.1, 3.2]
gemfile: [5.2, '6.0', 6.1, '7.0', 7.1]
ruby: ['3.0', 3.1, 3.2, 3.3]
gemfile: [6.1, '7.0', 7.1]
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/actionpack-${{ matrix.gemfile }}.gemfile
CC_TEST_REPORTER_ID: 0d09e6611c01dedd75511b1c60f62329d01729289e06375cfe67cefe67013d9f
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby ${{ matrix.ruby-version }}
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AllCops:
NewCops: enable
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0

Metrics/MethodLength:
Enabled: false
Expand Down
73 changes: 37 additions & 36 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
PATH
remote: .
specs:
country_select (8.0.2)
countries (~> 5.0)
country_select (8.0.3)
countries (> 5.0, < 7.0)

GEM
remote: https://rubygems.org/
specs:
actionpack (7.1.0)
actionview (= 7.1.0)
activesupport (= 7.1.0)
actionpack (7.1.3)
actionview (= 7.1.3)
activesupport (= 7.1.3)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.0)
activesupport (= 7.1.0)
actionview (7.1.3)
activesupport (= 7.1.3)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activesupport (7.1.0)
activesupport (7.1.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -32,43 +33,43 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
base64 (0.1.1)
bigdecimal (3.1.4)
base64 (0.2.0)
bigdecimal (3.1.6)
builder (3.2.4)
coderay (1.1.3)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
countries (5.6.0)
countries (6.0.0)
unaccent (~> 0.3)
crass (1.0.6)
diff-lcs (1.5.0)
diff-lcs (1.5.1)
docile (1.4.0)
drb (2.1.1)
drb (2.2.0)
ruby2_keywords
erubi (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
loofah (2.21.3)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
method_source (1.0.0)
mini_portile2 (2.8.4)
minitest (5.20.0)
mutex_m (0.1.2)
nokogiri (1.15.4)
mini_portile2 (2.8.5)
minitest (5.22.2)
mutex_m (0.2.0)
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.4-arm64-darwin)
nokogiri (1.16.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-darwin)
nokogiri (1.16.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-linux)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
racc (1.7.1)
rack (3.0.8)
racc (1.7.3)
rack (3.0.9)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
Expand All @@ -80,20 +81,20 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
rake (13.0.6)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rake (13.1.0)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
ruby2_keywords (0.0.5)
simplecov (0.22.0)
docile (~> 1.1)
Expand Down
4 changes: 2 additions & 2 deletions country_select.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
s.require_paths = ['lib']

s.required_ruby_version = '>= 2.7'
s.required_ruby_version = '>= 3.0'

s.add_development_dependency 'actionpack', '~> 7.0'
s.add_development_dependency 'pry', '~> 0'
s.add_development_dependency 'rake', '~> 13'
s.add_development_dependency 'rspec', '~> 3'
s.add_development_dependency 'simplecov', '~> 0.22'

s.add_dependency 'countries', '~> 5.0'
s.add_dependency 'countries', '> 5.0', '< 7.0'
end
9 changes: 0 additions & 9 deletions gemfiles/actionpack-5.2.gemfile

This file was deleted.

111 changes: 0 additions & 111 deletions gemfiles/actionpack-5.2.gemfile.lock

This file was deleted.

9 changes: 0 additions & 9 deletions gemfiles/actionpack-6.0.gemfile

This file was deleted.

Loading

0 comments on commit 17fd25c

Please sign in to comment.