Skip to content

Commit 231a89e

Browse files
committed
Add syslog as runtime dependency
The syslog gem moves from default gems to a normal gem in Ruby 3.4. It raises the following warning on Ruby 3.3.5: ``` lib/puppet/util/command_line.rb:14: warning: syslog was loaded from the standard library, but will no longer be part of the default gems starting from Ruby 3.4.0. You can add syslog to your Gemfile or gemspec to silence this warning. ```
1 parent c64829f commit 231a89e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Gemfile

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ group(:features) do
3535
# requires native ldap headers/libs
3636
# gem 'ruby-ldap', '~> 0.9', require: false, platforms: [:ruby]
3737
gem 'puppetserver-ca', '~> 2.0', require: false
38-
gem 'syslog', '~> 0.1.1', require: false, platforms: [:ruby]
3938
gem 'CFPropertyList', ['>= 3.0.6', '< 4'], require: false
4039
end
4140

puppet.gemspec

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,12 @@ Gem::Specification.new do |spec|
3737
spec.add_runtime_dependency('CFPropertyList', ['>= 3.0.6', '< 4'])
3838
end
3939

40-
if platform == 'x64-mingw32' || platform == 'x86-mingw32'
40+
if (platform == 'x64-mingw32' || platform == 'x86-mingw32') || Gem.win_platform?
4141
# ffi 1.16.0 - 1.16.2 are broken on Windows
4242
spec.add_runtime_dependency('ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2')
4343
spec.add_runtime_dependency('minitar', '~> 0.9')
44+
elsif !Gem.java_platform?
45+
# don't depend on syslog on jruby, it requires extensions
46+
spec.add_runtime_dependency('syslog', '~> 0.1.2')
4447
end
4548
end

0 commit comments

Comments
 (0)