summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Ziegler <austin@zieglers.ca>2013-08-14 17:44:52 -0400
committerAustin Ziegler <austin@zieglers.ca>2013-08-14 17:44:52 -0400
commit6b7f77745db33d8d1591616a36a6d47e92bb944e (patch)
treed495d9aa99bab17892365b8804f0e9c44c3133f0
parent18949747d54ee4428b9caa272969fed5c0f8e121 (diff)
downloadgit-6b7f77745db33d8d1591616a36a6d47e92bb944e.tar.gz
Fixing Travis compiles.v1.24
-rw-r--r--.travis.yml9
-rw-r--r--mime-types.gemspec9
2 files changed, 10 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 903cddfbd9..a084dd2c6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,17 @@ rvm:
- 2.0.0
- 1.9.3
- 1.9.2
- - ruby-head
- 1.8.7
- jruby-19mode
- - jruby-head
- jruby-18mode
- rbx-19mode
- rbx-18mode
- ree
+ - ruby-head
+ - jruby-head
+matrix:
+ allow_failures:
+ - rvm:
+ - ruby-head
+ - jruby-head
script: rake travis
diff --git a/mime-types.gemspec b/mime-types.gemspec
index 9063aa1c03..2e66cf6650 100644
--- a/mime-types.gemspec
+++ b/mime-types.gemspec
@@ -33,9 +33,8 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<hoe-git>, ["~> 1.5"])
s.add_development_dependency(%q<hoe-rubygems>, ["~> 1.0"])
s.add_development_dependency(%q<hoe-travis>, ["~> 1.2"])
- s.add_development_dependency(%q<nokogiri>, ["~> 1.5"])
s.add_development_dependency(%q<rake>, ["~> 10.0"])
- s.add_development_dependency(%q<hoe>, ["~> 3.6"])
+ s.add_development_dependency(%q<hoe>, ["~> 3.7"])
else
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
s.add_dependency(%q<minitest>, ["~> 5.0"])
@@ -46,9 +45,8 @@ Gem::Specification.new do |s|
s.add_dependency(%q<hoe-git>, ["~> 1.5"])
s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
- s.add_dependency(%q<nokogiri>, ["~> 1.5"])
s.add_dependency(%q<rake>, ["~> 10.0"])
- s.add_dependency(%q<hoe>, ["~> 3.6"])
+ s.add_dependency(%q<hoe>, ["~> 3.7"])
end
else
s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
@@ -60,8 +58,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<hoe-git>, ["~> 1.5"])
s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
- s.add_dependency(%q<nokogiri>, ["~> 1.5"])
s.add_dependency(%q<rake>, ["~> 10.0"])
- s.add_dependency(%q<hoe>, ["~> 3.6"])
+ s.add_dependency(%q<hoe>, ["~> 3.7"])
end
end