summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-21 09:14:36 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-21 09:14:36 -0700
commit940896aaf62630f6b25520c64cfeb8d565f73885 (patch)
tree6c1b4e25f0e9928cc4f579e7e236f24f41cde451 /Rakefile
parentd8440cc7019c04a6378c7cc5efd05527b91748f5 (diff)
parent86388bbc72c7bd10d3482cc63dfdfa276c604baf (diff)
downloadpsych-940896aaf62630f6b25520c64cfeb8d565f73885.tar.gz
Merge branch 'master' into jruby
* master: psych: allocate structs with wrapper update minitest gem to 5.x, add Ruby 2.2 test target
Diffstat (limited to 'Rakefile')
-rw-r--r--Rakefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Rakefile b/Rakefile
index bf332a7..06d82c5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,7 +16,7 @@ class Hoe
end
gem 'rake-compiler', '>= 0.4.1'
-gem 'minitest', '~> 4.0'
+gem 'minitest', '~> 5.0'
require "rake/extensiontask"
Hoe.plugin :doofus, :git, :gemspec
@@ -31,7 +31,7 @@ $hoe = Hoe.spec 'psych' do
self.testlib = :minitest
extra_dev_deps << ['rake-compiler', '>= 0.4.1']
- extra_dev_deps << ['minitest', '~> 4.0']
+ extra_dev_deps << ['minitest', '~> 5.0']
self.spec_extras = {
:required_ruby_version => '>= 1.9.2'