Merge pull request #866 from headius/jruby_rakefile_fixes

Small JRuby build fixes

Author: byroot

.github/workflows/ci.yml

@@ -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 }

Rakefile

@@ -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?
@@ -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