dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use platforms instead of install_if (#8140) 

Merge pull request 8140
This commit is contained in:
Daniel Leidert 2020-04-27 14:20:52 +02:00 committed by GitHub
parent 59f1b9a131
commit acf92593f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -74,7 +74,7 @@ group :jekyll_optional_dependencies do
gem "rdoc", "~> 6.0" gem "rdoc", "~> 6.0"
gem "tomlrb", "~> 1.2" gem "tomlrb", "~> 1.2"
platform :ruby, :mswin, :mingw, :x64_mingw do platforms :ruby, :mswin, :mingw, :x64_mingw do
gem "classifier-reborn", "~> 2.2" gem "classifier-reborn", "~> 2.2"
gem "liquid-c", "~> 4.0" gem "liquid-c", "~> 4.0"
gem "yajl-ruby", "~> 1.4" gem "yajl-ruby", "~> 1.4"
@ -82,7 +82,7 @@ group :jekyll_optional_dependencies do
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
# and associated library # and associated library
install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do platforms :jruby, :mswin, :mingw, :x64_mingw do
gem "tzinfo", "~> 1.2" gem "tzinfo", "~> 1.2"
gem "tzinfo-data" gem "tzinfo-data"
end end

4
lib/jekyll/commands/new.rb
View File

@ -91,13 +91,13 @@ module Jekyll
# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
# and associated library. # and associated library.
install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do platforms :mingw, :x64_mingw, :mswin, :jruby do
gem "tzinfo", "~> 1.2" gem "tzinfo", "~> 1.2"
gem "tzinfo-data" gem "tzinfo-data"
end end
# Performance-booster for watching directories on Windows # Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform? gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
RUBY RUBY
end end