From 7499f7b5714a74210a64a3003ab89db141fe2835 Mon Sep 17 00:00:00 2001 From: Yuri Smirnov Date: Wed, 14 Jun 2023 15:30:23 +0600 Subject: [PATCH] drop old rubies --- .github/workflows/ci.yml | 2 +- .rubocop.yml | 2 +- Gemfile | 11 ++++ Gemfile.lock | 118 ++++++++++++++++++++------------------- Rakefile | 1 + lib/memery.rb | 2 - memery.gemspec | 13 +---- 7 files changed, 76 insertions(+), 73 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53d1366..f01551f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["2.5", "2.6", "2.7", "3.0", "3.1"] + ruby: ["2.7", "3.0", "3.1", "3.2"] name: ${{ matrix.ruby }} diff --git a/.rubocop.yml b/.rubocop.yml index 358cc81..39bec84 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,7 +3,7 @@ inherit_gem: AllCops: DisplayCopNames: true - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 Naming/MethodParameterName: AllowedNames: ["x", "y", "z"] diff --git a/Gemfile b/Gemfile index bb94df8..9e2eba2 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,14 @@ source "https://rubygems.org" gemspec + +gem "activesupport" +gem "benchmark-ips" +gem "benchmark-memory" +gem "bundler" +gem "pry" +gem "rake" +gem "rspec" +gem "rubocop-config-umbrellio" +gem "simplecov" +gem "simplecov-lcov" diff --git a/Gemfile.lock b/Gemfile.lock index 227c009..ff3fe23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,94 +7,98 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (6.1.3.2) + activesupport (7.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) ast (2.4.2) - benchmark-ips (2.9.1) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) + benchmark-ips (2.12.0) + benchmark-memory (0.2.0) + memory_profiler (~> 1) coderay (1.1.3) - concurrent-ruby (1.1.9) - diff-lcs (1.4.4) + concurrent-ruby (1.2.2) + diff-lcs (1.5.0) docile (1.4.0) - i18n (1.8.10) + i18n (1.14.1) concurrent-ruby (~> 1.0) - memory_profiler (0.9.14) + json (2.6.3) + memory_profiler (1.0.1) method_source (1.0.0) - minitest (5.14.4) - parallel (1.20.1) - parser (3.0.1.1) + minitest (5.18.0) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) - pry (0.14.1) + racc + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - rack (2.2.3) - rainbow (3.0.0) - rake (13.0.3) - regexp_parser (2.1.1) + racc (1.7.1) + rack (3.0.8) + rainbow (3.1.1) + rake (13.0.6) + regexp_parser (2.8.1) rexml (3.2.5) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.2) - rubocop (1.11.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + rubocop (1.50.2) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.7.0) - parser (>= 3.0.1.1) - rubocop-config-umbrellio (1.11.0.51) - rubocop (= 1.11.0) - rubocop-performance (= 1.10.0) - rubocop-rails (= 2.9.1) - rubocop-rake (= 0.5.1) - rubocop-rspec (= 2.2.0) - rubocop-sequel (= 0.2.0) - rubocop-performance (1.10.0) - rubocop (>= 0.90.0, < 2.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-config-umbrellio (1.50.0.85) + rubocop (~> 1.50.0) + rubocop-performance (~> 1.17.0) + rubocop-rails (~> 2.19.0) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.20.0) + rubocop-sequel (~> 0.3.3) + rubocop-performance (1.17.1) + rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.9.1) + rubocop-rails (2.19.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - rubocop-rake (0.5.1) - rubocop - rubocop-rspec (2.2.0) + rubocop (>= 1.33.0, < 2.0) + rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) - rubocop-sequel (0.2.0) + rubocop-rspec (2.20.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-sequel (0.3.4) rubocop (~> 1.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov-lcov (0.8.0) - simplecov_json_formatter (0.1.3) - tzinfo (2.0.4) + simplecov_json_formatter (0.1.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.0.0) - zeitwerk (2.4.2) + unicode-display_width (2.4.2) PLATFORMS ruby diff --git a/Rakefile b/Rakefile index 78f3d11..d0fa8fb 100644 --- a/Rakefile +++ b/Rakefile @@ -9,6 +9,7 @@ RuboCop::RakeTask.new(:lint) task default: %i[lint spec] +desc "run benchmark" task :benchmark do require_relative "./benchmark" end diff --git a/lib/memery.rb b/lib/memery.rb index fbfae58..2c0ad25 100644 --- a/lib/memery.rb +++ b/lib/memery.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "ruby2_keywords" - require "memery/version" module Memery diff --git a/memery.gemspec b/memery.gemspec index db87ce0..e98f4e0 100644 --- a/memery.gemspec +++ b/memery.gemspec @@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "memery/version" Gem::Specification.new do |spec| - spec.required_ruby_version = ">= 2.5.0" + spec.required_ruby_version = ">= 2.7.0" spec.name = "memery" spec.version = Memery::VERSION @@ -23,15 +23,4 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_runtime_dependency "ruby2_keywords", "~> 0.0.2" - - spec.add_development_dependency "activesupport" - spec.add_development_dependency "benchmark-ips" - spec.add_development_dependency "benchmark-memory" - spec.add_development_dependency "bundler" - spec.add_development_dependency "pry" - spec.add_development_dependency "rake" - spec.add_development_dependency "rspec" - spec.add_development_dependency "rubocop-config-umbrellio" - spec.add_development_dependency "simplecov" - spec.add_development_dependency "simplecov-lcov" end