Skip to content

Commit 1451bf8

Browse files
authored
Fix other builds by pinning rest client (#1779)
* pin rubocop for rails * limit relish to modern rubies
1 parent 0e83a47 commit 1451bf8

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Gemfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ gem 'yard', '~> 0.8.7', :require => false
1111
group :documentation do
1212
gem 'redcarpet', '2.3.0'
1313
gem 'github-markup', '1.0.0'
14-
gem 'relish'
14+
if RUBY_VERSION > '2.0.0'
15+
gem 'relish'
16+
end
1517
end
1618

1719
platforms :jruby do
@@ -57,9 +59,10 @@ if RUBY_VERSION <= '1.8.7'
5759
gem 'rubyzip', '< 1.0'
5860
end
5961

60-
unless RUBY_VERSION >= '2.4.0'
62+
if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.2.0'
6163
# our current rubocop version doesnt support the json version required by Ruby 2.4
62-
gem 'rubocop', "~> 0.23.0", :platform => [:ruby_20, :ruby_21]
64+
# our rails rubocop setup only supports 2.0 and 2.1
65+
gem 'rubocop', "~> 0.23.0"
6366
end
6467

6568
custom_gemfile = File.expand_path("../Gemfile-custom", __FILE__)

0 commit comments

Comments
 (0)