Move JavaFX libraries to the bootstrap classpath

Author: dbarashev

biz.ganttproject.app.libs/build.gradle

@@ -5,13 +5,17 @@ buildscript {
             url "https://plugins.gradle.org/m2/"
         }
     }
-    dependencies {
-        classpath 'org.openjfx:javafx-plugin:0.1.0'
-    }
+//    dependencies {
+//        classpath 'org.openjfx:javafx-plugin:0.1.0'
+//    }
 }
 
-apply plugin: 'org.openjfx.javafxplugin'
-
+//apply plugin: 'org.openjfx.javafxplugin'
+//javafx {
+//    version = "21"
+//    modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing' ]
+//}
+//
 ext {
     libDir = 'lib'
 }
@@ -68,10 +72,10 @@ dependencies {
     exported fileTree(dir: project.ext.libDir, include: ['*.jar'])
 }
 
-javafx {
-    version = "17"
-    modules = [ "javafx.controls","javafx.swing","javafx.web" ]
-}
+//javafx {
+//    version = "17"
+//    modules = [ "javafx.controls","javafx.swing","javafx.web" ]
+//}
 
 def pluginDistDir = new File(rootProject.pluginsDir, project.name)
 task copyPlugin(dependsOn: assemble) {
@@ -87,9 +91,6 @@ task copyPlugin(dependsOn: assemble) {
             into(new File(pluginDistDir, "lib"))
             from(configurations.exported) {
                 include "*.jar"
-                if (!project.hasProperty("withJavafx")) {
-                    exclude "javafx*.jar"
-                }
                 exclude "slf4j*.jar"
                 exclude "logback*.jar"
             }

build.gradle

@@ -101,6 +101,7 @@ def installLibs(jar, project) {
         from(jar.outputs.getFiles().getFiles().flatten())
         from(project.configurations.compileClasspath.minus(project.configurations.providedCompile.resolve())) {
             include "*.jar"
+            exclude "javafx*.jar"
         }
         rename { filename -> filename + ".lib" }
     }

ganttproject-builder/BUILD-HISTORY-MAJOR

@@ -10,5 +10,5 @@
 2025-01-29 3316 fixed issue 2569, added group to MSI silent
 2025-07-04 3390 Test build of GanttProject 3.4 Beta I ....
 2026-01-16 3390 Test build of GanttProject 3.4 Beta I ....
-2026-01-17 3390 Test build of GanttProject 3.4 Beta I .
+2026-01-17 3390 Test build of GanttProject 3.4 Beta I ..
 --

ganttproject-builder/build.xml

@@ -56,7 +56,7 @@
              homepage="https://www.ganttproject.biz/"
              section="editors"
              priority="optional"
-             depends="java17-runtime | bellsoft-java17-runtime | zulu17-jre | openjdk-17-jre | openjdk-21-jre | bellsoft-java21-runtime | zulu21-jre"
+             depends="java21-runtime"
              conflicts="ganttproject-praha"
              replaces="ganttproject-praha"
              postrm="${distDebWork}/postrm"
@@ -82,6 +82,7 @@ GanttProject is distributed under GPLv3.
                 <include name="*.jar"/>
                 <include name="*.gan"/>
                 <include name="logging.properties"/>
+                <include name="logback.xml"/>
                 <include name="lib/**"/>
             </tarfileset>
             <tarfileset dir="${distBin}" filemode="755" prefix="usr/share/${package.name}">

ganttproject-builder/ganttproject

@@ -189,7 +189,9 @@ if [ ! -f "$GP_HOME/eclipsito.jar" ]; then
   log "Can't find the required Eclipsito library at $GP_HOME/eclipsito.jar"
   exit 1
 fi
-CLASSPATH="$CLASSPATH:$GP_HOME/eclipsito.jar:$GP_HOME/lib/slf4j-api-2.0.17.jar:$GP_HOME/lib/logback-core-1.5.18.jar:$GP_HOME/lib/logback-classic-1.5.18.jar:$GP_HOME"
+CLASSPATH="$CLASSPATH:$GP_HOME/eclipsito.jar:$GP_HOME";
+for f in "$GP_HOME"/lib/*; do [ -f "$f" ] && CLASSPATH="$CLASSPATH:$f"; done
+
 export CLASSPATH
 BOOT_CLASS=com.bardsoftware.eclipsito.Launch
 

ganttproject/build.gradle

@@ -140,6 +140,18 @@ task copyPlugin(dependsOn: jar) {
                 include "logback.xml"
             }
         }
+        def bootstrapLibDir = new File(rootProject.distBinDir, "lib")
+        copy {
+            into(bootstrapLibDir)
+            from(project.configurations.compileClasspath.minus(project.configurations.providedCompile.resolve())) {
+                if (project.hasProperty("withJavafx")) {
+                    include "javafx*.jar"
+                } else {
+                    exclude "*"
+                }
+            }
+        }
+
         copy {
             into(pluginDistDir)
             from(fileTree(".")) {