diff --git a/Gemfile b/Gemfile index 2d29f52f54..2731d10d6a 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,9 @@ group :development do gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" - # gem "ruby-statistics", "< 4" + # Keep version look on <4 until this PR gets merged and released + # https://github.com/zombocom/derailed_benchmarks/pull/239 + gem "ruby-statistics", "< 4" end group :test do @@ -191,5 +193,3 @@ gem "avo-record_link_field" gem "pagy", "> 8" gem "csv" - -gem "statistics", "~> 1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 02f2147b9f..87e8843284 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -547,7 +547,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -620,7 +620,6 @@ GEM standard-performance (1.4.0) lint_roller (~> 1.1) rubocop-performance (~> 1.21.0) - statistics (1.0.0) stringio (3.1.1) syntax_tree (6.2.0) prettier_print (>= 1.2.0) @@ -740,6 +739,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura @@ -750,7 +750,6 @@ DEPENDENCIES spring-commands-rspec sprockets-rails standard - statistics (~> 1.0) test-prof tzinfo-data web-console (>= 3.3.0) diff --git a/gemfiles/rails_6.1_ruby_3.1.4.gemfile b/gemfiles/rails_6.1_ruby_3.1.4.gemfile index 68bc742dc4..570b31baea 100644 --- a/gemfiles/rails_6.1_ruby_3.1.4.gemfile +++ b/gemfiles/rails_6.1_ruby_3.1.4.gemfile @@ -59,7 +59,8 @@ group :development do gem "rubocop-shopify", require: false gem "rubycritic", require: false gem "actual_db_schema" - gem "derailed_benchmarks", "~> 2.1", group: :development + gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" + gem "ruby-statistics", "< 4" end group :test do diff --git a/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock b/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock index 3c5803c8ff..8c5b6de2c3 100644 --- a/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock @@ -517,7 +517,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -666,7 +666,7 @@ DEPENDENCIES cuprite database_cleaner-active_record debug - derailed_benchmarks (~> 2.1) + derailed_benchmarks (~> 2.1, >= 2.1.2) devise dotenv-rails erb-formatter @@ -706,6 +706,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura diff --git a/gemfiles/rails_6.1_ruby_3.3.0.gemfile b/gemfiles/rails_6.1_ruby_3.3.0.gemfile index 68bc742dc4..570b31baea 100644 --- a/gemfiles/rails_6.1_ruby_3.3.0.gemfile +++ b/gemfiles/rails_6.1_ruby_3.3.0.gemfile @@ -59,7 +59,8 @@ group :development do gem "rubocop-shopify", require: false gem "rubycritic", require: false gem "actual_db_schema" - gem "derailed_benchmarks", "~> 2.1", group: :development + gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" + gem "ruby-statistics", "< 4" end group :test do diff --git a/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock b/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock index 6d3212179e..b67841850c 100644 --- a/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock @@ -490,7 +490,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -639,7 +639,7 @@ DEPENDENCIES cuprite database_cleaner-active_record debug - derailed_benchmarks (~> 2.1) + derailed_benchmarks (~> 2.1, >= 2.1.2) devise dotenv-rails erb-formatter @@ -679,6 +679,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura diff --git a/gemfiles/rails_7.1_ruby_3.1.4.gemfile b/gemfiles/rails_7.1_ruby_3.1.4.gemfile index 3d0dde9099..759f8a33ef 100644 --- a/gemfiles/rails_7.1_ruby_3.1.4.gemfile +++ b/gemfiles/rails_7.1_ruby_3.1.4.gemfile @@ -59,7 +59,8 @@ group :development do gem "rubocop-shopify", require: false gem "rubycritic", require: false gem "actual_db_schema" - gem "derailed_benchmarks", "~> 2.1", group: :development + gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" + gem "ruby-statistics", "< 4" end group :test do diff --git a/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock b/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock index c607f62421..2072e714b3 100644 --- a/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock @@ -536,7 +536,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -687,7 +687,7 @@ DEPENDENCIES cuprite database_cleaner-active_record debug - derailed_benchmarks (~> 2.1) + derailed_benchmarks (~> 2.1, >= 2.1.2) devise dotenv-rails erb-formatter @@ -727,6 +727,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura diff --git a/gemfiles/rails_7.1_ruby_3.3.0.gemfile b/gemfiles/rails_7.1_ruby_3.3.0.gemfile index 3d0dde9099..759f8a33ef 100644 --- a/gemfiles/rails_7.1_ruby_3.3.0.gemfile +++ b/gemfiles/rails_7.1_ruby_3.3.0.gemfile @@ -59,7 +59,8 @@ group :development do gem "rubocop-shopify", require: false gem "rubycritic", require: false gem "actual_db_schema" - gem "derailed_benchmarks", "~> 2.1", group: :development + gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" + gem "ruby-statistics", "< 4" end group :test do diff --git a/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock b/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock index 1d9ba84cbd..1df029e9b1 100644 --- a/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock @@ -509,7 +509,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -660,7 +660,7 @@ DEPENDENCIES cuprite database_cleaner-active_record debug - derailed_benchmarks (~> 2.1) + derailed_benchmarks (~> 2.1, >= 2.1.2) devise dotenv-rails erb-formatter @@ -700,6 +700,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile b/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile index a307251d01..68b5b0698a 100644 --- a/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile +++ b/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile @@ -59,7 +59,8 @@ group :development do gem "rubocop-shopify", require: false gem "rubycritic", require: false gem "actual_db_schema" - gem "derailed_benchmarks", "~> 2.1", group: :development + gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" + gem "ruby-statistics", "< 4" end group :test do diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile.lock b/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile.lock index 59876f2cfa..dd390b5ff3 100644 --- a/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile.lock +++ b/gemfiles/rails_7.2.0.beta2_ruby_3.1.4.gemfile.lock @@ -509,7 +509,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -660,7 +660,7 @@ DEPENDENCIES cuprite database_cleaner-active_record debug - derailed_benchmarks (~> 2.1) + derailed_benchmarks (~> 2.1, >= 2.1.2) devise dotenv-rails erb-formatter @@ -700,6 +700,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile b/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile index a307251d01..68b5b0698a 100644 --- a/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile +++ b/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile @@ -59,7 +59,8 @@ group :development do gem "rubocop-shopify", require: false gem "rubycritic", require: false gem "actual_db_schema" - gem "derailed_benchmarks", "~> 2.1", group: :development + gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" + gem "ruby-statistics", "< 4" end group :test do diff --git a/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile.lock b/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile.lock index 59876f2cfa..dd390b5ff3 100644 --- a/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile.lock +++ b/gemfiles/rails_7.2.0.beta2_ruby_3.3.0.gemfile.lock @@ -509,7 +509,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -660,7 +660,7 @@ DEPENDENCIES cuprite database_cleaner-active_record debug - derailed_benchmarks (~> 2.1) + derailed_benchmarks (~> 2.1, >= 2.1.2) devise dotenv-rails erb-formatter @@ -700,6 +700,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura diff --git a/gemfiles/rails_8.0_ruby_3.1.4.gemfile b/gemfiles/rails_8.0_ruby_3.1.4.gemfile index 8c02a3441a..5366e6ffaf 100644 --- a/gemfiles/rails_8.0_ruby_3.1.4.gemfile +++ b/gemfiles/rails_8.0_ruby_3.1.4.gemfile @@ -59,7 +59,8 @@ group :development do gem "rubocop-shopify", require: false gem "rubycritic", require: false gem "actual_db_schema" - gem "derailed_benchmarks", "~> 2.1", group: :development + gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" + gem "ruby-statistics", "< 4" end group :test do diff --git a/gemfiles/rails_8.0_ruby_3.1.4.gemfile.lock b/gemfiles/rails_8.0_ruby_3.1.4.gemfile.lock index 30ccf79b1e..c129797e1c 100644 --- a/gemfiles/rails_8.0_ruby_3.1.4.gemfile.lock +++ b/gemfiles/rails_8.0_ruby_3.1.4.gemfile.lock @@ -516,7 +516,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -668,7 +668,7 @@ DEPENDENCIES cuprite database_cleaner-active_record debug - derailed_benchmarks (~> 2.1) + derailed_benchmarks (~> 2.1, >= 2.1.2) devise dotenv-rails erb-formatter @@ -708,6 +708,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura diff --git a/gemfiles/rails_8.0_ruby_3.3.0.gemfile b/gemfiles/rails_8.0_ruby_3.3.0.gemfile index 8c02a3441a..5366e6ffaf 100644 --- a/gemfiles/rails_8.0_ruby_3.3.0.gemfile +++ b/gemfiles/rails_8.0_ruby_3.3.0.gemfile @@ -59,7 +59,8 @@ group :development do gem "rubocop-shopify", require: false gem "rubycritic", require: false gem "actual_db_schema" - gem "derailed_benchmarks", "~> 2.1", group: :development + gem "derailed_benchmarks", "~> 2.1", ">= 2.1.2" + gem "ruby-statistics", "< 4" end group :test do diff --git a/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock b/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock index 30ccf79b1e..c129797e1c 100644 --- a/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock +++ b/gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock @@ -516,7 +516,7 @@ GEM rubocop-shopify (2.15.1) rubocop (~> 1.51) ruby-progressbar (1.13.0) - ruby-statistics (4.0.1) + ruby-statistics (3.0.2) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -668,7 +668,7 @@ DEPENDENCIES cuprite database_cleaner-active_record debug - derailed_benchmarks (~> 2.1) + derailed_benchmarks (~> 2.1, >= 2.1.2) devise dotenv-rails erb-formatter @@ -708,6 +708,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rubocop rubocop-shopify + ruby-statistics (< 4) rubycritic simplecov simplecov-cobertura