From a9c6004f1e041e6aa47fc841e846be0ee384aac9 Mon Sep 17 00:00:00 2001 From: Walt Jones Date: Fri, 6 Nov 2020 10:27:48 -0500 Subject: [PATCH] chore: update dependencies for ci builds --- gemfiles/rails30.gemfile | 17 +++++++---------- gemfiles/rails31.gemfile | 20 +++++++++----------- gemfiles/rails32.gemfile | 16 ++++++---------- gemfiles/rails40.gemfile | 16 ++++++---------- gemfiles/rails41.gemfile | 16 ++++++---------- gemfiles/rails42.gemfile | 14 ++++---------- gemfiles/rails50.gemfile | 14 ++++---------- gemfiles/rails51.gemfile | 14 ++++---------- gemfiles/rails52.gemfile | 10 +--------- gemfiles/rails60.gemfile | 8 -------- 10 files changed, 47 insertions(+), 98 deletions(-) diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile index 937d7ff2..7dcdbc1a 100644 --- a/gemfiles/rails30.gemfile +++ b/gemfiles/rails30.gemfile @@ -2,23 +2,19 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw] gem 'jruby-openssl', :platform => :jruby gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby -gem 'appraisal', '= 1.0.2' gem 'rails', '3.0.20' gem 'hitimes', '< 1.2.2' +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rake', '< 11' gem 'rspec-rails', '>= 2.14.0' +gem 'simplecov-html', '<= 0.10.2' if RUBY_VERSION < '2.2.2' gem 'sidekiq', '~> 2.13.0' @@ -38,11 +34,12 @@ gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'sinatra' gem 'delayed_job', :require => false -gem 'redis' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'database_cleaner', '~> 1.0.0' gem 'genspec', '>= 0.2.8' gem 'girl_friday', '>= 0.11.1' diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile index afe0212d..5db84e24 100644 --- a/gemfiles/rails31.gemfile +++ b/gemfiles/rails31.gemfile @@ -2,22 +2,18 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw] gem 'jruby-openssl', :platform => :jruby gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby -gem 'appraisal', '= 1.0.2' +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '3.1.12' gem 'rspec-rails', '~> 3.4' -gem 'rake' +gem 'rake', '< 11' +gem 'simplecov-html', '<= 0.10.2' if RUBY_VERSION < '2.2.2' gem 'sidekiq', '~> 2.13.0' @@ -37,11 +33,13 @@ gem 'capistrano', :require => false gem 'sucker_punch' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'sinatra' gem 'delayed_job', :require => false -gem 'redis' +gem 'rack-cache', '<= 1.9.0' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'database_cleaner' gem 'girl_friday' gem 'generator_spec' diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile index 3911f681..cb1c5ca5 100644 --- a/gemfiles/rails32.gemfile +++ b/gemfiles/rails32.gemfile @@ -2,18 +2,13 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '3.2.22' gem 'rake' gem 'rspec-rails', '~> 3.4' @@ -39,10 +34,11 @@ gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'delayed_job', :require => false -gem 'redis' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'sinatra' gem 'database_cleaner', '~> 1.0.0' diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile index 6486d75e..483e4c2d 100644 --- a/gemfiles/rails40.gemfile +++ b/gemfiles/rails40.gemfile @@ -2,18 +2,13 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '4.0.13' gem 'rake' gem 'rspec-rails', '~> 3.4' @@ -40,10 +35,11 @@ gem 'sucker_punch', '~> 2.0' gem 'json', '~> 2.0' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'delayed_job', :require => false -gem 'redis' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'resque' gem 'sinatra' diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile index eff34767..463d5599 100644 --- a/gemfiles/rails41.gemfile +++ b/gemfiles/rails41.gemfile @@ -2,18 +2,13 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'mixlib-shellout', '<= 2.0.0' +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '4.1.12' gem 'rake' gem 'rspec-rails', '~> 3.4' @@ -36,10 +31,11 @@ gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'shoryuken' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'delayed_job', :require => false -gem 'redis' +gem 'redis', '<= 3.3.5' +gem 'redis-namespace', '<= 1.5.0' gem 'resque' gem 'sinatra' diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile index 0679a8a2..715d6274 100644 --- a/gemfiles/rails42.gemfile +++ b/gemfiles/rails42.gemfile @@ -2,19 +2,13 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) is_not_jruby = !is_jruby -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 2.0.5' gem 'rails', '4.2.8' gem 'rake' gem 'rspec-rails', '~> 3.4' @@ -45,7 +39,7 @@ gem 'delayed_job', :require => false gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' gem 'rspec-command' -gem 'redis' +gem 'redis', '<= 3.3.5' gem 'resque' gem 'sinatra' @@ -54,7 +48,7 @@ gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new gem 'sucker_punch', '~> 2.0' gem 'webmock', :require => false gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' gem 'aws-sdk-sqs' diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile index d2c103cd..01b61c85 100644 --- a/gemfiles/rails50.gemfile +++ b/gemfiles/rails50.gemfile @@ -2,18 +2,12 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 3.1.1' gem 'rails', '~> 5.0.7' gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw] @@ -37,7 +31,7 @@ end gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3') gem 'rack', '2.1.2' @@ -49,7 +43,7 @@ gem 'database_cleaner' gem 'delayed_job', :require => false gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' -gem 'redis' +gem 'redis', '<= 3.3.5' gem 'resque' unless is_jruby diff --git a/gemfiles/rails51.gemfile b/gemfiles/rails51.gemfile index 43af6c43..5457903f 100644 --- a/gemfiles/rails51.gemfile +++ b/gemfiles/rails51.gemfile @@ -2,18 +2,12 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby +gem 'net-ssh', '<= 3.1.1' +gem 'public_suffix', '<= 3.1.1' gem 'rails', '~> 5.1.7' gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw] @@ -37,7 +31,7 @@ end gem 'capistrano', :require => false gem 'sucker_punch', '~> 2.0' gem 'codacy-coverage' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3') gem 'rack', '2.1.2' @@ -50,7 +44,7 @@ gem 'database_cleaner' gem 'delayed_job', :require => false gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' -gem 'redis' +gem 'redis', '<= 3.3.5' gem 'resque' unless is_jruby diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index 952d5de2..3f434517 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -2,16 +2,8 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby gem 'rails', '~> 5.2.3' @@ -46,7 +38,7 @@ gem 'generator_spec' gem 'girl_friday', '>= 0.11.1' gem 'redis' gem 'resque' -gem 'simplecov' +gem 'simplecov', '<= 0.17.1' unless is_jruby # JRuby doesn't support fork, which is required for this test helper. diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index e4738063..8d209caf 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -3,16 +3,8 @@ require 'rubygems/version' source 'https://rubygems.org' -# Used by spec/commands/rollbar_rails_runner_spec, and can be used whenever a -# new process is created during tests. (Testing rake tasks, for example.) -# This is a workaround for ENV['BUNDLE_GEMFILE'] not working as expected on Travis. -# We use the ||= assignment because Travis loads the gemfile twice, the second time -# with the wrong gemfile path. -ENV['CURRENT_GEMFILE'] ||= __FILE__ - is_jruby = defined?(JRUBY_VERSION) || (defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE) -gem 'appraisal' gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby gem 'jruby-openssl', :platform => :jruby gem 'rails', '6.0.2.1'