dep: Add native Ruby 4 support, drop Ruby 3.1 support (v1.19.x) (#3592)

**What problem is this PR intended to solve?**

#3590, bumping some other dev dependencies along the way

Note that this will be the first release of v1.19.x which is an
extension of v1.18.x.


**Have you included adequate test coverage?**

Existing coverage is adequate.


**Does this change affect the behavior of either the C or the Java
implementations?**

No functional changes.

Author: flavorjones

.cross_rubies

@@ -1,36 +1,36 @@
-3.1.0:aarch64-linux-gnu
-3.1.0:aarch64-linux-musl
-3.1.0:arm-linux-gnu
-3.1.0:arm-linux-musl
-3.1.0:arm64-darwin
-3.1.0:x64-mingw-ucrt
-3.1.0:x86_64-darwin
-3.1.0:x86_64-linux-gnu
-3.1.0:x86_64-linux-musl
-3.2.0:aarch64-linux-gnu
-3.2.0:aarch64-linux-musl
-3.2.0:arm-linux-gnu
-3.2.0:arm-linux-musl
-3.2.0:arm64-darwin
-3.2.0:x64-mingw-ucrt
-3.2.0:x86_64-darwin
-3.2.0:x86_64-linux-gnu
-3.2.0:x86_64-linux-musl
-3.3.5:aarch64-linux-gnu
-3.3.5:aarch64-linux-musl
-3.3.5:arm-linux-gnu
-3.3.5:arm-linux-musl
-3.3.5:arm64-darwin
-3.3.5:x64-mingw-ucrt
-3.3.5:x86_64-darwin
-3.3.5:x86_64-linux-gnu
-3.3.5:x86_64-linux-musl
-3.4.0:aarch64-linux-gnu
-3.4.0:aarch64-linux-musl
-3.4.0:arm-linux-gnu
-3.4.0:arm-linux-musl
-3.4.0:arm64-darwin
-3.4.0:x64-mingw-ucrt
-3.4.0:x86_64-darwin
-3.4.0:x86_64-linux-gnu
-3.4.0:x86_64-linux-musl
+3.2.9:aarch64-linux-gnu
+3.2.9:aarch64-linux-musl
+3.2.9:arm-linux-gnu
+3.2.9:arm-linux-musl
+3.2.9:arm64-darwin
+3.2.9:x64-mingw-ucrt
+3.2.9:x86_64-darwin
+3.2.9:x86_64-linux-gnu
+3.2.9:x86_64-linux-musl
+3.3.10:aarch64-linux-gnu
+3.3.10:aarch64-linux-musl
+3.3.10:arm-linux-gnu
+3.3.10:arm-linux-musl
+3.3.10:arm64-darwin
+3.3.10:x64-mingw-ucrt
+3.3.10:x86_64-darwin
+3.3.10:x86_64-linux-gnu
+3.3.10:x86_64-linux-musl
+3.4.8:aarch64-linux-gnu
+3.4.8:aarch64-linux-musl
+3.4.8:arm-linux-gnu
+3.4.8:arm-linux-musl
+3.4.8:arm64-darwin
+3.4.8:x64-mingw-ucrt
+3.4.8:x86_64-darwin
+3.4.8:x86_64-linux-gnu
+3.4.8:x86_64-linux-musl
+4.0.0:aarch64-linux-gnu
+4.0.0:aarch64-linux-musl
+4.0.0:arm-linux-gnu
+4.0.0:arm-linux-musl
+4.0.0:arm64-darwin
+4.0.0:x64-mingw-ucrt
+4.0.0:x86_64-darwin
+4.0.0:x86_64-linux-gnu
+4.0.0:x86_64-linux-musl

.github/workflows/ci.yml

@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@d3e3bd032ad2222a8ac878bbccf2aba78864e134
         with:
           ruby-version: "3.3"
           bundler-cache: true
@@ -99,9 +99,9 @@ jobs:
     needs: ["basic"]
     outputs:
       # these are usually the same, but are different once we get to ruby release candidates
-      setup_ruby: "['3.1', '3.2', '3.3', '3.4']"
-      setup_ruby_win: "['3.1', '3.2', '3.3', '3.4']"
-      image_tag: "['3.1', '3.2', '3.3', '3.4']"
+      setup_ruby:     "['3.2', '3.3', '3.4', '4.0']"
+      setup_ruby_win: "['3.2', '3.3', '3.4', '4.0']"
+      image_tag:      "['3.2', '3.3', '3.4', '4.0']"
     runs-on: ubuntu-latest
     steps:
       - run: echo "generating rubies ..."
@@ -113,7 +113,7 @@ jobs:
       rcd_image_version: ${{steps.rcd_image_version.outputs.rcd_image_version}}
     steps:
       - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@d3e3bd032ad2222a8ac878bbccf2aba78864e134
         with:
           ruby-version: "3.4"
           bundler-cache: true
@@ -271,14 +271,13 @@ jobs:
       matrix:
         sys: ["enable", "disable"]
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
-        include:
-          - { ruby: "3.1", os: macos-14 }
-    runs-on: ${{ matrix.os || 'macos-latest' }}
+        os: [ macos-15-intel, macos-15 ]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@d3e3bd032ad2222a8ac878bbccf2aba78864e134
         with:
           ruby-version: ${{matrix.ruby}}
           bundler-cache: true
@@ -328,8 +327,6 @@ jobs:
       matrix:
         sys: ["enable", "disable"]
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby_win) }}
-        exclude:
-          - ruby: "3.1" # because Ruby 3.1 devkit is built with a version of GCC too old for modern msys2 2025-08
     runs-on: windows-2022
     steps:
       - name: configure git crlf
