Permalink
Browse files

remove maglev specific switches, maglev master can provide/install pa…

…tched gems as needed now
  • Loading branch information...
1 parent dd48e93 commit a3c7c799e833e9ac93d948a9df049790d616bdf1 @timfel timfel committed Sep 20, 2011
Showing with 4 additions and 16 deletions.
  1. +4 −16 Gemfile
View
20 Gemfile
@@ -30,13 +30,7 @@ gem 'sass'
gem 'builder'
gem 'erubis'
gem 'less', '~> 1.0'
-
-if RUBY_ENGINE == "maglev"
- gem 'liquid', :git => "https://github.com/Shopify/liquid.git"
-else
- gem 'liquid'
-end
-
+gem 'liquid'
gem 'slim', '~> 1.0'
gem 'temple', '!= 0.3.3'
gem 'RedCloth' if RUBY_VERSION < "1.9.3" and not RUBY_ENGINE.start_with? 'ma'
@@ -49,7 +43,7 @@ gem 'creole'
if RUBY_ENGINE == 'jruby'
gem 'nokogiri', '!= 1.5.0'
gem 'jruby-openssl'
-elsif RUBY_ENGINE != 'maglev'
+else
gem 'nokogiri'
end
@@ -62,16 +56,10 @@ unless RUBY_ENGINE == 'jruby' && JRUBY_VERSION < "1.6.1" && !ENV['TRAVIS']
#gem 'bluecloth'
end
-if RUBY_ENGINE == 'maglev'
- gem 'json', :git => "https://github.com/MagLev/json.git"
+platforms :ruby_18, :jruby do
+ gem 'json'
gem 'markaby'
gem 'radius'
-else
- platforms :ruby_18, :jruby do
- gem 'json'
- gem 'markaby'
- gem 'radius'
- end
end
platforms :mri_18 do

0 comments on commit a3c7c79

Please sign in to comment.