Skip to content

Commit

Permalink
Merge pull request #5447 from jeffwidman/bump-ruby-to-3.1
Browse files Browse the repository at this point in the history
Bump Ruby to 3.1
  • Loading branch information
jeffwidman authored Oct 7, 2022
2 parents 54b8554 + 925c43d commit fed6d1d
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ body:
- type: input
attributes:
label: Language version
description: If applicable, specify the language version you're using (e.g., Node.js `14.1`, Ruby `2.7`, etc.)
description: If applicable, specify the language version you're using (e.g., Node.js `14.1`, Ruby `3.1`, etc.)
validations:
required: false

Expand Down
12 changes: 12 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ Style/HashExcept:
Enabled: true
Style/HashLikeCase:
Enabled: false
Style/HashSyntax:
EnforcedShorthandSyntax: either
Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Expand Down Expand Up @@ -320,3 +322,13 @@ Style/SpecialGlobalVars:
Enabled: false
Style/SelectByRegexp:
Enabled: false

# TODO these were temporarily disabled during the Ruby 2.7 -> 3.1 upgrade
# in order to keep the upgrade diff small, they will be enabled/fixed in
# a follow-on PR.
Naming/BlockForwarding:
Enabled: false
Style/MutableConstant:
Enabled: false
Style/RedundantFreeze:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ RUN if ! getent group "$USER_GID"; then groupadd --gid "$USER_GID" dependabot ;

### RUBY

ARG RUBY_VERSION=2.7.6
ARG RUBY_VERSION=3.1.2
ARG RUBY_INSTALL_VERSION=0.8.3

ARG RUBYGEMS_SYSTEM_VERSION=3.3.22
Expand Down
5 changes: 1 addition & 4 deletions common/dependabot-common.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.require_path = "lib"
spec.files = []

spec.required_ruby_version = ">= 2.7.0"
spec.required_ruby_version = ">= 3.1.0"
spec.required_rubygems_version = ">= 3.3.22"

spec.add_dependency "activesupport", ">= 6.0.0"
Expand All @@ -35,8 +35,6 @@ Gem::Specification.new do |spec|
spec.add_dependency "parser", ">= 2.5", "< 4.0"
spec.add_dependency "toml-rb", ">= 1.1.2", "< 3.0"

spec.add_development_dependency "debase", "0.2.3"
spec.add_development_dependency "debase-ruby_core_source", "0.10.17"
spec.add_development_dependency "debug", ">= 1.0.0"
spec.add_development_dependency "gpgme", "~> 2.0"
spec.add_development_dependency "parallel_tests", "~> 3.13.0"
Expand All @@ -45,7 +43,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rspec-its", "~> 1.2"
spec.add_development_dependency "rubocop", "~> 1.36.0"
spec.add_development_dependency "rubocop-performance", "~> 1.15.0"
spec.add_development_dependency "ruby-debug-ide", "~> 0.7.3"
spec.add_development_dependency "simplecov", "~> 0.21.0"
spec.add_development_dependency "simplecov-console", "~> 0.9.1"
spec.add_development_dependency "stackprof", "~> 0.2.16"
Expand Down
6 changes: 3 additions & 3 deletions common/spec/warning_monkey_patch.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# frozen_string_literal: true

ALLOW_PATTERNS = [
# Ignore parser warnings for ruby 2.7 minor version mismatches.
# Ignore `parser/current` warnings for ruby patch version mismatches.
# This is a recurring issue that occurs whenever the parser gets
# ahead of our installed ruby version.
%r{parser/current is loading parser/ruby27},
/2.7.\d-compliant syntax, but you are running 2.7.\d/,
%r{parser/current is loading parser/ruby31},
/3.1.\d-compliant syntax, but you are running 3.1.\d/,
%r{whitequark/parser}
].freeze

Expand Down
2 changes: 1 addition & 1 deletion omnibus/dependabot-omnibus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.homepage = common_gemspec.homepage
spec.license = common_gemspec.license

spec.required_ruby_version = ">= 2.7.0"
spec.required_ruby_version = ">= 3.1.0"
spec.require_path = "lib"
spec.files = ["lib/dependabot/omnibus.rb"]

Expand Down
2 changes: 2 additions & 0 deletions pub/dependabot-pub.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Gem::Specification.new do |spec|

spec.add_dependency "dependabot-common", Dependabot::VERSION

spec.add_development_dependency "webrick", ">= 1.7"

common_gemspec.development_dependencies.each do |dep|
spec.add_development_dependency dep.name, dep.requirement.to_s
end
Expand Down
2 changes: 1 addition & 1 deletion updater/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gem "sentry-raven", "~> 3.1"
gem "terminal-table", "~> 3.0.2"

group :test do
gem "byebug", "~> 11.1"
gem "debug", "~> 1.0.0"
gem "rspec", "~> 3.11"
gem "rubocop", "~> 1.36.0"
gem "rubocop-performance", "~> 1.15.0"
Expand Down
1 change: 0 additions & 1 deletion updater/spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# frozen_string_literal: true

require "byebug"
require "dependabot/logger"
require "dependabot/python"
require "dependabot/terraform"
Expand Down

0 comments on commit fed6d1d

Please sign in to comment.