Skip to content

Commit a52dca9

Browse files
committed
Merge pull request #1570 from bquorning/use-older-rake
Don't use Rake v11 with older rubies
2 parents 73890bc + 93e5157 commit a52dca9

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

Gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ end
1919

2020
gem 'sqlite3', '~> 1.3.6'
2121

22+
if RUBY_VERSION >= '1.9.3'
23+
gem 'rake', '>= 10.0.0'
24+
else
25+
gem 'rake', '~> 10.0' # rake 11 requires Ruby 1.9.3 or later
26+
end
27+
2228
# Capybara versions that support RSpec 3 only support RUBY_VERSION >= 1.9.3
2329
if RUBY_VERSION >= '1.9.3'
2430
gem 'capybara', '~> 2.2.0', :require => false

example_app_generator/generate_app.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
|# Rack::Cache 1.3.0 requires Ruby >= 2.0.0
3333
|gem 'rack-cache', '< 1.3.0' if RUBY_VERSION < '2.0.0'
3434
|
35+
|if RUBY_VERSION >= '1.9.3'
36+
| gem 'rake', '>= 10.0.0'
37+
|else
38+
| gem 'rake', '~> 10.0' # rake 11 requires Ruby 1.9.3 or later
39+
|end
40+
|
3541
|gem 'rspec-rails',
3642
| :path => '#{rspec_rails_repo_path}',
3743
| :groups => [:development, :test]

rspec-rails.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ Gem::Specification.new do |s|
4242
end
4343
end
4444

45-
s.add_development_dependency 'rake', '~> 10.0'
4645
s.add_development_dependency 'cucumber', '~> 1.3.5'
4746
s.add_development_dependency 'aruba', '~> 0.5.4'
4847
s.add_development_dependency 'ammeter', '1.1.2'

0 commit comments

Comments
 (0)