Upgrade: Ruby 3.1 → 4.0

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.1", "3.2", "3.3"]
+        ruby: ["3.2", "3.3", "3.4", "4.0"]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.2.9"
+        ruby-version: "4.0.1"
 
     - name: Build
       run: |

Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'maremma', '~> 5.0', git: 'https://github.com/datacite/maremma.git', branch: 'ks-ruby-4-upgrade'
+
 gemspec  

Gemfile.lock

@@ -1,8 +1,28 @@
+GIT
+  remote: https://github.com/datacite/maremma.git
+  revision: f578f98e3fa39a5a990baaaf48bc70c699ac2880
+  branch: ks-ruby-4-upgrade
+  specs:
+    maremma (5.0.0)
+      activesupport (~> 8.1, >= 8.1.2)
+      addressable (~> 2.8, >= 2.8.9)
+      builder (~> 3.2, >= 3.2.2)
+      excon (~> 1.3, >= 1.3.2)
+      faraday (>= 2.0)
+      faraday-encoding (~> 0.0.6)
+      faraday-excon (~> 2.4.0)
+      faraday-follow_redirects (~> 0.5.0)
+      faraday-gzip (~> 3.1.0)
+      faraday-multipart (~> 1.2.0)
+      nokogiri (~> 1.19, >= 1.19.1)
+      oj (~> 3.16, >= 3.16.15)
+      oj_mimic_json (~> 1.0, >= 1.0.1)
+
 PATH
   remote: .
   specs:
-    bolognese (2.5.1)
-      activesupport (= 7.2.3)
+    bolognese (2.6.0)
+      activesupport (~> 8.1, >= 8.1.2)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
       builder (~> 3.2, >= 3.2.2)
@@ -16,7 +36,6 @@ PATH
       json-ld-preloaded (~> 3.1, >= 3.1.3)
       jsonlint (~> 0.3.0)
       loofah (~> 2.0, >= 2.0.3)
-      maremma (~> 5.0)
       namae (~> 1.0)
       nokogiri (~> 1.16, >= 1.16.2)
       oj (~> 3.10)
@@ -29,22 +48,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.3)
+    activesupport (8.1.2)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+      uri (>= 0.13.1)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     base64 (0.3.0)
-    benchmark (0.5.0)
     benchmark_methods (0.7)
     bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
@@ -76,25 +95,28 @@ GEM
       scanf (~> 1.0)
       sxp (~> 1.2)
       unicode-types (~> 1.8)
-    edtf (3.1.1)
-      activesupport (>= 3.0, < 8.0)
-    excon (0.71.1)
-    faraday (2.7.6)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-encoding (0.0.5)
+    edtf (3.2.0)
+      activesupport (>= 3.0, < 9.0)
+    excon (1.4.0)
+      logger
+    faraday (2.14.1)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-encoding (0.0.6)
       faraday
-    faraday-excon (2.1.0)
-      excon (>= 0.27.4)
-      faraday (~> 2.0)
-    faraday-follow_redirects (0.3.0)
+    faraday-excon (2.4.0)
+      excon (>= 1.0.0)
+      faraday (>= 2.11.0, < 3)
+    faraday-follow_redirects (0.5.0)
       faraday (>= 1, < 3)
-    faraday-gzip (0.1.0)
-      faraday (>= 1.0)
-      zlib (~> 2.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (3.0.2)
+    faraday-gzip (3.1.0)
+      faraday (>= 2.0, < 3)
+      zlib (~> 3.0)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     haml (5.2.2)
@@ -126,36 +148,30 @@ GEM
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    maremma (5.0.0)
-      activesupport (>= 4.2.5)
-      addressable (>= 2.3.6)
-      builder (~> 3.2, >= 3.2.2)
-      excon (~> 0.71.0)
-      faraday (>= 2.0)
-      faraday-encoding (~> 0.0.5)
-      faraday-excon (~> 2.1.0)
-      faraday-follow_redirects (~> 0.3.0)
-      faraday-gzip (~> 0.1.0)
-      faraday-multipart (~> 1.0.4)
-      nokogiri (~> 1.16, >= 1.16.2)
-      oj (>= 2.8.3)
-      oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
     mini_portile2 (2.8.5)
-    minitest (5.18.0)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.1)
     namae (1.1.1)
-    nokogiri (1.16.2)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    nokogiri (1.19.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.14.2)
+    oj (3.16.15)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     oj_mimic_json (1.0.1)
     optimist (3.0.1)
+    ostruct (0.6.3)
     postrank-uri (1.0.24)
       addressable (>= 2.4.0)
       nokogiri (>= 1.8.0)
       public_suffix (>= 2.0.0, < 2.1)
+    prism (1.9.0)
     public_suffix (2.0.5)
     racc (1.6.0)
     rack (2.2.4)
@@ -204,7 +220,6 @@ GEM
     rspec-xsd (0.1.0)
       nokogiri (~> 1.6)
       rspec (~> 3)
-    ruby2_keywords (0.0.5)
     scanf (1.0.0)
     securerandom (0.4.1)
     simplecov (0.17.1)
@@ -222,12 +237,13 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-types (1.8.0)
     unicode_utils (1.4.0)
+    uri (1.1.1)
     vcr (3.0.3)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zlib (2.1.1)
+    zlib (3.2.2)
 
 PLATFORMS
   ruby
@@ -238,6 +254,7 @@ DEPENDENCIES
   byebug
   hashdiff (>= 1.0.0.beta1, < 2.0.0)
   json-canonicalization (= 0.3.1)
+  maremma (~> 5.0)!
   rack-test (~> 0)
   rake (~> 12.0)
   rspec (~> 3.4)

bolognese.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |s|
   s.version       = Bolognese::VERSION
   s.extra_rdoc_files = ["README.md"]
   s.license       = 'MIT'
-  s.required_ruby_version = ['>= 3.1', '<= 3.3.10']
+  s.required_ruby_version = ['>= 3.2', '<= 4.0.1']
 
   # Declare dependencies here, rather than in the Gemfile
-  s.add_dependency 'maremma', '~> 5.0'
+  # s.add_dependency 'maremma', '~> 5.0' # update this to the latest version when available on RubyGems
   s.add_dependency 'nokogiri', '~> 1.16', '>= 1.16.2'
   s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
-  s.add_dependency 'activesupport', '7.2.3'
+  s.add_dependency 'activesupport', "~> 8.1", ">= 8.1.2"
   s.add_dependency 'bibtex-ruby', '>= 5.1.0'
   s.add_dependency 'thor', '>= 0.19'
   s.add_dependency 'colorize', '~> 0.8.1'

lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end