@@ -341,6 +338,7 @@ jobs:
           submodules: true
       - uses: ruby/setup-ruby-pkgs@v1
         with:
+          setup-ruby-ref: ruby/setup-ruby/d3e3bd032ad2222a8ac878bbccf2aba78864e134
           ruby-version: "${{matrix.ruby}}"
           mingw: "libxml2 libxslt"
           bundler-cache: true
@@ -358,13 +356,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["jruby-9.4"]
+        ruby: ["jruby-10.0"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@d3e3bd032ad2222a8ac878bbccf2aba78864e134
         with:
           ruby-version: ${{matrix.ruby}}
           bundler-cache: true
@@ -392,6 +390,7 @@ jobs:
           submodules: true
       - uses: ruby/setup-ruby-pkgs@v1
         with:
+          setup-ruby-ref: ruby/setup-ruby/d3e3bd032ad2222a8ac878bbccf2aba78864e134
           ruby-version: truffleruby
           bundler-cache: true
           bundler: 2.5.10
@@ -515,6 +514,7 @@ jobs:
           submodules: true
       - uses: ruby/setup-ruby-pkgs@v1
         with:
+          setup-ruby-ref: ruby/setup-ruby/d3e3bd032ad2222a8ac878bbccf2aba78864e134
           ruby-version: "${{matrix.ruby}}"
           apt-get: "libxml2-dev libxslt1-dev pkg-config"
       - uses: actions/download-artifact@v4
@@ -530,14 +530,13 @@ jobs:
       matrix:
         sys: ["enable", "disable"]
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
-        include:
-          - { ruby: "3.1", os: macos-14 }
-    runs-on: ${{ matrix.os || 'macos-latest' }}
+        os: [ macos-15-intel, macos-15 ]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@d3e3bd032ad2222a8ac878bbccf2aba78864e134
         with:
           ruby-version: "${{matrix.ruby}}"
       - uses: actions/download-artifact@v4
@@ -553,15 +552,14 @@ jobs:
       matrix:
         sys: ["enable", "disable"]
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby_win) }}
-        exclude:
-          - ruby: "3.1" # because Ruby 3.1 devkit is built with a version of GCC too old for modern msys2 2025-08
     runs-on: windows-2022
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: ruby/setup-ruby-pkgs@v1
         with:
