Merge pull request #761 from sul-dlss/unpin-commonmarker

Vary commonmarker pin depending on Ruby version
sul-dlss · Jan 7, 2025 · fc8229a · fc8229a
2 parents 9fb39d3 + f58a929
commit fc8229a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     cocina-models (0.99.2)
       activesupport
-      commonmarker (= 2.0.1)
+      commonmarker (~> 2.0, != 2.0.2)
       deprecation
       dry-struct (~> 1.0)
       dry-types (~> 1.1)

diff --git a/cocina-models.gemspec b/cocina-models.gemspec
@@ -25,7 +25,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'commonmarker', '2.0.1' # There is a breaking change in 2.0.2 with openapi3_parser
+  if RUBY_VERSION >= '3.4' # rubocop:disable Gemspec/RubyVersionGlobalsUsage
+    spec.add_dependency 'commonmarker', '>= 2.0.2' # commonmarker <= 2.0.1 is incompatible with Ruby 3.4
+  else
+    spec.add_dependency 'commonmarker', '~> 2.0', '!= 2.0.2' # commonmarker 2.0.2 includes a breaking change in Rubies < 3.4
+  end
   spec.add_dependency 'deprecation'
   spec.add_dependency 'dry-struct', '~> 1.0'
   spec.add_dependency 'dry-types', '~> 1.1'