Skip to content

Commit 8b0e8d6

Browse files
committed
Cap dependencies for 2.2.10
When installed from scratch on 2.2.10 with RubyGems 2.3.10 and Bundler 1.17.3, with RAILS_VERSION set to `5-2-stable`: childprocess-3.0.0 requires ruby version >= 2.3.0, which is incompatible with the current version, ruby 2.2.10p489 xpath-3.2.0 requires ruby version >= 2.3, which is incompatible with the current version, ruby 2.2.10p489 i18n-1.8.3 requires ruby version >= 2.3.0, which is incompatible with the current version, ruby 2.2.10p489 nio4r-2.5.2 requires ruby version >= 2.3, which is incompatible with the current version, ruby 2.2.10p489 rack-2.2.3 requires ruby version >= 2.3.0, which is incompatible with the current version, ruby 2.2.10p489 public_suffix-4.0.5 requires ruby version >= 2.3, which is incompatible with the current version, ruby 2.2.10p489 rubyzip-2.3.0 requires ruby version >= 2.4, which is incompatible with the current version, ruby 2.2.10p489 sprockets-4.0.2 requires ruby version >= 2.5.0, which is incompatible with the current version, ruby 2.2.10p489 We had sprockets capped, but only for `'~> x.x.x'`/`x.x.x` formats.
1 parent 8b000d5 commit 8b0e8d6

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ end
7979
if RUBY_VERSION <= '1.8.7'
8080
# cucumber and gherkin require rubyzip as a runtime dependency on 1.8.7
8181
# Only < 1.0 supports 1.8.7
82-
gem 'rubyzip', '< 1.0'
83-
else
84-
gem "rubyzip", '>= 1.2.2'
82+
gem 'rubyzip', '<= 1.0'
83+
elsif RUBY_VERSION < '2.4'
84+
gem 'rubyzip', '>= 1.2.2', '< 2.0.0'
8585
end
8686

8787
if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.2.0'

Gemfile-rails-dependencies

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
version_file = File.expand_path("../.rails-version", __FILE__)
22

3-
# FIXME: rack 2.1.0 introduces a deprecation warning that rails is triggering,
4-
# but in later versions this warning will be removed. Get rid of this hack once
5-
# rack 2.1.0+ is out.
6-
gem 'rack', '!= 2.1.0'
7-
83
case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
94
when /master/
105
gem "rails", :git => "https://github.com/rails/rails.git"
@@ -49,20 +44,35 @@ else
4944
gem "puma"
5045
end
5146

52-
if RUBY_VERSION < "2.5"
53-
gem "sprockets", "~> 3.0"
54-
end
55-
5647
if version.gsub(/[^\d\.]/,'').to_f >= 6.0
5748
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", :platforms => [:jruby]
5849
else
5950
gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
6051
end
6152
end
6253

54+
gem "childprocess", '< 2.0.0' if RUBY_VERSION < '2.3'
55+
6356
if RUBY_VERSION < '1.9.3'
6457
gem "i18n", '< 0.7.0'
6558
elsif RUBY_VERSION < '2.3.0'
6659
gem "i18n", '< 1.5.2'
6760
end
61+
62+
gem "nio4r", '< 2.4.0' if RUBY_VERSION < '2.3'
63+
64+
gem "public_suffix", '< 4.0.0' if RUBY_VERSION < '2.3'
65+
66+
# rack 2.1.0 introduces a deprecation warning that rails is triggering,
67+
# but in later versions this warning is removed.
68+
if RUBY_VERSION < '2.2'
69+
gem "rack", '< 2.0.0', '!= 2.1.0'
70+
elsif RUBY_VERSION < '2.3'
71+
gem "rack", '< 2.2.0', '!= 2.1.0'
72+
end
73+
74+
gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5'
75+
6876
gem "test-unit" if RUBY_VERSION >= '2.2.0' && version =~ /3[.-]2[.-]/
77+
78+
gem "xpath", '< 3.2.0' if RUBY_VERSION < '2.3'

0 commit comments

Comments
 (0)