Permalink
Browse files

only add the yajl-ruby gem to the bundle if the platform is ruby (eg.…

… not jruby)
  • Loading branch information...
1 parent 55dba8d commit 194f483895721e3b6fe6b7be0fe681dbaf2d014f @joshk joshk committed Apr 14, 2011
Showing with 7 additions and 4 deletions.
  1. +3 −3 Gemfile
  2. +4 −1 multi_json.gemspec
View
@@ -1,7 +1,7 @@
source "http://rubygems.org"
+gemspec
+
gem 'json', '~> 1.4', :require => nil
gem 'json_pure', '~> 1.4', :require => nil
-gem 'yajl-ruby', '~> 0.7', :require => nil
-
-gemspec
+gem 'yajl-ruby', '~> 0.7', :require => nil, :platforms => :ruby
View
@@ -26,10 +26,13 @@ Gem::Specification.new do |s|
s.add_development_dependency("rspec", "~> 2.0")
s.add_development_dependency("json", "~> 1.4")
s.add_development_dependency("json_pure", "~> 1.4")
- s.add_development_dependency("yajl-ruby", "~> 0.7")
unless ENV['RUBY_VERSION'].match(/^rbx-/)
s.add_development_dependency("rcov", "~> 0.9")
end
+
+ unless ENV['RUBY_VERSION'].match(/^jruby-/)
+ s.add_development_dependency("yajl-ruby", "~> 0.7")
+ end
end

0 comments on commit 194f483

Please sign in to comment.