From a2c5488a8cd346482b3be222823632644d7f8660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Carruitero?= Date: Fri, 20 Oct 2023 10:43:01 -0500 Subject: [PATCH 1/4] support solidus v4 --- solidus_marketplace_gateway.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidus_marketplace_gateway.gemspec b/solidus_marketplace_gateway.gemspec index 4e145e4..9f51c37 100644 --- a/solidus_marketplace_gateway.gemspec +++ b/solidus_marketplace_gateway.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3'] + spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5'] spec.add_dependency 'solidus_marketplace' spec.add_dependency 'solidus_stripe' spec.add_dependency 'solidus_support', '~> 0.5' From a285c0149da22b55e09c20048dfa6f2aa41d276b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Carruitero?= Date: Fri, 20 Oct 2023 10:59:24 -0500 Subject: [PATCH 2/4] allow ruby 3 --- solidus_marketplace_gateway.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidus_marketplace_gateway.gemspec b/solidus_marketplace_gateway.gemspec index 9f51c37..15f4fcf 100644 --- a/solidus_marketplace_gateway.gemspec +++ b/solidus_marketplace_gateway.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.metadata['source_code_uri'] = 'https://github.com/magma-labs/solidus_marketplace_gateway' spec.metadata['changelog_uri'] = 'https://github.com/magma-labs/solidus_marketplace_gateway/releases' - spec.required_ruby_version = Gem::Requirement.new('~> 2.5') + spec.required_ruby_version = Gem::Requirement.new('> 2.5') # 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 26c197d47bceacd4c30f1ce40cbaf6be34392c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Carruitero?= Date: Fri, 20 Oct 2023 15:58:16 -0500 Subject: [PATCH 3/4] allow only solidus supported versions --- solidus_marketplace_gateway.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solidus_marketplace_gateway.gemspec b/solidus_marketplace_gateway.gemspec index 15f4fcf..2e1f5e9 100644 --- a/solidus_marketplace_gateway.gemspec +++ b/solidus_marketplace_gateway.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5'] + spec.add_dependency 'solidus_core', ['>= 3.2', '< 5'] spec.add_dependency 'solidus_marketplace' spec.add_dependency 'solidus_stripe' spec.add_dependency 'solidus_support', '~> 0.5' From 78efe1c8110c92e07e889fbc34a0c6c3e8338f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar=20Carruitero?= Date: Fri, 20 Oct 2023 16:05:30 -0500 Subject: [PATCH 4/4] update circle-ci config --- .circleci/config.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e7e2f71..3e8c139 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,15 +9,21 @@ orbs: jobs: run-specs-with-postgres: - executor: solidusio_extensions/postgres + executor: + name: solidusio_extensions/postgres + ruby_version: "3.0" steps: - solidusio_extensions/run-tests run-specs-with-mysql: - executor: solidusio_extensions/mysql + executor: + name: solidusio_extensions/mysql + ruby_version: "3.0" steps: - solidusio_extensions/run-tests lint-code: - executor: solidusio_extensions/sqlite-memory + executor: + name: solidusio_extensions/sqlite-memory + ruby_version: "3.0" steps: - solidusio_extensions/lint-code @@ -35,7 +41,7 @@ workflows: filters: branches: only: - - master + - main jobs: - run-specs-with-postgres - run-specs-with-mysql