diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 81c7841..4380a00 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.0 + ruby-version: 3.4 - 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 ab6dc19..40a9d3b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,13 +5,13 @@ on: [push] jobs: test: strategy: + fail-fast: false matrix: ruby-version: - - '3.1' - '3.2' - '3.3' + - '3.4' gemfile: - - gemfiles/Gemfile.rails70 - gemfiles/Gemfile.rails71 - gemfiles/Gemfile.rails72 - gemfiles/Gemfile.rails80 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8819615..936b407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [Unreleased] -* no unreleased changes * +### Fixed +* Support Ruby 3.4. Drop support for Rails 7.0, Ruby 3.1 ## 6.0.3 / 2025-06-11 ### Fixed diff --git a/canql.gemspec b/canql.gemspec index e171ad0..50561ba 100644 --- a/canql.gemspec +++ b/canql.gemspec @@ -23,11 +23,11 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.required_ruby_version = '>= 3.1' + spec.required_ruby_version = '>= 3.2' spec.add_dependency 'chronic', '~> 0.3' spec.add_dependency 'ndr_support', '>= 3.0', '< 6' - spec.add_dependency 'rails', '>= 7.0', '< 8.1' + spec.add_dependency 'rails', '>= 7.1', '< 8.1' # treetop 1.6.14 causes errors. I think this may be a buggy release and fixed soon, # but I'll restrict the version we use for now. spec.add_dependency 'treetop', '~> 1.6.12', '< 1.6.14' diff --git a/gemfiles/Gemfile.rails70 b/gemfiles/Gemfile.rails70 deleted file mode 100644 index a25d01a..0000000 --- a/gemfiles/Gemfile.rails70 +++ /dev/null @@ -1,19 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '..' - -gem 'rails', '~> 7.0.0' - -gem 'bundler' -gem 'guard' -gem 'guard-minitest' -gem 'guard-rubocop' -gem 'minitest', '>= 5.0.0' -gem 'ndr_dev_support', '>= 6.0', '< 8.0' -gem 'github-linguist' -gem 'pry' -gem 'rake' -gem 'terminal-notifier-guard' if RUBY_PLATFORM =~ /darwin/ - -# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260 -gem 'concurrent-ruby', '1.3.4'