Merge remote-tracking branch 'upstream/main'

Author: kappa-maintainer

build.gradle

@@ -312,6 +312,7 @@ project.sourceSets.each { set -> {
 
 compileModularityJava {
     inputs.files(modularityInputs)
+    options.javaModuleVersion = project.version as String
     doFirst {
         options.compilerArgs = [
             '--module-path', classpath.asPath,