Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use platforms instead of install_if #8140

Merged
merged 3 commits into from Apr 27, 2020
+4 −4
Merged

Use platforms instead of install_if #8140

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f66367e
Use platforms instead of install_if
dleidert Apr 25, 2020
7d7653f
Also replace install_if in Gemfile
dleidert Apr 26, 2020
74d80a7
Use platforms instead of platform although both seem accepted
dleidert Apr 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@ group :jekyll_optional_dependencies do

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
# and associated library
install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
platform :jruby, :mswin, :mingw, :x64_mingw do
dleidert marked this conversation as resolved.
Show resolved Hide resolved
gem "tzinfo", "~> 1.2"
gem "tzinfo-data"
end
Expand Down
4 changes: 2 additions & 2 deletions lib/jekyll/commands/new.rb
View file
Open in desktop
Expand Up @@ -91,13 +91,13 @@ def gemfile_contents

# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
# 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-data"
end

# 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
end
Expand Down