diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d13b15..16bf508 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,8 +18,8 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.7'] - rails: ['5.2', '6.1'] + ruby: ['2.7', '3.0'] + rails: ['6.1'] env: BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile' steps: diff --git a/.rubocop.yml b/.rubocop.yml index 27d7ea2..57b83c2 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -13,7 +13,7 @@ AllCops: SuggestExtensions: false DisplayCopNames: true TargetRubyVersion: 2.7 - TargetRailsVersion: 5.2 + TargetRailsVersion: 6.1 Exclude: - bin/**/* - vendor/**/* diff --git a/Appraisals b/Appraisals index b9ae0d3..bc98696 100644 --- a/Appraisals +++ b/Appraisals @@ -1,9 +1,5 @@ # frozen_string_literal: true -appraise 'rails-5.2' do - gem 'railties', '~> 5.2.0' -end - appraise 'rails-6.1' do gem 'railties', '~> 6.1.0' end diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ce68ef..834f6a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### next -* TODO: Replace this bullet point with an actual description of a change. +* Raised minimum supported Ruby/Rails version to 2.7/6.1 (#8) ### 3.6.5 (15 August 2024) diff --git a/Gemfile b/Gemfile index 17cc48d..fe887da 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'appraisal', '~> 2.4' gem 'bundler', '~> 2.3' gem 'countless', '~> 1.1' gem 'guard-rspec', '~> 4.7' -gem 'rails', '>= 5.2' +gem 'rails', '>= 6.1' gem 'rake', '~> 13.0' gem 'rspec', '~> 3.12' gem 'rspec-rails', '~> 5.1' diff --git a/conversejs.gemspec b/conversejs.gemspec index ac8fae3..e30ca02 100644 --- a/conversejs.gemspec +++ b/conversejs.gemspec @@ -33,5 +33,5 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.7' - spec.add_runtime_dependency 'railties', '>= 5.2', '< 7.0' + spec.add_dependency 'railties', '>= 6.1', '< 7.0' end diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 87fb63a..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.4" -gem "bundler", "~> 2.3" -gem "countless", "~> 1.1" -gem "guard-rspec", "~> 4.7" -gem "rails", ">= 5.2" -gem "rake", "~> 13.0" -gem "rspec", "~> 3.12" -gem "rspec-rails", "~> 5.1" -gem "rubocop", "~> 1.28" -gem "rubocop-rails", "~> 2.14" -gem "rubocop-rspec", "~> 2.10" -gem "simplecov", ">= 0.22" -gem "yard", ">= 0.9.28" -gem "yard-activesupport-concern", ">= 0.0.1" -gem "railties", "~> 5.2.0" - -gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 46b446a..411ea0b 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -6,7 +6,7 @@ gem "appraisal", "~> 2.4" gem "bundler", "~> 2.3" gem "countless", "~> 1.1" gem "guard-rspec", "~> 4.7" -gem "rails", ">= 5.2" +gem "rails", ">= 6.1" gem "rake", "~> 13.0" gem "rspec", "~> 3.12" gem "rspec-rails", "~> 5.1"