Skip to content

Commit

Permalink
Merge pull request #339 from timfel/master
Browse files Browse the repository at this point in the history
Gemfile update for MagLev
  • Loading branch information
rkh committed Aug 12, 2011
2 parents 9f69232 + 8cc5f01 commit 7051b19
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions Gemfile
Expand Up @@ -29,10 +29,14 @@ gem 'sass'
gem 'builder' gem 'builder'
gem 'erubis' gem 'erubis'
gem 'less', '~> 1.0' gem 'less', '~> 1.0'
gem 'liquid' unless RUBY_ENGINE == 'maglev' if RUBY_ENGINE == "maglev"
gem 'liquid', :git => "https://github.com/Shopify/liquid.git"
else
gem 'liquid'
end
gem 'slim' gem 'slim'
gem 'RedCloth' if RUBY_VERSION < "1.9.3" and not RUBY_ENGINE.start_with? 'ma' gem 'RedCloth' if RUBY_VERSION < "1.9.3" and not RUBY_ENGINE.start_with? 'ma'
gem 'coffee-script', '>= 2.0' unless RUBY_ENGINE == 'maglev' gem 'coffee-script', '>= 2.0'
gem 'rdoc' gem 'rdoc'
gem 'kramdown' gem 'kramdown'
gem 'maruku' gem 'maruku'
Expand All @@ -54,15 +58,15 @@ unless RUBY_ENGINE == 'jruby' && JRUBY_VERSION < "1.6.1"
end end


if RUBY_ENGINE == 'maglev' if RUBY_ENGINE == 'maglev'
gem 'json' gem 'json', :git => "https://github.com/MagLev/json.git"
gem 'markaby'
gem 'radius'
end

platforms :ruby_18, :jruby do
gem 'json'
gem 'markaby' gem 'markaby'
gem 'radius' gem 'radius'
else
platforms :ruby_18, :jruby do
gem 'json'
gem 'markaby'
gem 'radius'
end
end end


platforms :mri_18 do platforms :mri_18 do
Expand Down

0 comments on commit 7051b19

Please sign in to comment.