+          setup-ruby-ref: ruby/setup-ruby/d3e3bd032ad2222a8ac878bbccf2aba78864e134
           ruby-version: "${{matrix.ruby}}"
           mingw: "libxml2 libxslt"
       - uses: actions/download-artifact@v4
@@ -617,7 +615,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@d3e3bd032ad2222a8ac878bbccf2aba78864e134
         with:
           ruby-version: "${{matrix.ruby}}"
       - uses: actions/download-artifact@v4
@@ -642,15 +640,15 @@ jobs:
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.image_tag) }}
         include:
           # declare docker image for each platform
-          - { platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash build-base &&" }
-          - { platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash build-base &&" }
-          - { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash build-base &&" }
+          - { runner: ubuntu-latest, platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash build-base &&" }
+          - { runner: ubuntu-latest, platform: arm-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash build-base &&" }
+          - { runner: ubuntu-latest, platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash build-base &&" }
           # declare docker platform for each platform
-          - { platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64/v8" }
-          - { platform: aarch64-linux-musl, docker_platform: "--platform=linux/arm64/v8" }
-          - { platform: arm-linux-gnu, docker_platform: "--platform=linux/arm/v7" }
-          - { platform: arm-linux-musl, docker_platform: "--platform=linux/arm/v7" }
-    runs-on: ubuntu-latest
+          - { runner: ubuntu-24.04-arm, platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64/v8" }
+          - { runner: ubuntu-24.04-arm, platform: aarch64-linux-musl, docker_platform: "--platform=linux/arm64/v8" }
+          - { runner: ubuntu-24.04-arm, platform: arm-linux-gnu, docker_platform: "--platform=linux/arm/v7" }
+          - { runner: ubuntu-24.04-arm, platform: arm-linux-musl, docker_platform: "--platform=linux/arm/v7" }
+    runs-on: ${{ matrix.runner || 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -660,7 +658,6 @@ jobs:
           name: cruby-${{ matrix.platform }}-gem
           path: gems
       - run: |
-          docker run --rm --privileged alekitto/qemu-user-static --reset -p yes
           docker run --rm -v $PWD:/nokogiri -w /nokogiri \
             ${{ matrix.docker_platform }} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \
             sh -c "
@@ -679,14 +676,14 @@ jobs:
           - x86_64-darwin
         ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
         include:
-          - { platform: arm64-darwin, os: macos-14 }
-          - { platform: x86_64-darwin, os: macos-13 }
+          - { platform: arm64-darwin, os: macos-15 }
+          - { platform: x86_64-darwin, os: macos-15-intel }
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@d3e3bd032ad2222a8ac878bbccf2aba78864e134
         with:
           ruby-version: "${{ matrix.ruby }}"
       - uses: actions/download-artifact@v4
@@ -706,7 +703,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@d3e3bd032ad2222a8ac878bbccf2aba78864e134
         with:
           ruby-version: "${{matrix.ruby}}"
       - uses: actions/download-artifact@v4
@@ -737,19 +734,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jruby: ["9.4"]
-        jre: ["8", "11"]
+        jruby: ["10.0"]
+        jre: ["21", "25"]
     name: "jruby-${{matrix.jruby}}-jre${{matrix.jre}}-install"
     runs-on: ubuntu-latest
+    container:
+      image: "jruby:${{matrix.jruby}}-jre${{matrix.jre}}"
     steps:
+      - run: apt update && apt install -y build-essential git
       - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: actions/download-artifact@v4
         with:
           name: jruby-gem
           path: gems
-      - run: |
-          docker run --rm -v "$PWD:/nokogiri" -w /nokogiri \
-            jruby:${{matrix.jruby}}-jre${{matrix.jre}} \
-            ./scripts/test-gem-install gems
+      - run: ./scripts/test-gem-install gems

.github/workflows/downstream.yml

@@ -31,19 +31,18 @@ jobs:
             name: rails-html-sanitizer
             command: "bundle exec rake test"
             ruby: "3.4"
-          # # pending a fix for https://github.com/sparklemotion/nokogiri/pull/3348
-          # - url: https://github.com/rgrove/sanitize
-          #   name: sanitize
-          #   command: "bundle exec rake test"
-          #   ruby: "3.4"
+          - url: https://github.com/rgrove/sanitize
+            name: sanitize
+            command: "bundle exec rake test"
+            ruby: "3.4"
           - url: https://github.com/ebeigarts/signer
             name: signer
             command: "bundle exec rake spec"
             ruby: "3.2"
           - url: https://github.com/WinRb/Viewpoint
             name: viewpoint
             command: "bundle exec rspec spec"
-            ruby: "3.1"
+            ruby: "3.2"
           - url: https://github.com/rails/rails
             name: xmlmini
             command: "cd activesupport && bundle exec rake test TESTOPTS=-n/XmlMini/"
@@ -89,9 +88,10 @@ jobs:
         working-directory: ${{matrix.name}}
         run: |
           bundle remove nokogiri || true
-          bundle add nokogiri --path=".." --skip-install
+          bundle remove bundler || true
           if grep "add_development_dependency.*\bbundler\b" *gemspec ; then
             sed -i 's/.*add_development_dependency.*\bbundler\b.*//' *gemspec
           fi
+          bundle add nokogiri --path=".." --skip-install
           bundle install --jobs=1
           ${{matrix.command}}

.github/workflows/generate-ci-images.yml

@@ -11,17 +11,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tag: ["alpine", "mri-3.1", "mri-3.2", "mri-3.3", "mri-3.4", "ubuntu", "upstream-libxml"]
+        tag: ["alpine", "mri-3.2", "mri-3.3", "mri-3.4", "mri-4.0", "ubuntu", "upstream-libxml"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: "3.4"
           bundler-cache: true
-          bundler: latest
       - uses: docker/setup-buildx-action@v3
       - uses: docker/login-action@v3
         with:

.rubocop.yml

@@ -22,7 +22,7 @@ inherit_from:
 
 AllCops:
   SuggestExtensions: false
-  TargetRubyVersion: "3.1"
+  TargetRubyVersion: "3.2"
 
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: consistent_comma

CONTRIBUTING.md

@@ -105,7 +105,7 @@ bundle install
 
 ### Advanced
 
-Please install the latest or previous version of CRuby (e.g., 3.2 or 3.1 as of 2023-01), and a recent version of JRuby. We recommend using `rbenv`, which is used in test scripts when necessary to test gems against multiple rubies.
+Please install the latest or previous version of CRuby (e.g., 4.0 or 3.4 as of 2025-12), and a recent version of JRuby. We recommend using `rbenv`, which is used in test scripts when necessary to test gems against multiple rubies.
 
 Please install a system version of libxml2/libxslt (see [Installing Nokogiri](https://nokogiri.org/tutorials/installing_nokogiri.html#installing-using-standard-system-libraries) for details) so that you can test against both the packaged libraries and your system libraries.
 

Gemfile

@@ -6,19 +6,19 @@ gemspec
 
 group :development do
   # bootstrapping
-  gem "bundler", "~> 2.3"
   gem "rake", "13.2.1"
 
   # building extensions
-  gem "rake-compiler", "1.2.8"
-  gem "rake-compiler-dock", "1.7.0"
+  gem "rake-compiler", "1.3.1"
+  gem "rake-compiler-dock", "1.11.1"
 
   # parser generator
   gem "rexical", "1.0.8"
 
   # tests
-  gem "minitest", "5.25.4"
-  gem "minitest-parallel_fork", "2.0.0"
+  gem "minitest", "6.0.1"
+  gem "minitest-mock", "5.27.0"
+  gem "minitest-parallel_fork", "2.1.1"
   gem "ruby_memcheck", "3.0.0"
   gem "rubyzip", "~> 2.3.2"
   gem "simplecov", "= 0.21.2"