From 496573ac0bfa2a00c6ec922739f410e05e73c4ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 01:20:27 +0000 Subject: [PATCH 1/3] build(deps): bump activesupport from 6.1.7 to 7.0.4.2 in /updater Bumps [activesupport](https://github.com/rails/rails) from 6.1.7 to 7.0.4.2. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.0.4.2/activesupport/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v6.1.7...v7.0.4.2) --- updated-dependencies: - dependency-name: activesupport dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- updater/Gemfile | 2 +- updater/Gemfile.lock | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/updater/Gemfile b/updater/Gemfile index 829067378a9..a45e260f09e 100644 --- a/updater/Gemfile +++ b/updater/Gemfile @@ -20,7 +20,7 @@ gem "dependabot-pub", path: "../pub" gem "dependabot-python", path: "../python" gem "dependabot-terraform", path: "../terraform" -gem "activesupport", "~> 6.1.7" +gem "activesupport", "~> 7.0.4" gem "http", "~> 5.1" gem "octokit", "6.0.1" gem "sentry-raven", "~> 3.1" diff --git a/updater/Gemfile.lock b/updater/Gemfile.lock index e32c87b21d3..9e748479cd1 100644 --- a/updater/Gemfile.lock +++ b/updater/Gemfile.lock @@ -118,12 +118,11 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7) + activesupport (7.0.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) @@ -144,7 +143,7 @@ GEM aws-eventstream (~> 1, >= 1.0.2) citrus (3.0.2) commonmarker (0.23.7) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) crack (0.4.5) rexml debug (1.7.1) @@ -285,7 +284,7 @@ GEM toml-rb (2.2.0) citrus (~> 3.0, > 3.0) tomlrb (2.0.3) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext @@ -296,13 +295,12 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - zeitwerk (2.6.6) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.7) + activesupport (~> 7.0.4) debug (~> 1.7.1) dependabot-bundler! dependabot-cargo! From fbc8bdc5f3a1efe7054678c25a1caaaf2aa84451 Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Wed, 1 Feb 2023 01:48:29 +0000 Subject: [PATCH 2/3] also bump activesupport major version requirement in core --- common/dependabot-common.gemspec | 2 +- updater/Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/dependabot-common.gemspec b/common/dependabot-common.gemspec index 0d69a82ce97..c9e5a8b249b 100644 --- a/common/dependabot-common.gemspec +++ b/common/dependabot-common.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = ">= 3.1.0" spec.required_rubygems_version = ">= 3.3.7" - spec.add_dependency "activesupport", ">= 6.0.0" + spec.add_dependency "activesupport", ">= 7.0.0" spec.add_dependency "aws-sdk-codecommit", "~> 1.28" spec.add_dependency "aws-sdk-ecr", "~> 1.5" spec.add_dependency "bundler", ">= 1.16", "< 3.0.0" diff --git a/updater/Gemfile.lock b/updater/Gemfile.lock index 9e748479cd1..4e2b56b421a 100644 --- a/updater/Gemfile.lock +++ b/updater/Gemfile.lock @@ -14,7 +14,7 @@ PATH remote: ../common specs: dependabot-common (0.215.0) - activesupport (>= 6.0.0) + activesupport (>= 7.0.0) aws-sdk-codecommit (~> 1.28) aws-sdk-ecr (~> 1.5) bundler (>= 1.16, < 3.0.0) From 75c5d69e5b75610a8382d8f423b048aa3338f7e9 Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Wed, 1 Feb 2023 01:51:11 +0000 Subject: [PATCH 3/3] import `active_support/.../delegation` to access `delegate` --- updater/lib/dependabot/service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/updater/lib/dependabot/service.rb b/updater/lib/dependabot/service.rb index b7a609cb7d5..5d47421de35 100644 --- a/updater/lib/dependabot/service.rb +++ b/updater/lib/dependabot/service.rb @@ -2,6 +2,7 @@ require "terminal-table" require "dependabot/api_client" +require "active_support/core_ext/module/delegation" # Wraps an API client with the current state of communications with the Dependabot Service # and provides an interface to summarise all actions taken.