From a90c2d4e760d4397204fedf9b8d05c17838b2df1 Mon Sep 17 00:00:00 2001 From: juliends Date: Wed, 20 Jul 2022 09:18:20 +0200 Subject: [PATCH 1/2] Bump ActiveRecord --- Gemfile | 2 +- Gemfile.lock | 72 +++++++++++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/Gemfile b/Gemfile index f167218..9830d39 100644 --- a/Gemfile +++ b/Gemfile @@ -17,4 +17,4 @@ gem "rubocop", "~> 1.30" gem "sinatra", "~> 2.2", require: false gem "sinatra-contrib", "~> 2.2", require: false gem "sqlite3", "~> 1.4" -gem "activerecord", "~> 6.0" +gem "activerecord", "~> 7.0" diff --git a/Gemfile.lock b/Gemfile.lock index 271d4a8..fa309aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,30 +1,29 @@ GEM remote: https://rubygems.org/ specs: - actionpack (6.1.6) - actionview (= 6.1.6) - activesupport (= 6.1.6) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.3.1) + actionview (= 7.0.3.1) + activesupport (= 7.0.3.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.6) - activesupport (= 6.1.6) + actionview (7.0.3.1) + activesupport (= 7.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.1.6) - activesupport (= 6.1.6) - activerecord (6.1.6) - activemodel (= 6.1.6) - activesupport (= 6.1.6) - activesupport (6.1.6) + activemodel (7.0.3.1) + activesupport (= 7.0.3.1) + activerecord (7.0.3.1) + activemodel (= 7.0.3.1) + activesupport (= 7.0.3.1) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) ast (2.4.2) awesome_print (1.9.2) builder (3.2.4) @@ -41,8 +40,9 @@ GEM http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) + json (2.6.2) loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -50,12 +50,12 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - minitest (5.16.0) + minitest (5.16.2) multi_json (1.15.0) - mustermann (1.1.1) + mustermann (1.1.2) ruby2_keywords (~> 0.0.1) netrc (0.11.0) - nokogiri (1.13.6-x86_64-linux) + nokogiri (1.13.7-x86_64-darwin) racc (~> 1.4) parallel (1.22.1) parser (3.1.2.0) @@ -67,22 +67,23 @@ GEM byebug (~> 11.0) pry (~> 0.13.0) racc (1.6.0) - rack (2.2.3.1) - rack-protection (2.2.0) + rack (2.2.4) + rack-protection (2.2.1) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.2) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (6.1.6) - actionpack (= 6.1.6) - activesupport (= 6.1.6) + railties (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) regexp_parser (2.5.0) @@ -109,7 +110,8 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - rubocop (1.30.1) + rubocop (1.31.2) + json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) @@ -118,37 +120,37 @@ GEM rubocop-ast (>= 1.18.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) + rubocop-ast (1.19.1) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) - sinatra (2.2.0) + sinatra (2.2.1) mustermann (~> 1.0) rack (~> 2.2) - rack-protection (= 2.2.0) + rack-protection (= 2.2.1) tilt (~> 2.0) - sinatra-contrib (2.2.0) + sinatra-contrib (2.2.1) multi_json mustermann (~> 1.0) - rack-protection (= 2.2.0) - sinatra (= 2.2.0) + rack-protection (= 2.2.1) + sinatra (= 2.2.1) tilt (~> 2.0) sqlite3 (1.4.4) thor (1.2.1) tilt (2.0.10) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.1.0) + unicode-display_width (2.2.0) zeitwerk (2.6.0) PLATFORMS - x86_64-linux + x86_64-darwin-20 DEPENDENCIES - activerecord (~> 6.0) + activerecord (~> 7.0) awesome_print (~> 1.8) faker (~> 2.1) nokogiri (~> 1.13) From b08280631ef8fba438425828d1320eaa0b3d5d7e Mon Sep 17 00:00:00 2001 From: Damien Milon <37899667+dmilon@users.noreply.github.com> Date: Wed, 20 Jul 2022 09:30:05 +0200 Subject: [PATCH 2/2] adding linux platform --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index fa309aa..524f541 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,6 +57,8 @@ GEM netrc (0.11.0) nokogiri (1.13.7-x86_64-darwin) racc (~> 1.4) + nokogiri (1.13.7-x86_64-linux) + racc (~> 1.4) parallel (1.22.1) parser (3.1.2.0) ast (~> 2.4.1) @@ -148,6 +150,7 @@ GEM PLATFORMS x86_64-darwin-20 + x86_64-linux DEPENDENCIES activerecord (~> 7.0)