Skip to content

Small JRuby build fixes #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 20, 2025
Merged

Small JRuby build fixes #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2aa1cb
Add JRuby build output to CLEAN and CLOBBER
headius Sep 19, 2025
b1cc126
Use --release flag on Java 9+
headius Sep 19, 2025
3d1ed18
Add macos platform for JRuby CI
headius Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
- { os: ubuntu-latest , ruby: 3.4, env: "JSON_DEBUG=1" }
- { os: macos-13, ruby: 3.4 }
- { os: windows-latest , ruby: mswin } # ruby/ruby windows CI
- { os: macos-latest , ruby: jruby-9.4 } # Ruby 3.1
- { os: ubuntu-latest , ruby: jruby-9.4 } # Ruby 3.1
- { os: macos-latest , ruby: truffleruby-head }
- { os: ubuntu-latest , ruby: truffleruby-head }
Expand Down
12 changes: 11 additions & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ JAVA_CLASSES = []
JRUBY_PARSER_JAR = File.expand_path("lib/json/ext/parser.jar")
JRUBY_GENERATOR_JAR = File.expand_path("lib/json/ext/generator.jar")

CLEAN.concat FileList["java/src/**/*.class"]
CLEAN << JRUBY_PARSER_JAR
CLEAN << JRUBY_GENERATOR_JAR

CLOBBER << JAVA_PARSER_SRC

which = lambda { |c|
w = `which #{c}`
break w.chomp unless w.empty?
Expand Down Expand Up @@ -140,7 +146,11 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
classpath = (Dir['java/lib/*.jar'] << 'java/src' << JRUBY_JAR) * path_separator
obj = src.sub(/\.java\Z/, '.class')
file obj => src do
sh 'javac', '-classpath', classpath, '-source', '1.8', '-target', '1.8', src
if File.exist?(File.join(ENV['JAVA_HOME'], "lib", "modules"))
sh 'javac', '-classpath', classpath, '--release', '8', src
else
sh 'javac', '-classpath', classpath, '-source', '1.8', '-target', '1.8', src
end
end
JAVA_CLASSES << obj
end
Expand Down
Loading