Skip to content

Commit

Permalink
only add the yajl-ruby gem to the bundle if the platform is ruby (eg.…
Browse files Browse the repository at this point in the history
… not jruby)
  • Loading branch information
joshk committed Apr 14, 2011
1 parent 55dba8d commit 194f483
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion multi_json.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.