From d58df12acf7f8281b61c24a6564c083256353c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Luis=20Leal=20Cardoso=20Junior?= Date: Wed, 19 Feb 2025 19:10:04 -0300 Subject: [PATCH 1/5] Fix uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger for older rails --- gemfiles/6.1.gemfile | 1 + gemfiles/7.0.gemfile | 1 + 2 files changed, 2 insertions(+) diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile index 1d0b5256..001d8ad7 100644 --- a/gemfiles/6.1.gemfile +++ b/gemfiles/6.1.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rubocop", require: false gem "codeclimate-test-reporter" gem "rails", "~> 6.1" +gem 'concurrent-ruby', '< 1.3.5' gemspec path: "../" diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile index b659fbf1..fbb0748d 100644 --- a/gemfiles/7.0.gemfile +++ b/gemfiles/7.0.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rubocop", require: false gem "codeclimate-test-reporter" gem "rails", "~> 7.0" +gem 'concurrent-ruby', '< 1.3.5' gemspec path: "../" From eacf0f0f295def7b2af55ea91fcce83c41a0ec74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Luis=20Leal=20Cardoso=20Junior?= Date: Wed, 19 Feb 2025 19:11:32 -0300 Subject: [PATCH 2/5] Drop Rails 5.2 Support --- .github/workflows/ci.yml | 9 --------- gemfiles/5.2.gemfile | 7 ------- 2 files changed, 16 deletions(-) delete mode 100644 gemfiles/5.2.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e974948..094df87f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,15 +7,6 @@ jobs: strategy: matrix: include: - - gemfile: 5.2.gemfile - ruby: 2.5 - - - gemfile: 5.2.gemfile - ruby: 2.6 - - - gemfile: 5.2.gemfile - ruby: 2.7 - - gemfile: 6.0.gemfile ruby: 2.5 diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile deleted file mode 100644 index 2530b2b9..00000000 --- a/gemfiles/5.2.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source "https://rubygems.org" - -gem "rubocop", require: false -gem "codeclimate-test-reporter" -gem "rails", "~> 5.2" - -gemspec path: "../" From df188a6de0fffeff3e07866b6ff0779961df2616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Luis=20Leal=20Cardoso=20Junior?= Date: Wed, 19 Feb 2025 19:12:41 -0300 Subject: [PATCH 3/5] Fix rack < 3 for now --- Gemfile | 1 + gemfiles/7.0.gemfile | 1 + 2 files changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 8925d80d..b9e12a22 100644 --- a/Gemfile +++ b/Gemfile @@ -6,3 +6,4 @@ gemspec gem "rubocop", require: false gem "codeclimate-test-reporter" +gem 'rack', '< 3' diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile index fbb0748d..abfee4ba 100644 --- a/gemfiles/7.0.gemfile +++ b/gemfiles/7.0.gemfile @@ -4,5 +4,6 @@ gem "rubocop", require: false gem "codeclimate-test-reporter" gem "rails", "~> 7.0" gem 'concurrent-ruby', '< 1.3.5' +gem 'rack', '< 3' gemspec path: "../" From 29376dc95f153ff6e94c8ece1a71a00d0f766e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Luis=20Leal=20Cardoso=20Junior?= Date: Wed, 19 Feb 2025 19:16:10 -0300 Subject: [PATCH 4/5] Make sure all entries are using double quotes --- Gemfile | 2 +- gemfiles/6.1.gemfile | 2 +- gemfiles/7.0.gemfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index b9e12a22..c67483fc 100644 --- a/Gemfile +++ b/Gemfile @@ -6,4 +6,4 @@ gemspec gem "rubocop", require: false gem "codeclimate-test-reporter" -gem 'rack', '< 3' +gem "rack", "< 3" diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile index 001d8ad7..b95e97e2 100644 --- a/gemfiles/6.1.gemfile +++ b/gemfiles/6.1.gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "rubocop", require: false gem "codeclimate-test-reporter" gem "rails", "~> 6.1" -gem 'concurrent-ruby', '< 1.3.5' +gem "concurrent-ruby", "< 1.3.5" gemspec path: "../" diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile index abfee4ba..1a33a37a 100644 --- a/gemfiles/7.0.gemfile +++ b/gemfiles/7.0.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rubocop", require: false gem "codeclimate-test-reporter" gem "rails", "~> 7.0" -gem 'concurrent-ruby', '< 1.3.5' -gem 'rack', '< 3' +gem "concurrent-ruby", "< 1.3.5" +gem "rack", "< 3" gemspec path: "../" From 61caacffca0552a98cabc4d2dea706780497a8f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Luis=20Leal=20Cardoso=20Junior?= Date: Wed, 19 Feb 2025 19:19:05 -0300 Subject: [PATCH 5/5] Pin concurrent-ruby on Rails 6.0 too --- gemfiles/6.0.gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile index 1283d3c9..4d97f903 100644 --- a/gemfiles/6.0.gemfile +++ b/gemfiles/6.0.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rubocop", require: false gem "codeclimate-test-reporter" gem "rails", "~> 6.0" +gem "concurrent-ruby", "< 1.3.5" gemspec path: "../"