From b7a43d0cb0eaed9dccbe914e45b7bea8fa70e7d1 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Tue, 28 Jan 2025 15:03:24 -0800 Subject: [PATCH 1/4] Add base64, bigdecimal, and mutex_m to gemfiles to support Ruby 3.4 --- .ruby-version | 2 +- Gemfile | 4 ++++ Gemfile.lock | 12 +++++++++--- gemfiles/rails_5.gemfile | 3 +++ gemfiles/rails_6.gemfile | 3 +++ gemfiles/rails_7.gemfile | 3 +++ 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.ruby-version b/.ruby-version index a603bb5..9cec716 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.5 +3.1.6 diff --git a/Gemfile b/Gemfile index 653081a..5873f49 100644 --- a/Gemfile +++ b/Gemfile @@ -12,3 +12,7 @@ gem 'rspec', '~> 3.7' gem 'rspec_junit_formatter', '~> 0.4' gem 'rspec-mocks' gem 'rubocop', '0.54.0' + +gem "base64", "~> 0.2.0" +gem "bigdecimal", "~> 3.1" +gem "mutex_m", "~> 0.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index 4e2f9e4..387b7c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,11 +13,13 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - appraisal (2.4.0) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.9) coderay (1.1.3) concurrent-ruby (1.1.10) diff-lcs (1.4.4) @@ -25,6 +27,7 @@ GEM concurrent-ruby (~> 1.0) method_source (1.0.0) minitest (5.15.0) + mutex_m (0.3.0) parallel (1.20.1) parser (3.0.2.0) ast (~> 2.4.1) @@ -33,7 +36,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) rainbow (3.0.0) - rake (13.0.6) + rake (13.2.1) rspec (3.10.0) rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) @@ -57,7 +60,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.11.0) - thor (1.1.0) + thor (1.3.2) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) @@ -68,7 +71,10 @@ PLATFORMS DEPENDENCIES appraisal + base64 (~> 0.2.0) + bigdecimal (~> 3.1) monotonic_tick_count! + mutex_m (~> 0.3.0) pry rake rspec (~> 3.7) diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index b408897..b7c49d4 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -9,6 +9,9 @@ gem "rspec", "~> 3.7" gem "rspec_junit_formatter", "~> 0.4" gem "rspec-mocks" gem "rubocop", "0.54.0" +gem "base64", "~> 0.2.0" +gem "bigdecimal", "~> 3.1" +gem "mutex_m", "~> 0.3.0" gem "activesupport", "~> 5.2" gemspec path: "../" diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 50229ef..9611e7d 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -9,6 +9,9 @@ gem "rspec", "~> 3.7" gem "rspec_junit_formatter", "~> 0.4" gem "rspec-mocks" gem "rubocop", "0.54.0" +gem "base64", "~> 0.2.0" +gem "bigdecimal", "~> 3.1" +gem "mutex_m", "~> 0.3.0" gem "activesupport", "~> 6.0" gemspec path: "../" diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index 07ce649..54ddb7f 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -9,6 +9,9 @@ gem "rspec", "~> 3.7" gem "rspec_junit_formatter", "~> 0.4" gem "rspec-mocks" gem "rubocop", "0.54.0" +gem "base64", "~> 0.2.0" +gem "bigdecimal", "~> 3.1" +gem "mutex_m", "~> 0.3.0" gem "activesupport", "~> 7.0" gemspec path: "../" From 0af52e91d423e5f91ce774a05fb8731773eaeb2d Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Tue, 28 Jan 2025 15:10:25 -0800 Subject: [PATCH 2/4] Add concurrent-ruby to gemfiles to fix tests in Rails < 7.1 --- Gemfile | 2 ++ Gemfile.lock | 1 + gemfiles/rails_5.gemfile | 1 + gemfiles/rails_6.gemfile | 1 + gemfiles/rails_7.gemfile | 1 + 5 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index 5873f49..079376d 100644 --- a/Gemfile +++ b/Gemfile @@ -16,3 +16,5 @@ gem 'rubocop', '0.54.0' gem "base64", "~> 0.2.0" gem "bigdecimal", "~> 3.1" gem "mutex_m", "~> 0.3.0" + +gem "concurrent-ruby", "~> 1.0", "< 1.3.5" diff --git a/Gemfile.lock b/Gemfile.lock index 387b7c2..e5b1a34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,6 +73,7 @@ DEPENDENCIES appraisal base64 (~> 0.2.0) bigdecimal (~> 3.1) + concurrent-ruby (~> 1.0, < 1.3.5) monotonic_tick_count! mutex_m (~> 0.3.0) pry diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index b7c49d4..13864f0 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -12,6 +12,7 @@ gem "rubocop", "0.54.0" gem "base64", "~> 0.2.0" gem "bigdecimal", "~> 3.1" gem "mutex_m", "~> 0.3.0" +gem "concurrent-ruby", "~> 1.0", "< 1.3.5" gem "activesupport", "~> 5.2" gemspec path: "../" diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 9611e7d..4594eb0 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -12,6 +12,7 @@ gem "rubocop", "0.54.0" gem "base64", "~> 0.2.0" gem "bigdecimal", "~> 3.1" gem "mutex_m", "~> 0.3.0" +gem "concurrent-ruby", "~> 1.0", "< 1.3.5" gem "activesupport", "~> 6.0" gemspec path: "../" diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index 54ddb7f..80b20f6 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -12,6 +12,7 @@ gem "rubocop", "0.54.0" gem "base64", "~> 0.2.0" gem "bigdecimal", "~> 3.1" gem "mutex_m", "~> 0.3.0" +gem "concurrent-ruby", "~> 1.0", "< 1.3.5" gem "activesupport", "~> 7.0" gemspec path: "../" From 0a7ad9bdc7db4963c7bd342e70729f2dacca44b0 Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Tue, 28 Jan 2025 15:28:22 -0800 Subject: [PATCH 3/4] use optimistic flag for bundle add --- Gemfile | 7 ++++--- Gemfile.lock | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 079376d..7eaa48b 100644 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,9 @@ gem 'rspec_junit_formatter', '~> 0.4' gem 'rspec-mocks' gem 'rubocop', '0.54.0' -gem "base64", "~> 0.2.0" -gem "bigdecimal", "~> 3.1" -gem "mutex_m", "~> 0.3.0" gem "concurrent-ruby", "~> 1.0", "< 1.3.5" + +gem "base64", ">= 0.2.0" +gem "bigdecimal", ">= 3.1" +gem "mutex_m", ">= 0.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index e5b1a34..0417666 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,11 +71,11 @@ PLATFORMS DEPENDENCIES appraisal - base64 (~> 0.2.0) - bigdecimal (~> 3.1) + base64 (>= 0.2.0) + bigdecimal (>= 3.1) concurrent-ruby (~> 1.0, < 1.3.5) monotonic_tick_count! - mutex_m (~> 0.3.0) + mutex_m (>= 0.3.0) pry rake rspec (~> 3.7) From 7a61ab271024355b0f794c86f51e7db3bf2ba8ac Mon Sep 17 00:00:00 2001 From: Tristan Starck Date: Tue, 28 Jan 2025 15:33:16 -0800 Subject: [PATCH 4/4] regenerate gemfiles --- gemfiles/rails_5.gemfile | 6 +++--- gemfiles/rails_6.gemfile | 6 +++--- gemfiles/rails_7.gemfile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index 13864f0..63db74d 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -9,10 +9,10 @@ gem "rspec", "~> 3.7" gem "rspec_junit_formatter", "~> 0.4" gem "rspec-mocks" gem "rubocop", "0.54.0" -gem "base64", "~> 0.2.0" -gem "bigdecimal", "~> 3.1" -gem "mutex_m", "~> 0.3.0" gem "concurrent-ruby", "~> 1.0", "< 1.3.5" +gem "base64", ">= 0.2.0" +gem "bigdecimal", ">= 3.1" +gem "mutex_m", ">= 0.3.0" gem "activesupport", "~> 5.2" gemspec path: "../" diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 4594eb0..874447e 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -9,10 +9,10 @@ gem "rspec", "~> 3.7" gem "rspec_junit_formatter", "~> 0.4" gem "rspec-mocks" gem "rubocop", "0.54.0" -gem "base64", "~> 0.2.0" -gem "bigdecimal", "~> 3.1" -gem "mutex_m", "~> 0.3.0" gem "concurrent-ruby", "~> 1.0", "< 1.3.5" +gem "base64", ">= 0.2.0" +gem "bigdecimal", ">= 3.1" +gem "mutex_m", ">= 0.3.0" gem "activesupport", "~> 6.0" gemspec path: "../" diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile index 80b20f6..1e07183 100644 --- a/gemfiles/rails_7.gemfile +++ b/gemfiles/rails_7.gemfile @@ -9,10 +9,10 @@ gem "rspec", "~> 3.7" gem "rspec_junit_formatter", "~> 0.4" gem "rspec-mocks" gem "rubocop", "0.54.0" -gem "base64", "~> 0.2.0" -gem "bigdecimal", "~> 3.1" -gem "mutex_m", "~> 0.3.0" gem "concurrent-ruby", "~> 1.0", "< 1.3.5" +gem "base64", ">= 0.2.0" +gem "bigdecimal", ">= 3.1" +gem "mutex_m", ">= 0.3.0" gem "activesupport", "~> 7.0" gemspec path: "../"