From fb506d0e2218032dd8de11af35d264f2c27df14d Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Thu, 23 Apr 2026 19:11:24 +0100 Subject: [PATCH 1/3] Support Rails 8.1, Ruby 4.0 --- .github/workflows/test.yml | 2 ++ CHANGELOG.md | 3 ++- ndr_import.gemspec | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c3c8d0..7ac7f12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,10 +18,12 @@ jobs: - '3.2' - '3.3' - '3.4' + - '4.0' gemfile: - gemfiles/Gemfile.rails71 - gemfiles/Gemfile.rails72 - gemfiles/Gemfile.rails80 + - gemfiles/Gemfile.rails81 exclude: # rails 8.0 requires ruby >= 3.2 # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 7572130..fca5c53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [Unreleased] -*no unreleased changes* +### Fixed +* Support Rails 8.1, Ruby 4.0 ## 11.4.1 / 2025-11-05 ### Fixed diff --git a/ndr_import.gemspec b/ndr_import.gemspec index fb4576e..12a6cc9 100644 --- a/ndr_import.gemspec +++ b/ndr_import.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.add_dependency 'activemodel' - spec.add_dependency 'activesupport', '>= 7.1', '< 8.1' + spec.add_dependency 'activesupport', '>= 7.1', '< 8.2' spec.add_dependency 'ndr_support', '>= 5.3.2', '< 6' spec.add_dependency 'rubyzip', '~> 2.0' From 495e21bb5633c58f2b04720a8dbeef5bb74b33d1 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Thu, 23 Apr 2026 19:13:27 +0100 Subject: [PATCH 2/3] Support Rails 8.1, Ruby 4.0 --- gemfiles/Gemfile.rails81 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 gemfiles/Gemfile.rails81 diff --git a/gemfiles/Gemfile.rails81 b/gemfiles/Gemfile.rails81 new file mode 100644 index 0000000..195915c --- /dev/null +++ b/gemfiles/Gemfile.rails81 @@ -0,0 +1,5 @@ +source 'https://rubygems.org' + +gemspec path: '..' + +gem 'activesupport', '~> 8.1.0' From 97fe13f463920db9cc6ff0f95baf1540d4c191b5 Mon Sep 17 00:00:00 2001 From: Brian Shand Date: Thu, 23 Apr 2026 19:47:43 +0100 Subject: [PATCH 3/3] Drop support for Ruby 3.2 --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 1 - CHANGELOG.md | 2 +- ndr_import.gemspec | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 75bff07..c7402a7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@4c56a21280b36d862b5fc31348f463d60bdc55d5 # ruby/setup-ruby@v1 see https://github.com/ruby/setup-ruby/tree/v1 with: - ruby-version: 3.3 + ruby-version: 4.0 - name: Install dependencies run: bundle install - name: Run RuboCop against BASE..HEAD changes diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ac7f12..56e9400 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,6 @@ jobs: fail-fast: false matrix: ruby-version: - - '3.2' - '3.3' - '3.4' - '4.0' diff --git a/CHANGELOG.md b/CHANGELOG.md index fca5c53..5241edd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## [Unreleased] ### Fixed -* Support Rails 8.1, Ruby 4.0 +* Support Rails 8.1, Ruby 4.0. Drop support for Ruby 3.2 ## 11.4.1 / 2025-11-05 ### Fixed diff --git a/ndr_import.gemspec b/ndr_import.gemspec index 12a6cc9..5024153 100644 --- a/ndr_import.gemspec +++ b/ndr_import.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'seven-zip', '~> 1.4' spec.add_dependency 'spreadsheet', '1.2.6' - spec.required_ruby_version = '>= 3.2' + spec.required_ruby_version = '>= 3.3' spec.add_development_dependency 'bundler' spec.add_development_dependency 'rake', '>= 12.3.3'