Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ PATH
specs:
xdrgen (0.1.3)
activesupport (~> 6)
concurrent-ruby (<= 1.3.4)
concurrent-ruby (>= 1.3.7)
logger
memoist (~> 0.11.0)
slop (~> 3.4)
treetop (~> 1.5.3)
Expand All @@ -18,7 +19,7 @@ GEM
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
coderay (1.1.3)
concurrent-ruby (1.1.10)
concurrent-ruby (1.3.7)
diff-lcs (1.5.0)
ffi (1.15.5)
formatador (1.1.0)
Expand All @@ -41,6 +42,7 @@ GEM
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.7.0)
lumberjack (1.2.8)
memoist (0.11.0)
method_source (1.0.0)
Expand Down
3 changes: 3 additions & 0 deletions lib/xdrgen.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
require "xdrgen/version"
# activesupport 6 references ::Logger without requiring it, and
# concurrent-ruby >= 1.3.5 no longer requires it either, so load it first.
require "logger"
require "active_support/all"
require 'memoist'

Expand Down
8 changes: 5 additions & 3 deletions xdrgen.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.required_ruby_version = '>= 2.1.0'
spec.required_ruby_version = '>= 2.5.0'

spec.add_dependency "treetop", "~> 1.5.3"
spec.add_dependency "activesupport", "~> 6"
spec.add_dependency "slop", "~> 3.4"
spec.add_dependency "memoist", "~> 0.11.0"
# https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
spec.add_dependency "concurrent-ruby", "<= 1.3.4"
# >= 1.3.7 fixes GHSA-h8w8-99g7-qmvj, GHSA-wv3x-4vxv-whpp and GHSA-6wx8-w4f5-wwcr
spec.add_dependency "concurrent-ruby", ">= 1.3.7"

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 99390b9: required_ruby_version is now >= 2.5.0, matching the floor activesupport 6 already imposes.

# required at load time by lib/xdrgen.rb; no longer a default gem on Ruby >= 3.5
spec.add_dependency "logger"

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ruby 3.5 is not released yet (current stable is 3.4.10; 3.5 exists only as a preview), so it cannot go into the required matrix. I also ran the suite on 3.5.0preview1: it fails before reaching this change, because the pry dev dependency hits another Ruby 3.5 default-gem removal (cannot load such file -- ostruct). Bringing xdrgen to Ruby 3.5 therefore needs its own change beyond this security bump; the logger dependency here is forward-looking and has no effect on currently supported Rubies. Happy to follow up with a matrix update once 3.5 is stable, if the maintainers want that.


spec.add_development_dependency "bundler", "~> 2"
spec.add_development_dependency "rake", "~> 12.0"
Expand Down
Loading