From 157f95af4805036187f4255bce5261596d039357 Mon Sep 17 00:00:00 2001 From: Elia Schito Date: Thu, 28 Dec 2023 12:07:10 +0100 Subject: [PATCH 1/3] Open up the dependency for database cleaner v1 is not compatible with Rails 7.1. --- solidus_dev_support.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidus_dev_support.gemspec b/solidus_dev_support.gemspec index a859958b..83b49ee1 100644 --- a/solidus_dev_support.gemspec +++ b/solidus_dev_support.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'capybara', '~> 3.29' spec.add_dependency 'capybara-screenshot', '~> 1.0' spec.add_dependency 'codecov', '~> 0.2' - spec.add_dependency 'database_cleaner', '~> 1.7' + spec.add_dependency 'database_cleaner', ['>= 1.7', '< 3'] spec.add_dependency 'factory_bot', '>= 4.8' spec.add_dependency 'factory_bot_rails' spec.add_dependency 'ffaker', '~> 2.13' From 4a1e64db0fb56d680a3284ade61be9a33c0c867e Mon Sep 17 00:00:00 2001 From: Elia Schito Date: Thu, 28 Dec 2023 17:05:22 +0100 Subject: [PATCH 2/3] Bump the required version of Ruby < 3 is already EOL. --- .circleci/config.yml | 8 ++++---- solidus_dev_support.gemspec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df2b9dc7..8aba3219 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,22 +23,22 @@ jobs: solidus-main: executor: name: solidusio_extensions/sqlite - ruby_version: '3.1' + ruby_version: '3.2' steps: ['setup', 'solidusio_extensions/run-tests-solidus-main'] solidus-current: executor: name: solidusio_extensions/sqlite - ruby_version: '3.0' + ruby_version: '3.1' steps: ['setup', 'solidusio_extensions/run-tests-solidus-current'] solidus-older: executor: name: solidusio_extensions/sqlite - ruby_version: '2.7' + ruby_version: '3.0' steps: ['setup', 'solidusio_extensions/run-tests-solidus-older'] lint-code: executor: name: solidusio_extensions/sqlite - ruby_version: '3.0' + ruby_version: '3.1' steps: ['setup', 'solidusio_extensions/lint-code'] workflows: diff --git a/solidus_dev_support.gemspec b/solidus_dev_support.gemspec index 83b49ee1..bb179cb7 100644 --- a/solidus_dev_support.gemspec +++ b/solidus_dev_support.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_dev_support/releases' spec.metadata['rubygems_mfa_required'] = 'true' - spec.required_ruby_version = '>= 2.5.0' + spec.required_ruby_version = '>= 3.0.0' # Specify which files should be added to the gem when it is released. # The `git ls-files -z` loads the files in the RubyGem that have been added into git. From 030e43f586524d9f9e1fb03c7f7da2be52e668c4 Mon Sep 17 00:00:00 2001 From: Elia Schito Date: Thu, 28 Dec 2023 17:29:35 +0100 Subject: [PATCH 3/3] Fix rubocop warning --- lib/solidus_dev_support/rake_tasks.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/solidus_dev_support/rake_tasks.rb b/lib/solidus_dev_support/rake_tasks.rb index c24e04b8..4d9295e0 100644 --- a/lib/solidus_dev_support/rake_tasks.rb +++ b/lib/solidus_dev_support/rake_tasks.rb @@ -83,7 +83,6 @@ def install_changelog_task config.user = repo.owner config.project = repo.name config.future_release = "v#{ENV.fetch('UNRELEASED_VERSION') { gemspec.version }}" - rescue Octokit::InvalidRepository warn <<~WARN It won't be possible to automatically generate the CHANGELOG for this extension because the