Optimize build and CI pipeline, remove redundant or dead code

.github/workflows/codeql-analysis.yml

@@ -39,11 +39,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/gradle-release-manual.yml

@@ -150,16 +150,8 @@ jobs:
         with:
           java-version: '25'
           distribution: 'temurin'
-          cache: gradle
-          cache-dependency-path: |
-            build.gradle
-            code/gradle/autobuild.gradle
-            code/gradle/distribution.gradle
-            code/gradle/release.gradle
-            code/gradle/reporting.gradle
-            code/gradle/plugins.gradle
-
-      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+
+      # setup-gradle@v4 is the canonical Gradle cache for GitHub Actions.
       # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -168,36 +160,31 @@ jobs:
           cache-read-only: false
           cache-overwrite-existing: true
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ${{ github.workspace }}/build/jre
-            ${{ github.workspace }}/build/libs
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ matrix.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-            ${{ matrix.os }}-gradle
-
-      - name: Build the image
-        if: success()
-        run: ./gradlew clean build copyToOutput test compileSlowtest datatest pfinttest allReports buildDist prepareRelease pcgenRelease
-
-      - name: Upload zip based release assets for all platforms
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-zip
-          path: ${{ github.workspace }}/build/release/image-*.zip
+      - name: Compile and run unit tests
+        run: ./gradlew clean build
+
+      - name: Run data and integration tests
+        run: ./gradlew compileSlowtest datatest pfinttest
+
+      - name: Run static analysis reports
+        run: ./gradlew allReports
 
-      - name: Upload DMG release asset for macos
+      - name: Build distribution zips
+        run: ./gradlew buildDist
+
+      - name: Build release artifacts
+        run: ./gradlew pcgenRelease
+
+      - name: Upload release artifacts as workflow artifacts
         uses: actions/upload-artifact@v4
-        if: matrix.os == 'macos-latest'
         with:
