Merge pull request #8688 from rubygems/deivid-rodriguez/jruby-10

deivid-rodriguez · web-flow · commit d409ec8b5fc6 · 2025-05-16T21:37:19.000+02:00
Test with JRuby 10
diff --git a/.github/workflows/bundler.yml b/.github/workflows/bundler.yml
@@ -49,8 +49,8 @@ jobs:
           - { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.8 }, timeout: 150 }
           - { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.3 }, timeout: 150 }
 
-          - { os: { name: Ubuntu, value: ubuntu-24.04 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.12.0 } }
-          - { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.12.0 } }
+          - { os: { name: Ubuntu, value: ubuntu-24.04 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-10.0.0.1 } }
+          - { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-10.0.0.1 } }
 
     env:
       RGV: ..
@@ -68,8 +68,8 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: temurin
-          java-version: 19.0.2
-        if: matrix.os.name == 'Windows' && matrix.ruby.name == 'jruby'
+          java-version: 21.0.7
+        if: matrix.ruby.name == 'jruby'
       - name: Install graphviz (Ubuntu)
         run: sudo apt-get install graphviz -y
         if: matrix.bundler.value == '' && matrix.os.name == 'Ubuntu'
diff --git a/.github/workflows/install-rubygems.yml b/.github/workflows/install-rubygems.yml
@@ -26,7 +26,7 @@ jobs:
           - { name: "3.2", value: 3.2.8 }
           - { name: "3.3", value: 3.3.8 }
           - { name: "3.4", value: 3.4.3 }
-          - { name: jruby, value: jruby-9.4.12.0 }
+          - { name: jruby, value: jruby-10.0.0.1 }
           - { name: truffleruby, value: truffleruby-24.1.2 }
         openssl:
           - { name: "openssl", value: true }
@@ -114,7 +114,7 @@ jobs:
           - { name: "3.2", value: 3.2.8 }
           - { name: "3.3", value: 3.3.8 }
           - { name: "3.4", value: 3.4.3 }
-          - { name: jruby, value: jruby-9.4.12.0, rails-args: "--skip-webpack-install" }
+          - { name: jruby, value: jruby-10.0.0.1, rails-args: "--skip-webpack-install" }
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       # TODO:
@@ -128,7 +128,7 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: temurin
-          java-version: 19.0.2
+          java-version: 21.0.7
         if: startsWith(matrix.ruby.name, 'jruby')
       - name: Install rubygems
         run: ruby setup.rb
@@ -142,7 +142,7 @@ jobs:
       - name: Generate a Rails application
         run: gem install rails --version 8.0.1 && rails new foo ${{ matrix.ruby.rails-args }}
         shell: bash
-        if: matrix.ruby.name != 'jruby' && matrix.ruby.name != '3.1'
+        if: matrix.ruby.name != '3.1'
       - name: Use gem installed in a bin dir different from where Ruby itself is installed
         run: gem install rspec --version 3.13.0 --install-dir foo && GEM_HOME=foo foo/bin/rspec --version
         shell: bash
diff --git a/.github/workflows/rubygems.yml b/.github/workflows/rubygems.yml
@@ -33,7 +33,7 @@ jobs:
           - { name: "3.4", value: 3.4.3 }
 
         include:
-          - ruby: { name: jruby, value: jruby-9.4.12.0 }
+          - ruby: { name: jruby, value: jruby-10.0.0.1 }
             os: { name: Ubuntu, value: ubuntu-24.04 }
 
           - ruby: { name: truffleruby, value: truffleruby-24.2.0 }
diff --git a/.github/workflows/ubuntu-lint.yml b/.github/workflows/ubuntu-lint.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         ruby:
           - { name: ruby, value: 3.4.3 }
-          - { name: jruby, value: jruby-9.4.12.0 }
+          - { name: jruby, value: jruby-10.0.0.1 }
           - { name: truffleruby, value: truffleruby-24.2.0 }
     env:
       RUBYOPT: -Ilib
diff --git a/bundler/spec/bundler/friendly_errors_spec.rb b/bundler/spec/bundler/friendly_errors_spec.rb
@@ -130,17 +130,13 @@
       # Does nothing
     end
 
-    context "Java::JavaLang::OutOfMemoryError" do
-      module Java
-        module JavaLang
-          class OutOfMemoryError < StandardError; end
-        end
-      end
-
+    context "Java::JavaLang::OutOfMemoryError", :jruby_only do
       it "Bundler.ui receive error" do
-        error = Java::JavaLang::OutOfMemoryError.new
-        expect(Bundler.ui).to receive(:error).with(/JVM has run out of memory/)
-        Bundler::FriendlyErrors.log_error(error)
+        install_gemfile <<-G, raise_on_error: false, env: { "JRUBY_OPTS" => "-J-Xmx32M" }, artifice: nil
+          source "https://gem.repo1"
+        G
+
+        expect(err).to include("JVM has run out of memory")
       end
     end
 
diff --git a/bundler/spec/commands/ssl_spec.rb b/bundler/spec/commands/ssl_spec.rb
@@ -8,7 +8,7 @@
 
 RSpec.describe "bundle doctor ssl" do
   before(:each) do
-    require_rack
+    require_rack_test
     require_relative "../support/artifice/helpers/endpoint"
 
     @dummy_endpoint = Class.new(Endpoint) do
diff --git a/bundler/spec/install/gems/dependency_api_fallback_spec.rb b/bundler/spec/install/gems/dependency_api_fallback_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe "gemcutter's dependency API" do
   context "when Gemcutter API takes too long to respond" do
     before do
