TEST to look at Gh build vs tip

.github/workflows/gradle.yml

@@ -1,19 +1,70 @@
-name: Java CI
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
 
-on: [push]
+name: Build PCGen with Gradle
+
+on:
+  push:
+    branches: [ "gh_build" ] # use the current branch for testing purposes only
+  pull_request:
+    branches: [ "master" ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
+    permissions:
+      checks: write
+      pull-requests: write
 
     steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Build with Gradle
-      run: ./gradlew build
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          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
+
+      # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+      # 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: |
+            build/classes
+            build/jre
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Build with Gradle Wrapper
+        run: ./gradlew build test slowtest
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          files: |
+            build/test-results/**/*.xml
+            build/test-results/**/*.trx
+            build/test-results/**/*.json
+
+#      - name: Upload build artifacts
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: Package
+#          path: build/libs

.gitignore

@@ -94,6 +94,7 @@ code/build.eclipse/
 
 # IntelliJ IDE
 .idea/
+.run/
 out/
 pcgendev.iml
 pcgen.iml

PCGen-Formula/code/standards/suppressions.xml → PCGen-Formula/code/standards/checkstyle-suppressions.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
-
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
     <suppress checks=".*" files=".*pcgen.base.formula.parse.*"/>
 </suppressions>
-

PCGen-Formula/code/standards/checkstyle.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
+<!DOCTYPE module PUBLIC
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <!--
     This configuration file was written by the eclipse-cs plugin configuration editor
 -->
@@ -83,12 +84,8 @@
   </module>
   <module name="NewlineAtEndOfFile"/>
   <module name="Translation"/>
-
-
     <module name="SuppressWarningsFilter"/>
-
 	<module name="SuppressionFilter">
-		<property name="file" value="${suppressionFile}" default="suppressions.xml"/>
+		<property name="file" value="${suppressionFile}" default="checkstyle-suppressions.xml"/>
 	</module>
-
 </module>

PCGen-Formula/code/standards/spotbugs_ignore.xml

@@ -9,8 +9,8 @@
         <Bug pattern="SE_NO_SERIALVERSIONID,SE_COMPARATOR_SHOULD_BE_SERIALIZABLE,SE_BAD_FIELD" />
    </Match>
    <Match>
-        <!-- not relevent to pcgen -->
-        <Bug pattern="IJU_SETUP_NO_SUPER,DP_DO_INSIDE_DO_PRIVILEGED,DM_EXIT" />
+        <!-- not relevant to pcgen -->
+        <Bug pattern="IJU_SETUP_NO_SUPER,DP_DO_INSIDE_DO_PRIVILEGED" />
     </Match>
     <Match>
         <!-- we have other tools for code style -->

PCGen-Formula/gradle/reporting.gradle

@@ -8,7 +8,7 @@
 
 checkstyle {
 	configFile = new File('code/standards/checkstyle.xml')
-	configProperties = [ "suppressionFile" : project(':').file('code/standards/suppressions.xml')]
+	configProperties = [ "suppressionFile" : project(':').file('code/standards/checkstyle-suppressions.xml')]
 	ignoreFailures = true
 	showViolations = false
 	sourceSets = []

PCGen-base/code/standards/checkstyle.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
+<!DOCTYPE module PUBLIC
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <!--
     This configuration file was written by the eclipse-cs plugin configuration editor
 -->

PCGen-base/code/standards/spotbugs_ignore.xml

@@ -9,8 +9,8 @@
         <Bug pattern="SE_NO_SERIALVERSIONID,SE_COMPARATOR_SHOULD_BE_SERIALIZABLE" />
    </Match>
    <Match>
-        <!-- not relevent to pcgen -->
-        <Bug pattern="IJU_SETUP_NO_SUPER,DP_DO_INSIDE_DO_PRIVILEGED,DM_EXIT" />
+        <!-- not relevant to pcgen -->
+        <Bug pattern="IJU_SETUP_NO_SUPER,DP_DO_INSIDE_DO_PRIVILEGED" />
     </Match>
     <Match>
         <!-- we have other tools for code style -->

build.gradle

@@ -107,8 +107,8 @@ repositories {
     //}
     ivy {
         // TODO Enable HTTPS (e.g., add letsencrypt) for that location
-        name "fileRepo"
-        url 'http://pc-gen.org/librepo/'
+        name = 'fileRepo'
+        url = 'http://pc-gen.org/librepo/'
         allowInsecureProtocol = true
     }
     // Use Maven plugin to reference freehep (https://java.freehep.org/) artifact repository
@@ -125,7 +125,7 @@ repositories {
     // TODO Which libs do we pull from here?
     maven {
         name = 'jboss'
-        url "https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/"
+        url = 'https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/'
     }
 }
 
@@ -414,7 +414,9 @@ tasks.named("jpackageImage") {
             copy {
                 from layout.projectDirectory.dir("installers/mac-installer")
                 include "MacDirLauncher"
-                fileMode 0755
+                filePermissions {
+                    unix(0755)
+                }
                 into layout.buildDirectory.dir("jpackage/PcGen.app/Contents/MacOS")
             }
             ant.replace(file: layout.buildDirectory.file("jpackage/PcGen.app/Contents/Info.plist").get(),
@@ -570,7 +572,7 @@ tasks.register("downloadJRE") {
                     return
                 } else if (jreDir.exists()) {
                     println "Delete the previously downloaded JDK at ${jreDir} as outdated. JavaFX modules will be deleted from jdkDir/jmods."
-                    project.delete(jreDir)
+                    delete(jreDir)
                 }
 
                 println("Downloading Java ${major} ${arch} for ${os} from ${url}")
@@ -602,7 +604,7 @@ tasks.register("downloadJRE") {
                                 }
                             }
 
-                            project.delete(archFile)
+                            delete(archFile)
                         }
 
                 file("${projectDir}/jre/${os}/jre_${arch}").list().each { f ->
@@ -748,6 +750,10 @@ tasks.named("jre") {
     dependsOn downloadJRE, downloadJavaFXModules
 }
 
+tasks.withType(Test) {
+    testLogging.showStandardStreams = false
+}
+
 tasks.named("test", Test) {
     exclude 'pcgen/testsupport/**'
     useJUnitPlatform()
@@ -848,6 +854,7 @@ allprojects {
                 '-Dprism.order=sw',
                 '-Dprism.verbose=true',
                 '-Djavafx.macosx.embedded=true',
+                '-Djava.security.manager=disallow',
 
                 "--module-path", layout.projectDirectory.dir("mods/lib"),
                 "--add-modules", "javafx.controls,javafx.web,javafx.swing,javafx.fxml,javafx.graphics",
@@ -951,7 +958,7 @@ apply from: 'code/gradle/reporting.gradle'
 apply from: 'code/gradle/release.gradle'
 
 tasks.register("allTasks") {
-    dependsOn build, slowtest, javadoc, buildNsis, allReports
+    dependsOn build, slowtest, javadoc, allReports
     description = "Runs tasks build, slowtest, javadoc, buildNsis and allReports"
 }
 
@@ -964,17 +971,17 @@ tasks.named("clean") {
 
     doLast {
         // Delete a file generated by pluginbuild.xml
-        project.delete(layout.projectDirectory.file("code/manifest"))
+        delete(layout.projectDirectory.file("code/manifest"))
 
         // Delete plugin folders
-        project.delete(
-                layout.projectDirectory.dir("plugins/bonusplugins"),
-                layout.projectDirectory.dir("plugins/converterplugins"),
-                layout.projectDirectory.dir("plugins/jepplugins"),
-                layout.projectDirectory.dir("plugins/lstplugins"),
-                layout.projectDirectory.dir("plugins/outputplugins"),
-                layout.projectDirectory.dir("plugins/preplugins"),
-                layout.projectDirectory.dir("plugins/systemlstplugins")
+        delete(
+            layout.projectDirectory.dir("plugins/bonusplugins"),
+            layout.projectDirectory.dir("plugins/converterplugins"),
+            layout.projectDirectory.dir("plugins/jepplugins"),
+            layout.projectDirectory.dir("plugins/lstplugins"),
+            layout.projectDirectory.dir("plugins/outputplugins"),
+            layout.projectDirectory.dir("plugins/preplugins"),
+            layout.projectDirectory.dir("plugins/systemlstplugins")
         )
     }
 }

code/gradle/release.gradle

@@ -413,14 +413,14 @@ tasks.register("cleanNsis", Delete) {
 
 tasks.register("sourcesJar", Jar) {
     dependsOn classes, copyToOutput, createExe, distTar, distZip, layoutNsisBase, startScripts
-    duplicatesStrategy DuplicatesStrategy.INCLUDE
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     description = "build source jar file"
     archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 
 tasks.register("assembleArtifacts", Copy) {
-    dependsOn build, runtimeZip, sourcesJar, buildNsis
+    dependsOn build, runtimeZip, sourcesJar
 
     if (Os.isFamily(Os.FAMILY_MAC) || Os.isFamily(Os.FAMILY_UNIX))
     {
@@ -431,9 +431,6 @@ tasks.register("assembleArtifacts", Copy) {
     into releaseDir
     // buildNsis puts the exe into the release folder directly
 
-    from(layout.buildDirectory.dir("nsisRelease")){
-        include '*.exe'
-    }
     from(layout.buildDirectory.dir("libs")){
         include 'pcgen*-sources.jar'
     }

code/gradle/reporting.gradle

@@ -9,7 +9,7 @@ checkstyle {
     configFile = new File('code/standards/checkstyle.xml')
     configProperties = [samedir: "${rootDir}/code/standards"]
     showViolations = true
-    toolVersion = '10.20.1'
+    toolVersion = '10.21.1'
     sourceSets = []
 }
 
@@ -19,7 +19,7 @@ pmd {
     ruleSetFiles = files('code/standards/ruleset.xml')
     consoleOutput = true
     sourceSets = []
-    toolVersion = "7.7.0"
+    toolVersion = "7.9.0"
     incrementalAnalysis = true
 }
 
@@ -39,7 +39,7 @@ spotbugsMain {
     reports {
         xml.required = false
         html.required = true
-        html.stylesheet resources.text.fromFile('code/standards/fancy-hist.xsl')
+        html.stylesheet = resources.text.fromFile('code/standards/fancy-hist.xsl')
     }
 }
 

code/src/java/pcgen/cdom/base/Constants.java

@@ -28,7 +28,6 @@
 @SuppressWarnings("PMD.ConstantsInInterface")
 public interface Constants
 {
-
 	/********************************************************************
 	 * Static definitions of Equipment location strings
 	 ********************************************************************/
@@ -111,7 +110,7 @@ public interface Constants
 	String INTERNAL_WEAPON_PROF = "PCGENi_WEAPON_PROFICIENCY"; //$NON-NLS-1$
 
 	/** Line Separator. */
-	String LINE_SEPARATOR = System.getProperty("line.separator"); //$NON-NLS-1$
+	String LINE_SEPARATOR = System.lineSeparator(); //$NON-NLS-1$
 
 	/** The constant string "None". */
 	String NONE = "None"; //$NON-NLS-1$

code/src/java/pcgen/core/Globals.java

@@ -540,8 +540,8 @@ public static void clearCampaignsForRefresh()
 
 	/**
 	 * Check if enough data has been loaded to support character creation.
-	 * Will also report to the log the number of items of each of the 
-	 * necessary types that are currently loaded.  
+	 * Will also report to the log the number of items of each of the
+	 * necessary types that are currently loaded.
 	 * @return true or false
 	 */
 	public static boolean displayListsHappy()
@@ -722,7 +722,7 @@ public static boolean selectPaper(final String paperName)
 	}
 
 	/**
-	 * Apply the user's preferences to the initial state of the Globals.  
+	 * Apply the user's preferences to the initial state of the Globals.
 	 */
 	public static void initPreferences()
 	{
@@ -789,8 +789,8 @@ static List<? extends CDOMObject> sortPObjectList(final List<? extends CDOMObjec
 
 	/**
 	 * Sort Pcgen Object list by name
-	 * @param <T> 
-	 * 
+	 * @param <T>
+	 *
 	 * @param aList
 	 * @return Sorted list of Pcgen Objects
 	 */
@@ -1033,7 +1033,7 @@ else if (fType.equals("mac_user"))
 
 	private static int bonusParsing(final String l, final int level, int num, final PlayerCharacter aPC)
 	{
-		// should be in format levelnum,rangenum[,numchoices] 
+		// should be in format levelnum,rangenum[,numchoices]
 		final StringTokenizer aTok = new StringTokenizer(l, "|", false);
 		final int startLevel = Integer.parseInt(aTok.nextToken());
 		final String rangeLevelFormula = aTok.nextToken();