From f4d4f34019e5cc6b688caeda516bf39ddd208193 Mon Sep 17 00:00:00 2001 From: Scott Walkinshaw Date: Fri, 5 Apr 2024 13:35:32 -0400 Subject: [PATCH] Drop Ruby 2.4 support --- .github/workflows/ci.yml | 5 ----- Gemfile | 6 ++---- Rakefile | 12 +++++------- graphql-batch.gemspec | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed0226c..0ba089f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,6 @@ jobs: matrix: ruby: [2.7, 3.0, 3.1, 3.2, 3.3] graphql_version: ['~> 1.12.18', '~> 1.13', '~> 2.0'] - include: - - ruby: 2.4 - graphql_version: '~> 1.12.18' - - ruby: 2.4 - graphql_version: '~> 1.13' steps: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 diff --git a/Gemfile b/Gemfile index b61c9b1..66e5539 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,5 @@ source 'https://rubygems.org' gemspec gem 'graphql', ENV['GRAPHQL_VERSION'] if ENV['GRAPHQL_VERSION'] -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0') - gem 'rubocop', '~> 1.61.0', require: false - gem "rubocop-shopify", '~> 1.0.7', require: false -end +gem 'rubocop', '~> 1.61.0', require: false +gem "rubocop-shopify", '~> 1.0.7', require: false diff --git a/Rakefile b/Rakefile index 6c6da42..21267af 100644 --- a/Rakefile +++ b/Rakefile @@ -9,11 +9,9 @@ end task(default: :test) -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0') - task :rubocop do - require 'rubocop/rake_task' - RuboCop::RakeTask.new - end - - task(default: :rubocop) +task :rubocop do + require 'rubocop/rake_task' + RuboCop::RakeTask.new end + +task(default: :rubocop) diff --git a/graphql-batch.gemspec b/graphql-batch.gemspec index 18b44de..68dfd31 100644 --- a/graphql-batch.gemspec +++ b/graphql-batch.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |spec| spec.homepage = "https://github.com/Shopify/graphql-batch" spec.license = "MIT" - spec.required_ruby_version = ">= 2.4" + spec.required_ruby_version = ">= 2.7" spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } spec.bindir = "exe"