-      require_rack
+      require_rack_test
 
       port = find_unused_port
       @server_uri = "http://127.0.0.1:#{port}"
diff --git a/bundler/spec/install/gems/gemfile_source_header_spec.rb b/bundler/spec/install/gems/gemfile_source_header_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "fetching dependencies with a mirrored source", realworld: true do
+RSpec.describe "fetching dependencies with a mirrored source" do
   let(:mirror) { "https://server.example.org" }
   let(:original) { "http://127.0.0.1:#{@port}" }
 
@@ -31,12 +31,12 @@
   private
 
   def setup_server
-    require_rack
+    require_rack_test
     @port = find_unused_port
     @server_uri = "http://127.0.0.1:#{@port}"
 
-    require_relative "../support/artifice/endpoint_mirror_source"
-    require_relative "../support/silent_logger"
+    require_relative "../../support/artifice/endpoint_mirror_source"
+    require_relative "../../support/silent_logger"
 
     require "rackup/server"
 
diff --git a/bundler/spec/install/gems/mirror_probe_spec.rb b/bundler/spec/install/gems/mirror_probe_spec.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-RSpec.describe "fetching dependencies with a not available mirror", realworld: true do
+RSpec.describe "fetching dependencies with a not available mirror" do
   let(:mirror) { @mirror_uri }
   let(:original) { @server_uri }
   let(:server_port) { @server_port }
   let(:host) { "127.0.0.1" }
 
   before do
-    require_rack
+    require_rack_test
     setup_server
     setup_mirror
   end
@@ -108,8 +108,8 @@ def setup_server
     @server_port = find_unused_port
     @server_uri = "http://#{host}:#{@server_port}"
 
-    require_relative "../support/artifice/endpoint"
-    require_relative "../support/silent_logger"
+    require_relative "../../support/artifice/endpoint"
+    require_relative "../../support/silent_logger"
 
     require "rackup/server"
 
diff --git a/bundler/spec/realworld/fixtures/warbler/Gemfile b/bundler/spec/realworld/fixtures/warbler/Gemfile
@@ -3,5 +3,5 @@
 source "https://rubygems.org"
 
 gem "demo", path: "./demo"
-gem "jruby-jars", "~> 9.4"
-gem "warbler", "~> 2.0"
+gem "jruby-jars", "~> 10.0"
+gem "warbler", github: "https://github.com/jruby/warbler/pull/557"
diff --git a/bundler/spec/realworld/fixtures/warbler/Gemfile.lock b/bundler/spec/realworld/fixtures/warbler/Gemfile.lock
@@ -1,3 +1,15 @@
+GIT
+  remote: https://github.com/jruby/warbler.git
+  revision: 3a3a89e9a055ab1badb4e6fee860e8617b4acfe1
+  ref: refs/pull/557/head
+  specs:
+    warbler (2.0.5)
+      jruby-jars (>= 9.0.0)
+      jruby-rack (>= 1.1.1, < 1.3)
+      rake (>= 13.0.3)
+      rexml (~> 3.0)
+      rubyzip (>= 1.0.0)
+
 PATH
   remote: demo
   specs:
@@ -6,25 +18,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    jruby-jars (9.4.10.0)
-    jruby-rack (1.1.21)
-    rake (13.0.1)
-    rubyzip (1.3.0)
-    warbler (2.0.5)
-      jruby-jars (>= 9.0.0.0)
-      jruby-rack (>= 1.1.1, < 1.3)
-      rake (>= 10.1.0)
-      rubyzip (~> 1.0, < 1.4)
+    jruby-jars (10.0.0.1)
+    jruby-rack (1.2.2)
+    rake (13.2.1)
+    rexml (3.4.1)
+    rubyzip (2.4.1)
 
 PLATFORMS
+  arm64-darwin
   java
   ruby
-  universal-java-11
+  universal-java
 
 DEPENDENCIES
   demo!
-  jruby-jars (~> 9.4)
-  warbler (~> 2.0)
+  jruby-jars (~> 10.0)
+  warbler!
 
 BUNDLED WITH
    2.7.0.dev
diff --git a/bundler/spec/support/builders.rb b/bundler/spec/support/builders.rb
@@ -277,7 +277,7 @@ def build_repo(path, **kwargs, &blk)
     end
 
     def update_repo(path, build_compact_index: true)
-      exempted_caller = Gem.ruby_version >= Gem::Version.new("3.4.0.dev") ? "#{Module.nesting.first}#build_repo" : "build_repo"
+      exempted_caller = Gem.ruby_version >= Gem::Version.new("3.4.0.dev") && RUBY_ENGINE != "jruby" ? "#{Module.nesting.first}#build_repo" : "build_repo"
       if path == gem_repo1 && caller_locations(1, 1).first.label != exempted_caller
         raise "Updating gem_repo1 is unsupported -- use gem_repo2 instead"
       end
diff --git a/bundler/spec/support/helpers.rb b/bundler/spec/support/helpers.rb
@@ -515,11 +515,11 @@ def with_env_vars(env_hash, &block)
       end
     end
 
-    def require_rack
-      # need to hack, so we can require rack
+    def require_rack_test
+      # need to hack, so we can require rack for testing
       old_gem_home = ENV["GEM_HOME"]
       ENV["GEM_HOME"] = Spec::Path.base_system_gem_path.to_s
-      require "rack"
+      require "rack/test"
       ENV["GEM_HOME"] = old_gem_home
     end
 
