Skip to content

Commit aa3ff92

Browse files
committed
experimental! Remove bundler Ruby version resolution workarounds
1 parent cc30ae4 commit aa3ff92

File tree

2 files changed

+6
-116
lines changed

2 files changed

+6
-116
lines changed

Gemfile

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -24,73 +24,9 @@ end
2424

2525
gem 'sqlite3', '~> 1.3.6'
2626

27-
if RUBY_VERSION >= '2.4.0'
28-
gem 'json', '>= 2.0.2'
29-
end
30-
31-
if RUBY_VERSION < '1.9'
32-
gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
33-
elsif RUBY_VERSION < '2.0'
34-
gem 'ffi', '< 1.11.0' # ffi dropped Ruby 2.0 support in 1.11.0
35-
elsif RUBY_VERSION < '2.3'
36-
gem 'ffi', '< 1.13.0'
37-
end
38-
39-
if RUBY_VERSION >= '2.0.0'
40-
gem 'rake', '>= 10.0.0'
41-
elsif RUBY_VERSION >= '1.9.3'
42-
gem 'rake', '< 12.0.0' # rake 12 requires Ruby 2.0.0 or later
43-
else
44-
gem 'rake', '< 11.0.0' # rake 11 requires Ruby 1.9.3 or later
45-
end
46-
47-
# Version 3 of mime-types 3 requires Ruby 2.0
48-
if RUBY_VERSION < '2.0.0'
49-
gem 'mime-types', '< 3'
50-
end
51-
52-
# Version 5.12 of minitest requires Ruby 2.4
53-
if RUBY_VERSION < '2.4.0'
54-
gem 'minitest', '< 5.12.0'
55-
end
27+
gem 'ffi'
5628

57-
# Capybara versions that support RSpec 3 only support RUBY_VERSION >= 1.9.3
58-
if RUBY_VERSION >= '1.9.3'
59-
if /5(\.|-)[1-9]\d*/ === RAILS_VERSION || "master" == RAILS_VERSION
60-
gem 'capybara', '~> 2.13', :require => false
61-
else
62-
gem 'capybara', '~> 2.2.0', :require => false
63-
end
64-
end
65-
66-
# Rack::Cache 1.3.0 requires Ruby >= 2.0.0
67-
gem 'rack-cache', '< 1.3.0' if RUBY_VERSION < '2.0.0'
68-
69-
if RUBY_VERSION < '1.9.2'
70-
gem 'nokogiri', '~> 1.5.0'
71-
elsif RUBY_VERSION < '1.9.3'
72-
gem 'nokogiri', '1.5.2'
73-
elsif RUBY_VERSION < '2.1.0'
74-
gem 'nokogiri', '1.6.8.1'
75-
elsif RUBY_VERSION < '2.3.0'
76-
gem 'nokogiri', '1.8.5'
77-
else
78-
gem 'nokogiri', '~> 1.10'
79-
end
80-
81-
if RUBY_VERSION <= '1.8.7'
82-
# cucumber and gherkin require rubyzip as a runtime dependency on 1.8.7
83-
# Only < 1.0 supports 1.8.7
84-
gem 'rubyzip', '< 1.0'
85-
elsif RUBY_VERSION < '2.4'
86-
gem 'rubyzip', '>= 1.2.2', '< 2.0.0'
87-
end
88-
89-
if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.2.0'
90-
# our current rubocop version doesn't support the json version required by Ruby 2.4
91-
# our rails rubocop setup only supports 2.0 and 2.1
92-
gem 'rubocop', "~> 0.23.0"
93-
end
29+
gem 'capybara', :require => false
9430

9531
custom_gemfile = File.expand_path("../Gemfile-custom", __FILE__)
9632
eval_gemfile custom_gemfile if File.exist?(custom_gemfile)

Gemfile-rails-dependencies

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ when /master/
1414
gem 'i18n', :git => 'https://github.com/svenfuchs/i18n.git', :branch => 'master'
1515
gem 'sprockets', :git => 'https://github.com/rails/sprockets.git', :branch => 'master'
1616
gem 'sprockets-rails', :git => 'https://github.com/rails/sprockets-rails.git', :branch => 'master'
17-
if RUBY_VERSION >= "2.2"
18-
gem 'puma', :git => 'https://github.com/puma/puma', :branch => 'master'
19-
end
17+
gem 'puma', :git => 'https://github.com/puma/puma', :branch => 'master'
2018
when /stable$/
2119
gem_list = %w[rails railties actionmailer actionpack activerecord activesupport]
2220
gem_list << 'activejob' if version > '4-1-stable'
@@ -30,15 +28,7 @@ when /stable$/
3028

3129
gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5' && version >= '4-0-stable'
3230
when nil, false, ""
33-
if RUBY_VERSION < '1.9.3'
34-
# Rails 4+ requires 1.9.3+, so on earlier versions default to the last 3.x release.
35-
gem "rails", "~> 3.2.17"
36-
elsif RUBY_VERSION < '2.2.0'
37-
# Rails 5+ requires 2.2+, so on earlier versions default to the last 4.x release.
38-
gem "rails", "~> 4.2.0"
39-
else
40-
gem "rails", "~> 5.0.0"
41-
end
31+
gem "rails"
4232
else
4333
gem "rails", version
4434

@@ -48,43 +38,7 @@ else
4838
gem "puma"
4939
end
5040

51-
gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5' && major_minor_version >= 4.0
41+
gem "sprockets"
5242

53-
if major_minor_version >= 6.0
54-
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", :platforms => [:jruby]
55-
else
56-
gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
57-
end
43+
gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
5844
end
59-
60-
gem "childprocess", '< 2.0.0' if RUBY_VERSION < '2.3'
61-
62-
if RUBY_VERSION < '1.9.3'
63-
gem "i18n", '< 0.7.0'
64-
elsif RUBY_VERSION < '2.3.0'
65-
gem "i18n", '< 1.5.2'
66-
end
67-
68-
gem "nio4r", '< 2.4.0' if RUBY_VERSION < '2.3'
69-
70-
if RUBY_VERSION < '1.9.3'
71-
gem "public_suffix", '< 1.4.0'
72-
elsif RUBY_VERSION < '2.0'
73-
gem "public_suffix", '< 2.0.0'
74-
elsif RUBY_VERSION < '2.1'
75-
gem "public_suffix", '< 3.0.0'
76-
elsif RUBY_VERSION < '2.3'
77-
gem "public_suffix", '< 4.0.0'
78-
end
79-
80-
# rack 2.1.0 introduces a deprecation warning that rails is triggering,
81-
# but in later versions this warning is removed.
82-
if RUBY_VERSION < '2.2'
83-
gem "rack", '< 2.0.0', '!= 2.1.0'
84-
elsif RUBY_VERSION < '2.3'
85-
gem "rack", '< 2.2.0', '!= 2.1.0'
86-
end
87-
88-
gem "test-unit" if RUBY_VERSION >= '2.2.0' && version =~ /3[.-]2[.-]/
89-
90-
gem "xpath", '< 3.2.0' if RUBY_VERSION < '2.3'

0 commit comments

Comments
 (0)