From 81efae5aeada26712a45f261b332d8ae39f856c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Mar 2021 04:55:40 +0000 Subject: [PATCH] Update activerecord requirement from >= 4.0, ~> 5.0 to >= 5, < 7 Updates the requirements on [activerecord](https://github.com/rails/rails) to permit the latest version. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v6.1.3/activerecord/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v5.2.0...v5.2.4.5) Signed-off-by: dependabot[bot] --- Gemfile.lock | 50 +++++++++++++++++++++++--------------------- rest-assured.gemspec | 2 +- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 809da3e..b1b6a0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: rest-assured (4.0.0) - activerecord (~> 5.0, >= 4.0) + activerecord (>= 5, < 7) activeresource (~> 5.0, >= 4.0) childprocess (~> 0.3) haml (~> 5.0, >= 4.0) @@ -13,21 +13,21 @@ PATH GEM remote: https://rubygems.org/ specs: - activemodel (5.2.0) - activesupport (= 5.2.0) + activemodel (5.2.4.5) + activesupport (= 5.2.4.5) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.0) - activemodel (= 5.2.0) - activesupport (= 5.2.0) + activerecord (5.2.4.5) + activemodel (= 5.2.4.5) + activesupport (= 5.2.4.5) arel (>= 9.0) - activeresource (5.0.0) - activemodel (>= 5.0, < 6) + activeresource (5.1.1) + activemodel (>= 5.0, < 7) activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 6) - activesupport (5.2.0) + activesupport (>= 5.0, < 7) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -59,7 +59,7 @@ GEM nokogiri (~> 1.8) cliver (0.3.2) coderay (1.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.8) cucumber (3.1.0) builder (>= 2.1.2) cucumber-core (~> 3.1.0) @@ -76,22 +76,22 @@ GEM cucumber-expressions (5.0.17) cucumber-tag_expressions (1.1.1) cucumber-wire (0.0.1) - daemons (1.2.6) + daemons (1.3.1) database_cleaner (1.7.0) diff-lcs (1.3) docile (1.3.0) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - eventmachine (1.2.6) + eventmachine (1.2.7) ffi (1.9.23) gherkin (5.0.0) - haml (5.0.4) + haml (5.2.1) temple (>= 0.8.0) tilt hashie (3.5.7) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.0.1) + i18n (1.5.1) concurrent-ruby (~> 1.0) io-like (0.3.0) json (2.1.0) @@ -107,10 +107,11 @@ GEM minitar-cli (0.6.1) minitar (~> 0.6.0) powerbar (~> 1.0) - minitest (5.11.3) + minitest (5.14.4) multi_json (1.13.1) multi_test (0.1.2) - mustermann (1.0.2) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) netrc (0.11.0) nio4r (2.3.1) nokogiri (1.8.2) @@ -132,7 +133,7 @@ GEM puma (4.3.1) nio4r (~> 2.0) rack (2.0.5) - rack-protection (2.0.1) + rack-protection (2.0.8.1) rack rack-test (1.0.0) rack (>= 1.0, < 3) @@ -158,6 +159,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) rspec-support (3.7.1) + ruby2_keywords (0.0.4) rubyzip (1.2.1) selenium-webdriver (3.11.0) childprocess (~> 0.5) @@ -167,22 +169,22 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sinatra (2.0.1) + sinatra (2.0.8.1) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.1) + rack-protection (= 2.0.8.1) tilt (~> 2.0) sinatra-flash (0.3.0) sinatra (>= 1.0.0) sqlite3 (1.3.13) - temple (0.8.0) - thin (1.7.2) + temple (0.8.2) + thin (1.8.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thread_safe (0.3.6) - tilt (2.0.8) - tzinfo (1.2.5) + tilt (2.0.10) + tzinfo (1.2.9) thread_safe (~> 0.1) unf (0.1.4) unf_ext diff --git a/rest-assured.gemspec b/rest-assured.gemspec index 96380b2..52b3541 100644 --- a/rest-assured.gemspec +++ b/rest-assured.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.add_dependency 'childprocess', '~> 0.3' s.add_dependency 'sinatra-flash' s.add_dependency 'haml', ['>= 4.0', '~> 5.0'] - s.add_dependency 'activerecord', ['>= 4.0', '~> 5.0'] + s.add_dependency 'activerecord', '>= 5', '< 7' s.add_dependency 'activeresource', ['>= 4.0', '~> 5.0'] s.add_dependency 'thin', '~> 1.6' end