Drop support for Ruby 2.6

Casecommons · May 8, 2022 · d6064dc · d6064dc
1 parent b73f9b5
commit d6064dc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+        ruby-version: ['2.7', '3.0', '3.1']
         active-record-version-env:
           - ACTIVE_RECORD_VERSION="~> 5.2.0"
           - ACTIVE_RECORD_VERSION="~> 6.0.0"
@@ -60,9 +60,6 @@ jobs:
           - ruby-version: '3.1'
             active-record-version-env: ACTIVE_RECORD_VERSION="~> 5.2.0"
             allow-failure: false
-          - ruby-version: '2.6'
-            active-record-version-env: ACTIVE_RECORD_VERSION="~> 7.0.0"
-            allow-failure: false
     continue-on-error: ${{ matrix.allow-failure }}
     steps:
     - uses: actions/checkout@v2

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -5,7 +5,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - bin/**/*

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Read the blog post introducing PgSearch at https://tanzu.vmware.com/content/blog
 
 ## REQUIREMENTS
 
-*   Ruby 2.6+
+*   Ruby 2.7+
 *   ActiveRecord 5.2+
 *   PostgreSQL 9.2+
 *   [PostgreSQL extensions](https://github.com/Casecommons/pg_search/wiki/Installing-PostgreSQL-Extensions) for certain features

diff --git a/lib/pg_search/features/tsearch.rb b/lib/pg_search/features/tsearch.rb
@@ -40,8 +40,7 @@ def ts_headline_options
 
         headline_options
           .merge(deprecated_headline_options)
-          .map { |key, value| "#{key} = #{value}" unless value.nil? }
-          .compact
+          .filter_map { |key, value| "#{key} = #{value}" unless value.nil? }
           .join(", ")
       end
 

diff --git a/pg_search.gemspec b/pg_search.gemspec
@@ -36,5 +36,5 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.add_development_dependency 'warning'
   s.add_development_dependency 'with_model'
 
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 2.7'
 end