diff --git a/.github/workflows/maven-build-installer-macos.yml b/.github/workflows/maven-build-installer-macos.yml index 2df1c699..708b568b 100644 --- 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 index 904025b2..ac6cbb99 100644 --- 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 index fb792c6e..4b908c43 100644 --- 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 index cfdbf4a0..e13e3f39 100644 --- 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 deleted file mode 100644 index 5f0b79e9..00000000 --- a/RCaNconstructor/linux-javafx/README.txt +++ /dev/null @@ -1,12 +0,0 @@ - -These files are the same as those available from, with the WebKit browser libraries removed -due to (default, non-LFS) GitHub: - -https://gluonhq.com/products/javafx/ - -These files are included here to make it easier to just clone off this repository and -immediately run the project. - -The JavaFX web libraries - the embedded WebKit browser components, are NOT included -due to GitHub template size restrictions. You can download those from the link above -and drop them into your own GitHub repo and they should work fine. 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 deleted file mode 100644 index 916e48ed..00000000 Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.base.jmod and /dev/null differ 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 deleted file mode 100644 index 07b471d3..00000000 Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.controls.jmod and /dev/null differ 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 deleted file mode 100644 index 22c91450..00000000 Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod and /dev/null differ 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 deleted file mode 100644 index 956df489..00000000 Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod and /dev/null differ 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 deleted file mode 100644 index 9a480869..00000000 Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.media.jmod and /dev/null differ 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 deleted file mode 100644 index 050984a7..00000000 Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-21.0.4/javafx.swing.jmod and /dev/null differ diff --git a/RCaNconstructor/mac-javafx/README.txt b/RCaNconstructor/mac-javafx/README.txt deleted file mode 100644 index 8a393c86..00000000 --- a/RCaNconstructor/mac-javafx/README.txt +++ /dev/null @@ -1,12 +0,0 @@ - -These files are the same as those available from: - -https://gluonhq.com/products/javafx/ - -...included here to make it easier to just clone off this repository and immediately -run the project. - -Please note that the JavaFX web libraries - the embedded WebKit browser components, -are NOT included due to GitHub template size restrictions. You can download those -from the link above and drop them into your own GitHub repo and they should work -fine. 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 deleted file mode 100644 index 7b47eb3a..00000000 Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.base.jmod and /dev/null differ 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 deleted file mode 100644 index 22d49bed..00000000 Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.controls.jmod and /dev/null differ 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 deleted file mode 100644 index 6e31a48d..00000000 Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod and /dev/null differ 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 deleted file mode 100644 index 93012308..00000000 Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod and /dev/null differ 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 deleted file mode 100644 index 402cf151..00000000 Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.media.jmod and /dev/null differ 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 deleted file mode 100644 index bfa0022e..00000000 Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-21.0.4/javafx.swing.jmod and /dev/null differ diff --git a/RCaNconstructor/macaarch64-javafx/README.txt b/RCaNconstructor/macaarch64-javafx/README.txt deleted file mode 100644 index 8a393c86..00000000 --- a/RCaNconstructor/macaarch64-javafx/README.txt +++ /dev/null @@ -1,12 +0,0 @@ - -These files are the same as those available from: - -https://gluonhq.com/products/javafx/ - -...included here to make it easier to just clone off this repository and immediately -run the project. - -Please note that the JavaFX web libraries - the embedded WebKit browser components, -are NOT included due to GitHub template size restrictions. You can download those -from the link above and drop them into your own GitHub repo and they should work -fine. diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.base.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.base.jmod deleted file mode 100644 index b30c5687..00000000 Binary files a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.base.jmod and /dev/null differ diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.controls.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.controls.jmod deleted file mode 100644 index 828f503e..00000000 Binary files a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.controls.jmod and /dev/null differ diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.fxml.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.fxml.jmod deleted file mode 100644 index b1edfe9d..00000000 Binary files a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.fxml.jmod and /dev/null differ diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.graphics.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.graphics.jmod deleted file mode 100644 index e3d6288b..00000000 Binary files a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.graphics.jmod and /dev/null differ diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.media.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.media.jmod deleted file mode 100644 index d47f506e..00000000 Binary files a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.media.jmod and /dev/null differ diff --git a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.swing.jmod b/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.swing.jmod deleted file mode 100644 index 759b8c85..00000000 Binary files a/RCaNconstructor/macaarch64-javafx/javafx-jmods-16/javafx.swing.jmod and /dev/null differ diff --git a/RCaNconstructor/pom.xml b/RCaNconstructor/pom.xml index 5772ffef..9bd3baa1 100644 --- a/RCaNconstructor/pom.xml +++ b/RCaNconstructor/pom.xml @@ -37,8 +37,7 @@ 21 21 - - 21.0.4 + + + + io.github.mkpaz + atlantafx-base + 1.1.0 + commons-io commons-io 2.4 - - - - - org.openjfx - javafx-controls - ${javafx.version} - ${platform} - - - org.openjfx - javafx-graphics - ${javafx.version} - ${platform} - - - org.openjfx - javafx-fxml - ${javafx.version} - ${platform} - org.apache.poi @@ -196,8 +180,6 @@ jlink ${project.build.directory}/jvm-image/ - ${project.basedir}/${platform}-javafx/javafx-jmods-${javafx.version}/ - ${jvm.modules} ${project.build.directory}/jvm-image diff --git a/RCaNconstructor/win-javafx/README.txt b/RCaNconstructor/win-javafx/README.txt deleted file mode 100644 index 8a393c86..00000000 --- a/RCaNconstructor/win-javafx/README.txt +++ /dev/null @@ -1,12 +0,0 @@ - -These files are the same as those available from: - -https://gluonhq.com/products/javafx/ - -...included here to make it easier to just clone off this repository and immediately -run the project. - -Please note that the JavaFX web libraries - the embedded WebKit browser components, -are NOT included due to GitHub template size restrictions. You can download those -from the link above and drop them into your own GitHub repo and they should work -fine. 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 deleted file mode 100644 index 77f6901e..00000000 Binary files a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.base.jmod and /dev/null differ 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 deleted file mode 100644 index 924e4100..00000000 Binary files a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.controls.jmod and /dev/null differ 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 deleted file mode 100644 index c3c8d8d9..00000000 Binary files a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.fxml.jmod and /dev/null differ 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 deleted file mode 100644 index 9d256ccf..00000000 Binary files a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.graphics.jmod and /dev/null differ 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 deleted file mode 100644 index 701bc907..00000000 Binary files a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.media.jmod and /dev/null differ 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 deleted file mode 100644 index 66d0d91c..00000000 Binary files a/RCaNconstructor/win-javafx/javafx-jmods-21.0.4/javafx.swing.jmod and /dev/null differ