Switch to gradlex for modularity

build-logic/build.gradle.kts

@@ -9,6 +9,11 @@ repositories {
 }
 
 dependencies {
+    implementation("org.gradlex:java-module-testing:1.7")
+    implementation("org.gradlex:java-module-dependencies:1.9")
+    implementation("org.gradlex:extra-java-module-info:1.12")
+    implementation("org.openjfx:javafx-plugin:0.1.0")
+
     configurations
         .matching { it.name.contains("downloadSources") }
         .configureEach {

build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts

@@ -1,11 +1,17 @@
 plugins {
     java
+    `jvm-test-suite`
 
     id("idea")
 
     // id("jacoco")
 
     id("project-report")
+
+    id("org.gradlex.extra-java-module-info")
+    id("org.gradlex.java-module-testing")
+
+    id("org.openjfx.javafxplugin")
 }
 
 repositories {
@@ -26,10 +32,61 @@ dependencies {
     }
 }
 
+extraJavaModuleInfo {
+    failOnMissingModuleInfo = false
+    failOnAutomaticModules = false
+    // skipLocalJars = true
+    deriveAutomaticModuleNamesFromFileNames = true
+    module("org.openjfx:javafx-base", "org.jabref.merged.module") {
+        exports("com.sun.javafx.event")
+        patchRealModule()
+        preserveExisting()
+    }
+    module("org.openjfx:javafx-base", "org.jabref") {
+        opens("javafx.collections", "javafx.collections.transformation")
+        patchRealModule()
+        preserveExisting()
+    }
+    module("org.openjfx:javafx-controls", "org.jabref") {
+        exports("com.sun.javafx.scene.control")
+        opens("javafx.scene.control", "com.sun.javafx.scene.control", "javafx.scene.control.skin")
+        patchRealModule()
+        preserveExisting()
+    }
+    module("org.openjfx:javafx-controls", "org.controlsfx.controls") {
+        exports("com.sun.javafx.scene.control") // already done for org.jabref
+        exports("com.sun.javafx.scene.control.behavior")
+        exports("com.sun.javafx.scene.control.inputmap")
+        opens("javafx.scene")
+        patchRealModule()
+        preserveExisting()
+    }
+    module("org.openjfx:javafx-graphics", "org.controlsfx.controls") {
+        exports("com.sun.javafx.scene")
+        exports("com.sun.javafx.scene.traversal")
+        exports("com.sun.javafx.css")
+        patchRealModule()
+        preserveExisting()
+    }
+    module("org.openjfx:javafx-base", "org.controlsfx.controls") {
+        exports("com.sun.javafx.event")
+        exports("com.sun.javafx.collections")
+        exports("com.sun.javafx.runtime")
+        patchRealModule()
+        preserveExisting()
+    }
+    module("org.controlsfx:controlsfx", "org.jabref") {
+        opens("impl.org.controlsfx.skin", "org.controlsfx.control.textfield")
+        exports("impl.org.controlsfx.skin")
+        patchRealModule()
+        preserveExisting()
+    }
+}
+
 testing {
     suites {
         val test by getting(JvmTestSuite::class) {
-            useJUnitJupiter("5.12.2")
+            useJUnitJupiter()
         }
     }
 }

build.gradle.kts

@@ -9,9 +9,6 @@ plugins {
     id("org.itsallcode.openfasttrace") version "3.0.1"
 
     id("com.adarshr.test-logger") version "4.0.0"
-
-    // This is https://github.com/java9-modularity/gradle-modules-plugin/pull/282
-    id("com.github.koppor.gradle-modules-plugin") version "v1.8.15-cmd-1"
 }
 
 // OpenRewrite should rewrite all sources
@@ -62,8 +59,6 @@ subprojects {
     // Hint from https://stackoverflow.com/a/46533151/873282
     plugins.apply("com.adarshr.test-logger")
 
-    plugins.apply("com.github.koppor.gradle-modules-plugin")
-
     checkstyle {
         toolVersion = "10.23.0"
         configFile = rootProject.file("config/checkstyle/checkstyle.xml")

jabgui/build.gradle.kts

@@ -1,15 +1,11 @@
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.kotlin.dsl.annotationProcessor
-import org.javamodularity.moduleplugin.extensions.CompileModuleOptions
-import org.javamodularity.moduleplugin.extensions.RunModuleOptions
 
 plugins {
     id("buildlogic.java-common-conventions")
 
     application
 
-    id("org.openjfx.javafxplugin") version("0.1.0")
-
     // Do not activate; causes issues with the modularity plugin (no tests found etc)
     // id("com.redock.classpathtofile") version "0.1.0"
 
@@ -178,10 +174,6 @@ application {
     )
 }
 
-// Workaround for https://github.com/openjfx/javafx-gradle-plugin/issues/89
-// See also https://github.com/java9-modularity/gradle-modules-plugin/issues/165
-modularity.disableEffectiveArgumentsAdjustment()
-
 /*
 jacoco {
     toolVersion = "0.8.13"
@@ -195,65 +187,10 @@ tasks.named<JavaExec>("run") {
     doFirst {
         // Clear the default JVM arguments to avoid warnings
         // application.applicationDefaultJvmArgs = emptyList()
-        application.applicationDefaultJvmArgs = listOf("--enable-native-access=ai.djl.tokenizers,ai.djl.pytorch_engine,com.sun.jna,javafx.graphics,javafx.media,javafx.web,org.apache.lucene.core")
-    }
-
-    extensions.configure<RunModuleOptions>("moduleOptions") {
-        // On a change here, also adapt "application > applicationDefaultJvmArgs"
-        addExports.putAll(
-            mapOf(
-                // TODO: Remove access to internal API
-                "javafx.base/com.sun.javafx.event" to "org.jabref.merged.module",
-                "javafx.controls/com.sun.javafx.scene.control" to "org.jabref",
-
-                // ControlsFX compatibility
-                // We need to restate the ControlsFX exports, because we get following error otherwise:
-                //   java.lang.IllegalAccessError:
-                //     class org.controlsfx.control.textfield.AutoCompletionBinding (in module org.controlsfx.controls)
-                //     cannot access class com.sun.javafx.event.EventHandlerManager (in module javafx.base) because
-                //     module javafx.base does not export com.sun.javafx.event to module org.controlsfx.controls
-                // Taken from here: https://github.com/controlsfx/controlsfx/blob/9.0.0/build.gradle#L1
-                "javafx.graphics/com.sun.javafx.scene" to "org.controlsfx.controls",
-                "javafx.graphics/com.sun.javafx.scene.traversal" to "org.controlsfx.controls",
-                "javafx.graphics/com.sun.javafx.css" to "org.controlsfx.controls",
-                "javafx.controls/com.sun.javafx.scene.control" to "org.controlsfx.controls",
-                "javafx.controls/com.sun.javafx.scene.control.behavior" to "org.controlsfx.controls",
-                "javafx.controls/com.sun.javafx.scene.control.inputmap" to "org.controlsfx.controls",
-                "javafx.base/com.sun.javafx.event" to "org.controlsfx.controls",
-                "javafx.base/com.sun.javafx.collections" to "org.controlsfx.controls",
-                "javafx.base/com.sun.javafx.runtime" to "org.controlsfx.controls",
-                "javafx.web/com.sun.webkit" to "org.controlsfx.controls"
+        application.applicationDefaultJvmArgs =
+            listOf(
+                "--enable-native-access=ai.djl.tokenizers,ai.djl.pytorch_engine,com.sun.jna,javafx.graphics,javafx.media,javafx.web,org.apache.lucene.core"
             )
-        )
-
-        addOpens.putAll(
-            mapOf(
-                "javafx.controls/javafx.scene.control" to "org.jabref",
-                "javafx.controls/com.sun.javafx.scene.control" to "org.jabref",
-                "org.controlsfx.controls/impl.org.controlsfx.skin" to "org.jabref",
-                "org.controlsfx.controls/org.controlsfx.control.textfield" to "org.jabref",
-                "javafx.controls/javafx.scene.control.skin" to "org.controlsfx.controls",
-                "javafx.graphics/javafx.scene" to "org.controlsfx.controls",
-                "javafx.base/javafx.collections" to "org.jabref",
-                "javafx.base/javafx.collections.transformation" to "org.jabref"
-            )
-        )
-
-        addModules.add("jdk.incubator.vector")
-
-        createCommandLineArgumentFile = true
-    }
-}
-
-tasks.compileJava {
-    extensions.configure<CompileModuleOptions> {
-        addExports.putAll(
-            mapOf(
-                // TODO: Remove access to internal api
-                "javafx.controls/com.sun.javafx.scene.control" to "org.jabref",
-                "org.controlsfx.controls/impl.org.controlsfx.skin" to "org.jabref"
-            )
-        )
     }
 }
 
@@ -281,7 +218,8 @@ jlink {
         "zip-6",
         "--no-header-files",
         "--no-man-pages",
-        "--bind-services"
+        "--bind-services",
+        "--add-modules", "jdk.incubator.vector"
     )
 
     launcher {
@@ -597,3 +535,9 @@ if (OperatingSystem.current().isWindows) {
         }
     }
 }
+
+javaModuleTesting.whitebox(testing.suites["test"]) {
+    requires.add("org.junit.jupiter.api")
+    // opensTo.add("org.junit.platform.commons") <-- opensTo 'org.junit.platform.commons' is done by default
+    // exportsTo.add("...")
+}

jabkit/build.gradle.kts

@@ -3,9 +3,6 @@ plugins {
 
     application
 
-    // afterburner.fx
-    id("org.openjfx.javafxplugin") version("0.1.0")
-
     id("org.beryx.jlink") version "3.1.1"
 }
 
@@ -95,7 +92,8 @@ jlink {
         "zip-6",
         "--no-header-files",
         "--no-man-pages",
-        "--bind-services"
+        "--bind-services",
+        "--add-modules", "jdk.incubator.vector"
     )
 
     launcher {
@@ -104,7 +102,6 @@ jlink {
 
     // TODO: Remove as soon as dependencies are fixed (upstream)
     forceMerge(
-        "controlsfx",
         "bcprov",
         "jaxb",
         "istack",

jablib/build.gradle.kts

@@ -5,14 +5,13 @@ plugins {
     id("buildlogic.java-common-conventions")
 
     `java-library`
+    `jvm-test-suite`
 
     id("idea")
 
     id("antlr")
     id("com.github.edeandrea.xjc-generation") version "1.6"
 
-    id("org.openjfx.javafxplugin") version("0.1.0")
-
     id("me.champeau.jmh") version "0.7.3"
 }
 
@@ -398,20 +397,6 @@ tasks.withType<JavaCompile>().configureEach {
     options.isFork = true
 }
 
-/*
-tasks.named<JavaCompile>("compileJava") {
-    extensions.configure<org.javamodularity.moduleplugin.extensions.CompileModuleOptions>("moduleOptions") {
-        addExports.putAll(
-            mapOf(
-                // TODO: Remove access to internal api
-                "javafx.controls/com.sun.javafx.scene.control" to "org.jabref",
-                "org.controlsfx.controls/impl.org.controlsfx.skin" to "org.jabref"
-            )
-        )
-    }
-}
-*/
-
 tasks.javadoc {
     (options as StandardJavadocDocletOptions).apply {
         encoding = "UTF-8"
@@ -429,11 +414,6 @@ tasks.test {
     useJUnitPlatform {
         excludeTags("DatabaseTest", "FetcherTest")
     }
-
-    extensions.configure<org.javamodularity.moduleplugin.extensions.TestModuleOptions>("moduleOptions") {
-        // TODO: Remove this as soon as ArchUnit is modularized
-        runOnClasspath = true
-    }
 }
 
 jmh {
@@ -496,3 +476,19 @@ jacocoTestReport {
     }
 }
 */
+
+javaModuleTesting.whitebox(testing.suites["test"]) {
+    requires.add("io.github.classgraph")
+    requires.add("org.junit.jupiter.api")
+    requires.add("org.junit.jupiter.params")
+    requires.add("org.jabref.testsupport")
+    requires.add("org.mockito")
+
+    // --add-opens
+    opensTo.add("javafx.base/com.sun.javafx.beans=net.bytebuddy")
+    opensTo.add("javafx.fxml/javafx.fxml=org.jabref")
+
+    // --add-reads
+    //reads.add("org.jabref.jablib=io.github.classgraph")
+    //reads.add("org.jabref.jablib=org.jabref.testsupport")
+}

jabsrv/build.gradle.kts

@@ -4,8 +4,6 @@ plugins {
     id("buildlogic.java-common-conventions")
 
     application
-
-    id("org.openjfx.javafxplugin") version("0.1.0")
 }
 
 application{

settings.gradle.kts

@@ -1,22 +1,4 @@
 pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            // Hint from https://github.com/jitpack/jitpack.io/issues/1459#issuecomment-1279851731
-            // Updated solution at https://github.com/foodiestudio/convention-plugins?tab=readme-ov-file#convention-plugins
-            if (requested.id.id.startsWith("com.github.koppor")) {
-                // This is https://github.com/java9-modularity/gradle-modules-plugin/pull/282
-                useModule("com.github.koppor:gradle-modules-plugin:1.8.15-cmd-1")
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            url = uri("https://jitpack.io")
-        }
-        gradlePluginPortal()
-    }
-
     includeBuild("build-logic")
 }
 
@@ -27,3 +9,6 @@ plugins {
 rootProject.name = "JabRef"
 
 include("jablib", "jabkit", "jabgui", "jabsrv", "test-support")
+
+// https://github.com/gradlex-org/java-module-dependencies#plugin-dependency
+includeBuild(".")

test-support/build.gradle.kts

@@ -1,7 +1,5 @@
 plugins {
     id("buildlogic.java-common-conventions")
-
-    id("org.openjfx.javafxplugin") version("0.1.0")
 }
 
 dependencies {