Skip to content

Commit 69044b1

Browse files
authored
Merge pull request #4007 from RicardoTrindade/cleanup_ruby_checks_gemfiles
Remove Ruby version checks from Gemfiles
2 parents 27ea135 + 9085e62 commit 69044b1

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ gem 'dogstatsd-ruby', '>= 3.3.0', '!= 5.0.0', '!= 5.0.1', '!= 5.1.0'
7373
if RUBY_PLATFORM != 'java'
7474
if RUBY_VERSION >= '2.7.0' # Bundler 1.x fails to find that versions >= 3.8.0 are not compatible because of binary gems
7575
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1']
76-
elsif RUBY_VERSION >= '2.3.0'
77-
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1', '< 3.19.2']
7876
else
79-
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1', '< 3.8.0']
77+
gem 'google-protobuf', ['~> 3.0', '!= 3.7.0', '!= 3.7.1', '< 3.19.2']
8078
end
8179
end
8280

integration/apps/rack/Gemfile

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,11 @@ else
1010
gem 'passenger'
1111
end
1212
gem 'rack'
13-
gem 'rackup' if RUBY_VERSION >= '2.4' # The `rackup` is its own gem since Rack 3.0
13+
gem 'rackup'
1414

15-
if RUBY_VERSION < '2.3'
16-
gem 'redis', '< 4.1.1' # 4.1.1 "claims" to support 2.2 but is actually broken
17-
else
18-
# Known compatibility issue: https://github.com/redis/redis-rb/issues/1142
19-
gem 'redis', '< 5'
20-
end
21-
if RUBY_VERSION < '2.2'
22-
gem 'sidekiq', '< 5' # 5.0.3 checks for older Rubies and breaks, but does not declare it on the gemspec :(
23-
else
24-
gem 'sidekiq'
25-
end
15+
# Known compatibility issue: https://github.com/redis/redis-rb/issues/1142
16+
gem 'redis', '< 5'
17+
gem 'sidekiq'
2618
gem 'resque'
2719
gem 'rake'
2820

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

3325
# Development
34-
gem 'pry-byebug' if RUBY_VERSION >= '2.3.0' && RUBY_ENGINE != 'truffleruby' && RUBY_VERSION < '3.2.0'
35-
gem 'pry-nav' if RUBY_VERSION < '2.3.0'
26+
gem 'pry-byebug' if RUBY_ENGINE != 'truffleruby' && RUBY_VERSION < '3.2.0'
3627
# gem 'pry-stack_explorer', platform: :ruby
3728
# gem 'rbtrace'
3829
# gem 'ruby-prof'
3930

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

0 commit comments

Comments
 (0)