Updatejfx25 (#13933)

* fix git modules requires and uses

* update javafx 25

* update richtext

* fix version

* try to fix module?

* try to fix module?

* try to fix module?

* fix module

* fix: ThemeManager test

* more explanation and check if test is on fx thrad

* remove debug

---------

Co-authored-by: Yubo-Cao <cao2006721@gmail.com>

Author: Siedlerchr

build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts

@@ -552,7 +552,7 @@ extraJavaModuleInfo {
         requiresTransitive("jdk.unsupported")
     }
 
-    module("org.openjfx:jdk-jsobject", "jdk.jsobjectEmpty")
+    module("org.openjfx:jdk-jsobject", "jdk.jsobjectEmpty") {}
 
     module("org.controlsfx:controlsfx", "org.controlsfx.controls") {
         patchRealModule()

jabgui/src/main/java/org/jabref/gui/theme/ThemeManager.java

@@ -85,12 +85,24 @@ public ThemeManager(WorkspacePreferences workspacePreferences,
         addStylesheetToWatchlist(this.baseStyleSheet, this::baseCssLiveUpdate);
         baseCssLiveUpdate();
 
-        BindingsHelper.subscribeFuture(workspacePreferences.themeProperty(), _ -> updateThemeSettings());
-        BindingsHelper.subscribeFuture(workspacePreferences.themeSyncOsProperty(), _ -> updateThemeSettings());
-        BindingsHelper.subscribeFuture(workspacePreferences.shouldOverrideDefaultFontSizeProperty(), _ -> updateFontSettings());
-        BindingsHelper.subscribeFuture(workspacePreferences.mainFontSizeProperty(), _ -> updateFontSettings());
-        BindingsHelper.subscribeFuture(Platform.getPreferences().colorSchemeProperty(), _ -> updateThemeSettings());
-        updateThemeSettings();
+        if (Platform.isFxApplicationThread()) {
+            BindingsHelper.subscribeFuture(workspacePreferences.themeProperty(), _ -> updateThemeSettings());
+            BindingsHelper.subscribeFuture(workspacePreferences.themeSyncOsProperty(), _ -> updateThemeSettings());
+            BindingsHelper.subscribeFuture(workspacePreferences.shouldOverrideDefaultFontSizeProperty(), _ -> updateFontSettings());
+            BindingsHelper.subscribeFuture(workspacePreferences.mainFontSizeProperty(), _ -> updateFontSettings());
+            BindingsHelper.subscribeFuture(Platform.getPreferences().colorSchemeProperty(), _ -> updateThemeSettings());
+            updateThemeSettings();
+        } else {
+            // Normally ThemeManager is only instantiated by JabGui and therefore already on the FX Thread, but when it's called from a test (e.g. ThemeManagerTest) then it's not on the fx thread
+            UiTaskExecutor.runInJavaFXThread(() -> {
+                BindingsHelper.subscribeFuture(workspacePreferences.themeProperty(), _ -> updateThemeSettings());
+                BindingsHelper.subscribeFuture(workspacePreferences.themeSyncOsProperty(), _ -> updateThemeSettings());
+                BindingsHelper.subscribeFuture(workspacePreferences.shouldOverrideDefaultFontSizeProperty(), _ -> updateFontSettings());
+                BindingsHelper.subscribeFuture(workspacePreferences.mainFontSizeProperty(), _ -> updateFontSettings());
+                BindingsHelper.subscribeFuture(Platform.getPreferences().colorSchemeProperty(), _ -> updateThemeSettings());
+                updateThemeSettings();
+            });
+        }
     }
 
     /// Installs the base and additional css files as stylesheets in the given scene.

versions/build.gradle.kts

@@ -6,7 +6,7 @@ javaPlatform {
     allowDependencies()
 }
 
-val javafx = "24.0.2"
+val javafx = "25"
 val lucene = "10.2.2"
 val pdfbox = "3.0.5"
 
@@ -29,7 +29,7 @@ dependencies.constraints {
     api("org.openjfx:javafx-swing:$javafx")
     api("org.openjfx:javafx-web:$javafx")
     // from JavaFX25 onwards
-    api("org.openjfx:jdk-jsobject:25-ea+21")
+    api("org.openjfx:jdk-jsobject:$javafx")
 
     api("com.ibm.icu:icu4j:72.0.1!!")
 
@@ -107,7 +107,7 @@ dependencies.constraints {
     api("org.controlsfx:controlsfx:11.2.2")
     api("org.eclipse.jgit:org.eclipse.jgit:7.3.0.202506031305-r")
     api("org.fxmisc.flowless:flowless:0.7.4")
-    api("org.fxmisc.richtext:richtextfx:0.11.5")
+    api("org.fxmisc.richtext:richtextfx:0.11.6")
     api("org.glassfish.grizzly:grizzly-framework:4.0.2")
     api("org.glassfish.grizzly:grizzly-http-server:4.0.2")
     api("org.glassfish.hk2:hk2-api:3.1.1")