test

inrae · Aug 26, 2024 · 4a03e90 · 4a03e90
1 parent 5e99eea
commit 4a03e90
Show file tree

Hide file tree

Showing 33 changed files with 16 additions and 78 deletions.
diff --git a/.github/workflows/maven-build-installer-macos.yml b/.github/workflows/maven-build-installer-macos.yml
@@ -22,7 +22,8 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 21.0.3
-          distribution: 'temurin'
+          distribution: 'liberica'
+          java-package: jdk+fx
           cache: 'maven'
 
       - name: Import signing certificate into keychain

diff --git a/.github/workflows/maven-build-installer-macosaarch64.yml b/.github/workflows/maven-build-installer-macosaarch64.yml
@@ -22,7 +22,8 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 21.0.3
-          distribution: 'temurin'
+          distribution: 'liberica'
+          java-package: jdk+fx
           cache: 'maven'
 
       - name: Import signing certificate into keychain

diff --git a/.github/workflows/maven-build-installer-unix.yml b/.github/workflows/maven-build-installer-unix.yml
@@ -21,7 +21,8 @@ jobs:
       uses: actions/setup-java@v4
       with:
         java-version: 21.0.3
-        distribution: 'temurin'
+        distribution: 'liberica'
+        java-package: jdk+fx
         cache: 'maven'
     - name: Build with Maven
       run: mvn -B clean install --file RCaNconstructor/pom.xml

diff --git a/.github/workflows/maven-build-installer-windows.yml b/.github/workflows/maven-build-installer-windows.yml
@@ -34,7 +34,8 @@ jobs:
       uses: actions/setup-java@v4
       with:
         java-version: 21.0.3
-        distribution: 'temurin'
+        distribution: 'liberica'
+        java-package: jdk+fx
         cache: 'maven'
     - name: Build with Maven
       run: mvn -B clean install --file RCaNconstructor/pom.xml

diff --git a/RCaNconstructor/linux-javafx/README.txt b/RCaNconstructor/linux-javafx/README.txt
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.base.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.base.jmod
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.controls.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.controls.jmod
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.media.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.media.jmod
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.swing.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.swing.jmod
diff --git a/RCaNconstructor/mac-javafx/README.txt b/RCaNconstructor/mac-javafx/README.txt
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.base.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.base.jmod
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.controls.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.controls.jmod
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.media.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.media.jmod
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.swing.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.swing.jmod
diff --git a/RCaNconstructor/macaarch64-javafx/README.txt b/RCaNconstructor/macaarch64-javafx/README.txt
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.base.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.base.jmod
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.controls.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.controls.jmod
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.fxml.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.fxml.jmod
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.graphics.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.graphics.jmod
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.media.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.media.jmod
diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.swing.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.swing.jmod
diff --git a/RCaNconstructor/pom.xml b/RCaNconstructor/pom.xml
@@ -37,8 +37,7 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
 
-        <!-- Used to set both the path to find the JavaFX modules and also the versions for Maven dependencies -->
-        <javafx.version>21.0.4</javafx.version>
+
 
         <!-- Replace this UUID with a custom one for your project. This ID is used by the Windows installer system
         to know that an installer is intended to replace/upgrade an earlier version. The easiest thing to do is
@@ -59,33 +58,18 @@
             <artifactId>javafaker</artifactId>
             <version>1.0.2</version>
         </dependency>
+        <!-- Modern JavaFX Look and Feel -->
+        <!-- https://github.com/mkpaz/atlantafx -->
+        <dependency>
+            <groupId>io.github.mkpaz</groupId>
+            <artifactId>atlantafx-base</artifactId>
+            <version>1.1.0</version>
+        </dependency>        
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.4</version>
         </dependency>
-        <!-- Javafx -->
-        <!-- This downloads the platform specific JavaFX libraries used by the project. -->
-        <!-- For the final installable, the JavaFX dependencies are provided via modules, but by including these here
-         they work nicely with with IDEs and other Maven plugins (e.g. the javafx:run). -->
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-controls</artifactId>
-            <version>${javafx.version}</version>
-            <classifier>${platform}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics</artifactId>
-            <version>${javafx.version}</version>
-            <classifier>${platform}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-fxml</artifactId>
-            <version>${javafx.version}</version>
-            <classifier>${platform}</classifier>
-        </dependency>
         <!-- excel java -->
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -196,8 +180,6 @@
                         <configuration>
                             <toolName>jlink</toolName>
                             <removeDirectories>${project.build.directory}/jvm-image/</removeDirectories>
-                            <modulePath>${project.basedir}/${platform}-javafx/javafx-jmods-${javafx.version}/
-                            </modulePath>
                             <addModules>${jvm.modules}</addModules>
                             <output>${project.build.directory}/jvm-image</output>
                             <args>

diff --git a/RCaNconstructor/win-javafx/README.txt b/RCaNconstructor/win-javafx/README.txt
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.base.jmod b/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.base.jmod
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.controls.jmod b/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.controls.jmod
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod b/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod b/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.media.jmod b/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.media.jmod
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.swing.jmod b/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.swing.jmod