Skip to content

Commit

Permalink
Merge pull request #4007 from RicardoTrindade/cleanup_ruby_checks_gem…
Browse files Browse the repository at this point in the history
…files

Remove Ruby version checks from Gemfiles
  • Loading branch information
ivoanjo authored Oct 17, 2024
2 parents 27ea135 + 9085e62 commit 69044b1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,8 @@ gem 'dogstatsd-ruby', '>= 3.3.0', '!= 5.0.0', '!= 5.0.1', '!= 5.1.0'
if RUBY_PLATFORM != 'java'
if RUBY_VERSION >= '2.7.0' # Bundler 1.x fails to find that versions >= 3.8.0 are not compatible because of binary gems
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1']
elsif RUBY_VERSION >= '2.3.0'
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1', '< 3.19.2']
else
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1', '< 3.8.0']
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1', '< 3.19.2']
end
end

Expand Down
21 changes: 6 additions & 15 deletions integration/apps/rack/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,11 @@ else
gem 'passenger'
end
gem 'rack'
gem 'rackup' if RUBY_VERSION >= '2.4' # The `rackup` is its own gem since Rack 3.0
gem 'rackup'

if RUBY_VERSION < '2.3'
gem 'redis', '< 4.1.1' # 4.1.1 "claims" to support 2.2 but is actually broken
else
# Known compatibility issue: https://github.com/redis/redis-rb/issues/1142
gem 'redis', '< 5'
end
if RUBY_VERSION < '2.2'
gem 'sidekiq', '< 5' # 5.0.3 checks for older Rubies and breaks, but does not declare it on the gemspec :(
else
gem 'sidekiq'
end
# Known compatibility issue: https://github.com/redis/redis-rb/issues/1142
gem 'redis', '< 5'
gem 'sidekiq'
gem 'resque'
gem 'rake'

Expand All @@ -31,12 +23,11 @@ gem 'dogstatsd-ruby'
gem 'datadog', *Datadog::DemoEnv.gem_spec('datadog')

# Development
gem 'pry-byebug' if RUBY_VERSION >= '2.3.0' && RUBY_ENGINE != 'truffleruby' && RUBY_VERSION < '3.2.0'
gem 'pry-nav' if RUBY_VERSION < '2.3.0'
gem 'pry-byebug' if RUBY_ENGINE != 'truffleruby' && RUBY_VERSION < '3.2.0'
# gem 'pry-stack_explorer', platform: :ruby
# gem 'rbtrace'
# gem 'ruby-prof'

gem 'rspec'
gem 'rspec-wait'
gem 'webrick' if RUBY_VERSION >= '2.3' # Older Rubies can just use the built-in version of webrick
gem 'webrick'

0 comments on commit 69044b1

Please sign in to comment.