-          name: ${{ matrix.os }}-dmg
-          path: ${{ github.workspace }}/build/release/*.dmg
+          name: ${{ matrix.release_suffix }}-release
+          path: ${{ github.workspace }}/build/release/*
+          if-no-files-found: error
 
-      - name: Upload PKG release asset for macos
-        uses: actions/upload-artifact@v4
-        if: matrix.os == 'macos-latest'
+      - name: Attach release artifacts to GitHub Release
+        uses: softprops/action-gh-release@v2
         with:
-          name: ${{ matrix.os }}-pkg
-          path: ${{ github.workspace }}/build/release/*.pkg
+          tag_name: ${{ inputs.tag_name }}
+          files: ${{ github.workspace }}/build/release/*
+          fail_on_unmatched_files: true

.github/workflows/gradle-release.yml

@@ -1,4 +1,4 @@
-name: Create Release with Manual Tag
+name: Create Release on Tag Push
 
 on:
   push:
@@ -120,16 +120,8 @@ jobs:
         with:
           java-version: '25'
           distribution: 'temurin'
-          cache: gradle
-          cache-dependency-path: |
-            build.gradle
-            code/gradle/autobuild.gradle
-            code/gradle/distribution.gradle
-            code/gradle/release.gradle
-            code/gradle/reporting.gradle
-            code/gradle/plugins.gradle
-
-      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+
+      # setup-gradle@v4 is the canonical Gradle cache for GitHub Actions.
       # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -138,57 +130,31 @@ jobs:
           cache-read-only: false
           cache-overwrite-existing: true
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ${{ github.workspace }}/build/jre
-            ${{ github.workspace }}/build/libs
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ matrix.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-            ${{ matrix.os }}-gradle
-
-      - name: Build the image
-        if: success()
-        run: ./gradlew clean build copyToOutput test compileSlowtest datatest pfinttest allReports buildDist prepareRelease pcgenRelease
-
-      - name: Upload zip based release assets for all platforms
-        uses: actions/upload-artifact@v4
-        if: matrix.os == 'macos-latest'
-        with:
-          name: ${{ matrix.os }}-zip
-          path: ${{ github.workspace }}/build/release/image-*.zip
+      - name: Compile and run unit tests
+        run: ./gradlew clean build
+
+      - name: Run data and integration tests
+        run: ./gradlew compileSlowtest datatest pfinttest
+
+      - name: Run static analysis reports
+        run: ./gradlew allReports
 
-      - name: Upload DMG release asset for macos
+      - name: Build distribution zips
+        run: ./gradlew buildDist
+
+      - name: Build release artifacts
+        run: ./gradlew pcgenRelease
+
+      - name: Upload release artifacts as workflow artifacts
         uses: actions/upload-artifact@v4
-        if: matrix.os == 'macos-latest'
         with:
-          name: ${{ matrix.os }}-dmg
-          path: ${{ github.workspace }}/build/release/*.dmg
+          name: ${{ matrix.release_suffix }}-release
+          path: ${{ github.workspace }}/build/release/*
+          if-no-files-found: error
 
-      - name: Upload PKG release asset for macos
-        uses: actions/upload-artifact@v4
-        if: matrix.os == 'macos-latest'
+      - name: Attach release artifacts to GitHub Release
+        uses: softprops/action-gh-release@v2
         with:
-          name: ${{ matrix.os }}-pkg
-          path: ${{ github.workspace }}/build/release/*.pkg
-
-#      - name: Upload release assets for ubuntu
-#        uses: actions/upload-artifact@v4
-#        if: matrix.os == 'ubuntu-latest'
-#        with:
-#          name: ${{ matrix.os }}
-#          path: ${{ github.workspace }}/build/jpackage/*.deb
-#
-#      - name: Upload release assets for windows
-#        uses: actions/upload-artifact@v4
-#        if: matrix.os == 'windows-latest'
-#        with:
-#          name: ${{ matrix.os }}
-#          path: ${{ github.workspace }}/build/jpackage/*.msi
-#
-#      - name: Release - ${{ matrix.os }}
-#        uses: softprops/action-gh-release@v2
-#        with:
-#          tag_name: ${{ needs.create_release.outputs.tag-name }}
-#          files: ${{ github.workspace }}/build/release/pcgen-*.*
+          tag_name: ${{ inputs.tag_name || github.ref_name }}
+          files: ${{ github.workspace }}/build/release/*
+          fail_on_unmatched_files: true

.github/workflows/gradle-test.yml

@@ -22,39 +22,17 @@ jobs:
         with:
           java-version: '25'
           distribution: 'temurin'
-          cache: gradle
-          cache-dependency-path: |
-            build.gradle
-            code/gradle/autobuild.gradle
-            code/gradle/distribution.gradle
-            code/gradle/release.gradle
-            code/gradle/reporting.gradle
-            code/gradle/plugins.gradle
 
-      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+      # setup-gradle@v4 is the canonical Gradle cache for GitHub Actions.
       # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
-        with:
-          cache-disabled: false
-          cache-read-only: false
-          cache-overwrite-existing: true
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ${{ github.workspace }}/build/jre
-            ${{ github.workspace }}/build/libs
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-            ${{ runner.os }}-gradle
 
       - name: Build with Gradle Wrapper
         run: ./gradlew build
 
-      - name: Run tests
-        run: ./gradlew test itest datatest slowtest
+      - name: Run integration, data, and slow tests
+        run: ./gradlew itest datatest slowtest
 
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2

.gitignore

@@ -115,6 +115,7 @@ pcgen.iws
 
 # Misc
 jre/
+jdks/
 mods/
 code/manifest-tests
 .DS_Store

AGENTS.md

@@ -8,7 +8,7 @@ This document captures the concrete commands, structure, conventions, and gotcha
 - Build tool: Gradle (via wrapper)
 - Java toolchain: Java 25 (Temurin)
 - UI: JavaFX; headless testing uses TestFX/Monocle
-- Packaging: jlink/jpackage with custom runtimes and native installers
+- Packaging: jlink (org.beryx.jlink 4.0.0) / jpackage with custom runtimes and native installers
 
 Key entry point: `pcgen.system.Main` (code/src/java/pcgen/system/Main.java)
 
@@ -39,7 +39,7 @@ Always use the wrapper (./gradlew). Java 25 is required; Gradle will fetch depen
   - ./gradlew tasks
 - Build (default)
   - ./gradlew build
-- Run unit tests (JUnit 5; headless JavaFX)
+- Run unit tests (JUnit 6; headless JavaFX)
   - ./gradlew test
 - Integration tests (defined source set)
   - ./gradlew itest
@@ -60,12 +60,13 @@ Always use the wrapper (./gradlew). Java 25 is required; Gradle will fetch depen
 - Run the app (ensures JavaFX modules for host platform)
   - ./gradlew run
 - Create native app image/installer via jpackage
-  - ./gradlew jpackage
+  - ./gradlew fullJpackage
 - Clean outputs and auxiliary folders (extended)
-  - ./gradlew clean (also triggers cleanPlugins, cleanOutput, cleanJre, cleanMods, cleanMasterSheets)
+  - ./gradlew clean (also triggers cleanPlugins, cleanOutput, cleanJdks, cleanMods, cleanMasterSheets)
 
 Notes
-- Some tasks trigger downloads of JDKs/JavaFX for all platforms (downloadJRE, downloadJavaFXModules) or host SDK (downloadJavaFXLocal/extractJavaFXLocal). CI caches build/jre and build/libs.
+- Some tasks trigger downloads of JDKs/JavaFX for all platforms (downloadJDKs, extractJDKs, downloadJavaFXMods) or host SDK (downloadJavaFXLocal/extractJavaFXLocal). CI caches build/jre and build/libs.
+- The `jre` task prepares all platform JDKs with JavaFX modules for runtime image creation.
 - Runtime bundles expect assets in data/, system/, outputsheets/, preview/, vendordata/, homebrewdata/.
 
 ## Running From Source
@@ -90,7 +91,7 @@ Batch export path exists in Main.startupWithoutGUI(). Tests demonstrate usage in
 
 ## Testing Approach
 
-- JUnit 5 with Jupiter, xmlunit for XML comparisons, TestFX for JavaFX UI components.
+- JUnit 6 with Jupiter, xmlunit for XML comparisons, TestFX for JavaFX UI components.
 - Source sets:
   - test: code/src/utest + testcommon
   - itest: code/src/itest + testcommon
@@ -103,9 +104,9 @@ Batch export path exists in Main.startupWithoutGUI(). Tests demonstrate usage in
 
 ## Code Quality and Style
 
-- Checkstyle config: code/standards/checkstyle.xml (enforced via reporting.gradle; toolVersion 12.1.2). Newline at EOF; 201 char line length; prohibits `System.exit` (use pcgen.util.GracefulExit.exit).
-- PMD: ruleset at code/standards/ruleset.xml (referenced from reporting.gradle).
-- SpotBugs: plugin 6.4.7; toolVersion 4.9.8; exclude filter code/standards/spotbugs_ignore.xml; ignoreFailures true; extra findsecbugs plugin.
+- Checkstyle config: code/standards/checkstyle.xml (enforced via reporting.gradle; toolVersion 13.2.0). Newline at EOF; 201 char line length; prohibits `System.exit` (use pcgen.util.GracefulExit.exit).
+- PMD: ruleset at code/standards/ruleset.xml (referenced from reporting.gradle); toolVersion 7.21.0; dependencies pmd-java 7.24.0 and pmd-ant 7.24.0.
+- SpotBugs: plugin 6.5.4; toolVersion 4.9.8; exclude filter code/standards/spotbugs_ignore.xml; ignoreFailures true; extra findsecbugs plugin.
 - Aggregate quality task: ./gradlew allReports
 
 Conventions/gotchas observed
@@ -177,10 +178,11 @@ Conventions/gotchas observed
 - Java version and JavaFX module handling are intertwined across build.gradle and distribution tasks — changing one often requires adjusting tasks (run, test, JavaCompile, runtime/jpackage) and CI.
 - The distribution relies on file layout in data/, outputsheets/, system/, preview/ — deletions or renames will break runtime validation in Main.validateEnvironment().
 - GracefulExit should be used for controlled termination (tests hook the exit function).
+- Module compilation: PCGen-base and PCGen-Formula jars are placed on `--module-path` while all other dependencies are merged into the pcgen module via `--patch-module`. This means **no source file in the pcgen module may share a package with classes in PCGen-base or PCGen-Formula jars** (Java forbids split packages across modules). Currently conflicting packages (`pcgen.base.util`, `pcgen.base.format`) have been relocated to `pcgen.util` and `pcgen.format` respectively. If adding new classes whose package exists in either jar, place them in a non-overlapping package.
 
 ## Maintainer/Issue Tracking Context
 
 - Primary docs: README.md (development setup, essential Gradle tasks)
 - Issue tracker: Jira at https://pcgenorg.atlassian.net (CODE/DATA/etc.) as referenced in README and docs/faqpages/faqsubmittingabugreport.md
 
-This file documents only observed behavior and commands present in this repository as of the current state.
+This file documents only observed behavior and commands present in this repository as of the current state.

README.md

@@ -193,9 +193,12 @@ substitute `./gradlew` for `gradle` on the command line.
 
 ### Run Full Test Suite
 Do this primarily __before__ pull requests.
-This is almost exactly the command Travis runs to verify, if it fails locally you will fail the build, and your PR will not be merged.
+This mirrors what GitHub Actions runs to verify a PR; if it fails locally your CI build will also fail and your PR will not be merged.
 
-    ./gradlew clean build copyToOutput test compileSlowtest datatest pfinttest allReports buildDist
+    ./gradlew build
+    ./gradlew itest datatest slowtest
+
+`build` already runs the unit `test` task via the standard Java lifecycle, so it is not repeated. The second command runs the integration, data, and slow test suites.
 
 ### Clean All Build Files
     ./gradlew clean