diff options
author | Homu <homu@barosl.com> | 2016-01-31 14:00:58 +0900 |
---|---|---|
committer | Homu <homu@barosl.com> | 2016-01-31 14:00:58 +0900 |
commit | 84c071906f44f2517ff096a7a5ad80c7cf457c8b (patch) | |
tree | d4a1a10056208cc3d2d5f705856003b6a3eb903d | |
parent | 35486c38a84d76ea5090801fc1482ffb5c6c1e69 (diff) | |
parent | a92481ac965fe97a0e539d2022d027807b6265e2 (diff) | |
download | bundler-84c071906f44f2517ff096a7a5ad80c7cf457c8b.tar.gz |
Auto merge of #4255 - bundler:seg-gemspec-bump-rdiscount, r=segiddins
[Gemspec] Bump rdiscount to `~> 2.1.8`
-rw-r--r-- | Rakefile | 12 | ||||
-rw-r--r-- | bundler.gemspec | 2 |
2 files changed, 4 insertions, 10 deletions
@@ -62,15 +62,9 @@ namespace :spec do sh "sudo apt-get install groff-base -y" # Install graphviz so that the viz specs can run sh "sudo apt-get install graphviz -y 2>&1 | tail -n 2" - if RUBY_VERSION < "1.9" - # Downgrade Rubygems on 1.8 so Ronn can be required - # https://github.com/rubygems/rubygems/issues/784 - sh "gem update --system 2.1.11" - else - # Downgrade Rubygems so RSpec 3 can be installed - # https://github.com/rubygems/rubygems/issues/813 - sh "gem update --system 2.2.0" - end + + # Install the gems with a consistent version of RubyGems + sh "gem update --system 2.5.1" $LOAD_PATH.unshift("./spec") require "support/rubygems_ext" diff --git a/bundler.gemspec b/bundler.gemspec index 8fc65647d5..52d5692826 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.add_development_dependency "automatiek", "~> 0.1.0" s.add_development_dependency "mustache", "0.99.6" s.add_development_dependency "rake", "~> 10.0" - s.add_development_dependency "rdiscount", "~> 1.6" + s.add_development_dependency "rdiscount", "~> 2.1.8" s.add_development_dependency "ronn", "~> 0.7.3" s.add_development_dependency "rspec", "~> 3.0" |