WIP: Jruby support

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - id: data
         run: |
-          curl -s https://raw.githubusercontent.com/oxidize-rb/rb-sys/$GITHUB_SHA/data/toolchains.json > toolchains.json
+          curl -s https://raw.githubusercontent.com/uvlad7/rb-sys/$GITHUB_SHA/data/toolchains.json > toolchains.json
           echo "minimum-supported-rust-version=$(jq -r '.policy["minimum-supported-rust-version"]' toolchains.json)" >> $GITHUB_OUTPUT
   build_and_test:
     name: 🧪 Test
@@ -34,7 +34,18 @@ jobs:
       fail-fast: false
       matrix:
         # Test against all versions supported by rubygems
-        ruby_version: ["2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "head"]
+        ruby_version:
+          [
+            "2.4",
+            "2.5",
+            "2.6",
+            "2.7",
+            "3.0",
+            "3.1",
+            "3.2",
+            "head",
+            "jruby-9.4.3.0",
+          ]
         sys:
           - os: ubuntu-latest
             rust_toolchain: ${{ needs.fetch_ci_data.outputs.minimum-supported-rust-version }}
@@ -44,6 +55,16 @@ jobs:
             rust_toolchain: stable
           - os: windows-2022
             rust_toolchain: stable
+        exclude:
+          - ruby_version: "jruby-9.4.3.0"
+            sys:
+              os: ubuntu-latest
+              rust_toolchain: ${{ needs.fetch_ci_data.outputs.minimum-supported-rust-version }}
+          # Should re-include this after build on windows is fixed
+          - ruby_version: "jruby-9.4.3.0"
+            sys:
+              os: windows-2022
+              rust_toolchain: stable
         include:
           - ruby_version: mswin
             sys:
@@ -53,10 +74,26 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Patch examples
+        shell: bash
+        run: |
+          if [[ "${{ startsWith( matrix.ruby_version, 'jruby') }}" == "true" ]]; then
+            rm -r examples/rust_reverse/
+            mv examples/rust_reverse_jruby/ examples/rust_reverse/
+          else
+            rm -r examples/rust_reverse_jruby/
+          fi
+
       - name: Setup debug info
         shell: bash
         run: script/ci/set-debug-env.sh
 
+      - uses: actions/setup-java@v4
+        if: startsWith( matrix.ruby_version, 'jruby')
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
       - uses: oxidize-rb/actions/setup-ruby-and-rust@v1
         if: matrix.ruby_version != 'skip'
         with:
@@ -87,6 +124,7 @@ jobs:
         run: script/ci/upload-on-failure.sh "bundle exec rake test:examples" "examples-test" "./examples"
 
       - name: 🧪 Cargo test
+        if: startsWith( matrix.ruby_version, 'jruby') != true
         shell: bash
         run: bundle exec rake test:cargo
 
@@ -107,6 +145,7 @@ jobs:
           popd
 
       - name: ✂️ Run clippy
+        if: startsWith( matrix.ruby_version, 'jruby') != true
         run: cargo clippy
 
       - name: 📃 Run cargo fmt
@@ -118,7 +157,7 @@ jobs:
         run: bundle exec standardrb --format github
 
       - name: "🧱 Generate bindings"
-        if: env.ACTIONS_STEP_DEBUG == 'true'
+        if: env.ACTIONS_STEP_DEBUG == 'true' && startsWith( matrix.ruby_version, 'jruby') != true
         run: bundle exec rake bindings:generate
 
       - uses: actions/upload-artifact@v3
@@ -144,6 +183,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Patch examples
+        shell: bash
+        run: |
+          rm -r examples/rust_reverse_jruby/
+
       - uses: oxidize-rb/actions/setup-ruby-and-rust@v1
         with:
           ruby-version: none

.github/workflows/integration.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         repo:
-          - name: "oxidize-rb/oxi-test"
+          - name: "uvlad7/oxi-test"
             slug: oxi-test
             ref: main
             run: rake
@@ -32,6 +32,23 @@ jobs:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
         rust: ["stable"]
         ruby: ["2.7", "3.2", "ruby-head"]
+        include:
+          - repo:
+              name: "uvlad7/oxi-test"
+              slug: oxi-test
+              ref: main
+              run: rake
+            os: "ubuntu-latest"
+            rust: "stable"
+            ruby: jruby-9.4.3.0
+          - repo:
+              name: "uvlad7/oxi-test"
+              slug: oxi-test
+              ref: main
+              run: rake
+            os: "macos-latest"
+            rust: "stable"
+            ruby: jruby-9.4.3.0
         # Should re-include these after unstable-api is enabled
         exclude:
           - os: windows-latest
@@ -48,6 +65,15 @@ jobs:
               slug: magnus-0.5
               ref: "0.5.4"
               run: cargo test
+          # Should re-include this after build on windows is fixed
+          - repo:
+              name: "uvlad7/oxi-test"
+              slug: oxi-test
+              ref: main
+              run: rake
+            os: "windows-latest"
+            rust: "stable"
+            ruby: jruby-9.4.3.0
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -65,6 +91,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: rb-sys
+      - uses: actions/setup-java@v4
+        if: startsWith( matrix.ruby, 'jruby')
+        with:
+          distribution: "temurin"
+          java-version: "17"
       - uses: oxidize-rb/actions/setup-ruby-and-rust@v1
         id: setup
         with:

.gitignore

@@ -3,3 +3,6 @@ Gemfile.lock
 tmp/
 gem/docs
 .yardoc/
+.rtx.toml
+*.iml
+.idea/

Cargo.toml

@@ -9,6 +9,7 @@ members = [
 ]
 exclude = [
     "examples/rust_reverse/ext/rust_reverse",
+    "examples/rust_reverse_jruby/ext/rust_reverse",
     "crates/rb-sys-test-helpers-macros-impl",
     "./fuzz",
     "./bench",

examples/rust_reverse_jruby/.gitignore

@@ -0,0 +1,14 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.jar
+*.o
+*.a
+mkmf.log

examples/rust_reverse_jruby/Rakefile

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "rake/testtask"
+require_relative "rake_ext"
+require "rake/javaextensiontask"
+require "rake/extensiontask"
+
+SOURCE_PATTERN = "*.{rs,toml,lock,rb}"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+Rake::JavaExtensionTask.new("rust_reverse") do |ext|
+  ext.lib_dir = "lib/rust_reverse"
+  ext.ext_dir = "ext"
+  ext.source_version = "11"
+  ext.target_version = "11"
+end
+
+Rake::Task[:compile].rename(:java_compile)
+
+Rake::ExtensionTask.new("rust_reverse") do |ext|
+  ext.lib_dir = "lib/rust_reverse"
+  ext.source_pattern = SOURCE_PATTERN
+  ext.cross_compile = true
+  ext.cross_platform = %w[x86-mingw32 x64-mingw-ucrt x64-mingw32 x86-linux x86_64-linux x86_64-darwin arm64-darwin aarch64-linux]
+  ext.config_script = ENV["ALTERNATE_CONFIG_SCRIPT"] || "extconf.rb"
+end
+
+task compile: :java_compile
+
+task :build do
+  require "bundler"
+
+  spec = Bundler.load_gemspec("rust_reverse.gemspec")
+
+  FileUtils.rm_rf("pkg/rust_reverse")
+
+  spec.files.each do |file|
+    FileUtils.mkdir_p("pkg/rust_reverse/#{File.dirname(file)}")
+    FileUtils.cp(file, "pkg/rust_reverse/#{file}")
+  end
+
+  FileUtils.cp("rust_reverse.gemspec", "pkg/rust_reverse")
+
+  full_path = File.expand_path("./../../../crates/rb-sys", __FILE__)
+  cargo_toml_path = "pkg/rust_reverse/ext/rust_reverse/Cargo.toml"
+  new_contents = File.read(cargo_toml_path).gsub("./../../../../crates/rb-sys", full_path)
+  FileUtils.rm(cargo_toml_path)
+  File.write(cargo_toml_path, new_contents)
+
+  Dir.chdir("pkg/rust_reverse") do
+    sh "gem build rust_reverse.gemspec --output=../rust_reverse.gem"
+  end
+end
+
+task default: %i[compile test]

examples/rust_reverse_jruby/ext/rust_reverse/.gitignore

@@ -0,0 +1 @@
+target