diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6bb6973..e38f016 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', '7.1'] + ruby: ['2.7', '3.0'] + rails: ['6.1', '7.1'] env: BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile' steps: diff --git a/.rubocop.yml b/.rubocop.yml index 4b6b64e..0e2ba1f 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 26a1fb3..79b09c2 100644 --- a/Appraisals +++ b/Appraisals @@ -1,9 +1,5 @@ # frozen_string_literal: true -appraise 'rails-5.2' do - gem 'activesupport', '~> 5.2.0' -end - appraise 'rails-6.1' do gem 'activesupport', '~> 6.1.0' end diff --git a/CHANGELOG.md b/CHANGELOG.md index 7003f6c..cecb1a0 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 (#14) ### 1.6.5 (15 August 2024) diff --git a/Gemfile b/Gemfile index 4d955cb..ef567a1 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'bundler', '~> 2.3' gem 'countless', '~> 1.1' gem 'factory_bot', '~> 6.2' gem 'guard-rspec', '~> 4.7' -gem 'railties', '>= 5.2' +gem 'railties', '>= 6.1' gem 'rake', '~> 13.0' gem 'redcarpet', '~> 3.5' gem 'rspec', '~> 3.12' diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 543ba73..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,27 +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 "factory_bot", "~> 6.2" -gem "guard-rspec", "~> 4.7" -gem "railties", ">= 5.2" -gem "rake", "~> 13.0" -gem "redcarpet", "~> 3.5" -gem "rspec", "~> 3.12" -gem "rspec-json_expectations", "~> 2.2" -gem "rubocop", "~> 1.28" -gem "rubocop-rails", "~> 2.14" -gem "rubocop-rspec", "~> 2.10" -gem "simplecov", ">= 0.22" -gem "terminal-table", "~> 3.0" -gem "timecop", ">= 0.9.6" -gem "vcr", "~> 6.0" -gem "webmock", "~> 3.18" -gem "yard", ">= 0.9.28" -gem "yard-activesupport-concern", ">= 0.0.1" -gem "activesupport", "~> 5.2.0" - -gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 6258445..dba84df 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -7,7 +7,7 @@ gem "bundler", "~> 2.3" gem "countless", "~> 1.1" gem "factory_bot", "~> 6.2" gem "guard-rspec", "~> 4.7" -gem "railties", ">= 5.2" +gem "railties", ">= 6.1" gem "rake", "~> 13.0" gem "redcarpet", "~> 3.5" gem "rspec", "~> 3.12" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 5e49bd2..13d7dd1 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -7,7 +7,7 @@ gem "bundler", "~> 2.3" gem "countless", "~> 1.1" gem "factory_bot", "~> 6.2" gem "guard-rspec", "~> 4.7" -gem "railties", ">= 5.2" +gem "railties", ">= 6.1" gem "rake", "~> 13.0" gem "redcarpet", "~> 3.5" gem "rspec", "~> 3.12" diff --git a/immoscout.gemspec b/immoscout.gemspec index c2eabd0..a6e9189 100644 --- a/immoscout.gemspec +++ b/immoscout.gemspec @@ -32,8 +32,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.7' - spec.add_runtime_dependency 'activesupport', '>= 5.2' - spec.add_runtime_dependency 'faraday', '~> 1.10' - spec.add_runtime_dependency 'faraday_middleware', '~> 1.2' - spec.add_runtime_dependency 'simple_oauth', '>= 0.3' + spec.add_dependency 'activesupport', '>= 6.1' + spec.add_dependency 'faraday', '~> 1.10' + spec.add_dependency 'faraday_middleware', '~> 1.2' + spec.add_dependency 'simple_oauth', '>= 0.3' end