From cc2f971374fac32b572f96e1ddb02691e1340013 Mon Sep 17 00:00:00 2001 From: safa Date: Wed, 27 Sep 2023 16:54:42 +0100 Subject: [PATCH] Add ruby-2.6 support --- .github/workflows/ci.yml | 2 +- Gemfile | 6 +++++- Gemfile.lock | 8 +++----- rubocop-solidus.gemspec | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 694c454..acd0365 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ '2.7', '3.0', '3.1', '3.2' ] + ruby: [ '2.6','2.7', '3.0', '3.1', '3.2' ] steps: - uses: actions/checkout@v3 diff --git a/Gemfile b/Gemfile index f85b62b..3e20ad8 100644 --- a/Gemfile +++ b/Gemfile @@ -9,5 +9,9 @@ gem 'bump' gem 'pry' gem 'rake' gem 'rspec' -gem 'rubocop' +if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.6') + gem 'rubocop' +else + gem 'rubocop', '~> 1.50.2' +end gem 'yard' diff --git a/Gemfile.lock b/Gemfile.lock index e328b4e..7e8cc54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,7 +12,6 @@ GEM coderay (1.1.3) diff-lcs (1.5.0) json (2.6.3) - language_server-protocol (3.17.0.3) method_source (1.0.0) parallel (1.23.0) parser (3.2.2.3) @@ -25,7 +24,7 @@ GEM rainbow (3.1.1) rake (13.0.6) regexp_parser (2.8.1) - rexml (3.2.5) + rexml (3.2.6) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -39,11 +38,10 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-support (3.12.1) - rubocop (1.54.2) + rubocop (1.50.2) json (~> 2.3) - language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) diff --git a/rubocop-solidus.gemspec b/rubocop-solidus.gemspec index 91f3777..011a069 100644 --- a/rubocop-solidus.gemspec +++ b/rubocop-solidus.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| DESCRIPTION spec.homepage = 'https://www.github.com/solidusio/rubocop-solidus' spec.license = 'MIT' - spec.required_ruby_version = '>= 2.7.0' + spec.required_ruby_version = '>= 2.6.0' spec.metadata['homepage_uri'] = spec.homepage spec.metadata['source_code_uri'] = 'https://www.github.com/solidusio/rubocop-solidus'