Skip to content

Commit 35a6b21

Browse files
committed
experimental! Remove bundler Ruby version resolution workarounds
1 parent cbf4238 commit 35a6b21

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

Gemfile

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,36 +36,7 @@ else
3636
MAJOR, MINOR = match.captures.map(&:to_i).compact
3737
end
3838

39-
if MAJOR >= 6
40-
gem 'selenium-webdriver', '~> 3.5', require: false
41-
gem 'sqlite3', '~> 1.4', platforms: [:ruby]
42-
else
43-
gem 'sqlite3', '~> 1.3.6', platforms: [:ruby]
44-
end
45-
46-
gem 'ffi', '~> 1.9.25'
47-
48-
gem 'rake', '~> 12'
49-
50-
gem 'mime-types', "~> 3"
51-
52-
if RUBY_VERSION.to_f < 2.3
53-
gem 'capybara', '~> 3.1.0'
54-
elsif RUBY_VERSION.to_f < 2.4
55-
gem 'capybara', '< 3.16'
56-
elsif RUBY_VERSION.to_f < 2.5
57-
gem 'capybara', '< 3.33'
58-
else
59-
gem 'capybara', '>= 2.13', '< 4.0', require: false
60-
end
61-
62-
if MAJOR < 6
63-
gem 'nokogiri', '1.9.1'
64-
else
65-
gem 'nokogiri', '>= 1.10.8'
66-
end
67-
68-
gem "rubyzip", '~> 1.2'
39+
gem 'capybara'
6940

7041
if RUBY_VERSION.to_f >= 2.3
7142
gem 'rubocop', '~> 0.80.1'

Gemfile-rails-dependencies

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ when /stable$/
1818
gem_list = %w[rails railties actionmailer actionpack activerecord activesupport activejob actionview]
1919
gem 'puma', "3.12.1" if version > '5-0-stable'
2020
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
21-
gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5'
2221

2322
gem_list.each do |rails_gem|
2423
gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
@@ -32,9 +31,5 @@ else
3231
gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5'
3332
gem "puma" if version >= '5-1-stable'
3433

35-
if version.gsub(/[^\d\.]/,'').to_f >= 6.0
36-
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]
37-
else
38-
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
39-
end
34+
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
4035
end

0 commit comments

Comments
 (0)