Merge branch 'master' into barracks

Author: IllianiBird

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: MekHQ CI with Gradle
 
 on:
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 env:
   GRADLE_OPTS: "-Dscan.link.VCS=${{ github.event.pull_request.html_url }}"
@@ -19,9 +19,9 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        java-distribution: [temurin]
-        java-version: [17]
+        os: [ ubuntu-latest ]
+        java-distribution: [ temurin ]
+        java-version: [ 17 ]
       fail-fast: false
 
     steps:
@@ -91,9 +91,9 @@ jobs:
         run: |
           echo ${{ github.sha }} >> mekhq/MekHQ/mhq-revision.txt
 
-      - name: Build with Gradle
+      - name: Test All
         working-directory: mekhq
-        run: ./gradlew build  -x checkstyleMain -x checkstyleTest --stacktrace --scan
+        run: ./gradlew testAll  --stacktrace --scan
 
       - name: Upload Test Logs on Failure
         uses: actions/upload-artifact@v4
@@ -102,6 +102,10 @@ jobs:
           name: cd-failure-logs
           path: ./mekhq/MekHQ/build/reports/
 
+      - name: Build with Gradle
+        working-directory: mekhq
+        run: ./gradlew build -x test
+
       - name: CodeCov.io Coverage Report
         uses: codecov/codecov-action@v5
         with:

MekHQ/build.gradle

@@ -2,18 +2,17 @@ import java.time.LocalDateTime
 
 plugins {
     id 'application'
-    id 'checkstyle'
     id 'com.palantir.git-version' version '3.1.0'
     id 'edu.sc.seis.launch4j' version '3.0.6'
-    id "io.sentry.jvm.gradle" version '5.2.0'
+    id "io.sentry.jvm.gradle" version '5.3.0'
     id 'jacoco'
     id 'java'
-    id 'org.ec4j.editorconfig' version '0.1.0'
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 sourceSets {
@@ -37,41 +36,30 @@ sourceSets {
 
 ext {
     mhqJvmOptions = [
-        '-Xmx4096m',
-        '--add-opens',
-        'java.base/java.util=ALL-UNNAMED',
-        '--add-opens',
-        'java.base/java.util.concurrent=ALL-UNNAMED',
-        '-Dsun.awt.disablegrab=true'
+            '-Xmx4096m',
+            '--add-opens',
+            'java.base/java.util=ALL-UNNAMED',
+            '--add-opens',
+            'java.base/java.util.concurrent=ALL-UNNAMED',
+            '-Dsun.awt.disablegrab=true'
     ]
     campaigns = 'campaigns'
     data = 'data'
     docs = 'docs'
     lib = 'lib'
     log = 'logs'
     mmconf = 'mmconf'
-    plugins = 'plugins'
     userdata = 'userdata'
-    fileStagingDir = "${buildDir}/files"
+    fileStagingDir = "${layout.buildDirectory.get()}/files"
     scriptsDir = "${projectDir}/scripts"
-    scriptTemplate = "${scriptsDir}/startScriptTemplate.txt"
-
-    // Allows setting a dependency on a different MM branch.
-    mmBranch = 'master'
-    mmBranchTag = mmBranch.equals('master') ? '' : '-' + mmBranch
-    mmlBranch = 'master'
-    mmlBranchTag = mmlBranch.equals('master') ? '' : '-' + mmlBranch
 
     mmDir = "${rootDir}/../megamek"
     mmlDir = "${rootDir}/../megameklab"
 }
 
 dependencies {
-    implementation "org.megamek:megamek${mmBranchTag}:${version}"
-    implementation ("org.megamek:megameklab${mmlBranchTag}:${version}") {
-        // We may want to specify different branches for MM and MML, so we need to exclude the transitive MM dependency
-        exclude group: 'org.megamek', module: "megamek${mmBranchTag}:${version}"
-
+    implementation "org.megamek:megamek:${version}"
+    implementation("org.megamek:megameklab:${version}") {
         // We don't need the python and javascript engine taking up space
         exclude group: 'org.python', module: 'jython'
         exclude group: 'org.mozilla', module: 'rhino'
@@ -101,6 +89,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2'
 
     runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
+
     // Required for mml printing scaled vector graphics (SVG) - Eclipse IDE Compatibility.
     runtimeOnly 'xml-apis:xml-apis-ext:1.3.04'
 
@@ -116,12 +105,6 @@ application {
     mainClass = 'mekhq.MekHQ'
 }
 
-checkstyle {
-    toolVersion = '10.18.1'
-    configFile = file("config/checkstyle/checkstyle.xml")
-    ignoreFailures = false
-}
-
 run {
     jvmArgs = mhqJvmOptions
 }
@@ -130,16 +113,16 @@ jar {
     archiveFileName = "MekHQ.jar"
 
     manifest {
-        attributes "Main-Class" : application.mainClass
-        attributes "Class-Path" : "MegaMek.jar MegaMekLab.jar " + (project.sourceSets.main.runtimeClasspath.files
-            .findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek") }
-            .collect { "${lib}/${it.name}" }.join(' '))
-        attributes "Add-Opens" : 'java.base/java.util java.base/java.util.concurrent'
-        attributes "Build-Date" : LocalDateTime.now()
+        attributes "Main-Class": application.mainClass
+        attributes "Class-Path": "MegaMek.jar MegaMekLab.jar " + (project.sourceSets.main.runtimeClasspath.files
+                .findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek") }
+                .collect { "${lib}/${it.name}" }.join(' '))
+        attributes "Add-Opens": 'java.base/java.util java.base/java.util.concurrent'
+        attributes "Build-Date": LocalDateTime.now()
     }
 }
 
-task generateDynamicFiles() {
+tasks.register('generateDynamicFiles') {
     def jvmOptions = project.ext.mhqJvmOptions.join('\n')
 
     doLast {
@@ -151,7 +134,7 @@ ${jvmOptions}
     }
 }
 
-task canonSystemZip (type: Zip) {
+tasks.register('canonSystemZip', Zip) {
     description = 'Creates a zip archive of canon planetary systems.'
     from "${data}/universe/planetary_systems/canon_systems/"
 
@@ -161,7 +144,7 @@ task canonSystemZip (type: Zip) {
     outputs.dir "${fileStagingDir}/${data}/universe/planetary_systems"
 }
 
-task connectorSystemZip (type: Zip) {
+tasks.register('connectorSystemZip', Zip) {
     description = 'Creates a zip archive of connector systems planetary systems.'
     from "${data}/universe/planetary_systems/connector_systems/"
 
@@ -171,7 +154,7 @@ task connectorSystemZip (type: Zip) {
     outputs.dir "${fileStagingDir}/${data}/universe/planetary_systems"
 }
 
-task stageFiles(type: Copy) {
+tasks.register('stageFiles', Copy) {
     description = 'Stages files that are to be copied into the distribution.'
 
     dependsOn generateDynamicFiles
@@ -205,7 +188,6 @@ task stageFiles(type: Copy) {
     include "${data}/terrainconditionsodds/"
     include "${docs}/**"
     include "${mmconf}/**"
-    include "${project.ext.plugins}/"
     include "${userdata}"
     include "${userdata}/data/universe/"
     include 'license.txt'
@@ -234,7 +216,7 @@ task stageFiles(type: Copy) {
     }
 }
 
-task createStartScripts (type: CreateStartScripts) {
+tasks.register('createStartScripts', CreateStartScripts) {
     description = 'Create shell script for generic distribution.'
 
     applicationName = 'MekHQ'
@@ -250,87 +232,87 @@ distributions {
         distributionBaseName = 'MekHQ'
         contents {
             // MegaMek Includes
-            from ("${mmDir}/megamek/build/files")
-            from ("${mmDir}/megamek/build/scripts") {
+            from("${mmDir}/megamek/build/files")
+            from("${mmDir}/megamek/build/scripts") {
                 into "bin"
             }
-            from ("${mmDir}/megamek/scripts") {
+            from("${mmDir}/megamek/scripts") {
                 include "shell.sh"
                 rename "shell.sh", "MegaMek.sh"
             }
-            from ("${mmDir}/megamek/docs") {
+            from("${mmDir}/megamek/docs") {
                 rename 'history.txt', 'mm-history.txt'
                 into 'docs'
             }
-            from ("${mmDir}/megamek/mmconf/log4j2.xml") {
+            from("${mmDir}/megamek/mmconf/log4j2.xml") {
                 exclude 'log4j2.xml'
             }
-            from ("${mmDir}/megamek/build/launch4j/lib") {
+            from("${mmDir}/megamek/build/launch4j/lib") {
                 into "${lib}"
             }
-            from ("${mmDir}/megamek/build/launch4j") {
+            from("${mmDir}/megamek/build/launch4j") {
                 include '*.exe'
             }
-            from ("${mmDir}/megamek/build/libs/MegaMek.jar") {
+            from("${mmDir}/megamek/build/libs/MegaMek.jar") {
                 into "${lib}"
             }
-            from ("${mmDir}/megamek/build/libs/MegaMek.jar")
-            from ("${mmDir}/megamek/") {
+            from("${mmDir}/megamek/build/libs/MegaMek.jar")
+            from("${mmDir}/megamek/") {
                 include '*.ini'
             }
 
             // MegaMekLab Includes
-            from ("${mmlDir}/megameklab/build/files") {
+            from("${mmlDir}/megameklab/build/files") {
                 exclude 'data/mekfiles'
             }
-            from ("${mmlDir}/megameklab/build/launch4j/lib") {
+            from("${mmlDir}/megameklab/build/launch4j/lib") {
                 into "${lib}"
             }
-            from ("${mmlDir}/megameklab/build/files/${data}/images") {
+            from("${mmlDir}/megameklab/build/files/${data}/images") {
                 into "${data}/images"
             }
-            from ("${mmlDir}/megameklab/build/scripts") {
+            from("${mmlDir}/megameklab/build/scripts") {
                 into "bin"
             }
-            from ("${mmlDir}/megameklab/scripts") {
+            from("${mmlDir}/megameklab/scripts") {
                 include "shell.sh"
                 rename "shell.sh", "MegaMekLab.sh"
             }
-            from ("${mmlDir}/megameklab/docs") {
+            from("${mmlDir}/megameklab/docs") {
                 rename 'history.txt', 'mml-history.txt'
                 into "${docs}"
             }
-            from ("${mmlDir}/megameklab/mmconf/log4j2.xml") {
+            from("${mmlDir}/megameklab/mmconf/log4j2.xml") {
                 exclude 'log4j2.xml'
             }
-            from ("${mmlDir}/megameklab/build/launch4j") {
+            from("${mmlDir}/megameklab/build/launch4j") {
                 include '*.exe'
             }
-            from ("${mmlDir}/megameklab/build/libs/MegaMekLab.jar") {
+            from("${mmlDir}/megameklab/build/libs/MegaMekLab.jar") {
                 into "${lib}"
             }
-            from ("${mmlDir}/megameklab/build/libs/MegaMekLab.jar")
-            from ("${mmlDir}/megameklab/") {
+            from("${mmlDir}/megameklab/build/libs/MegaMekLab.jar")
+            from("${mmlDir}/megameklab/") {
                 include '*.ini'
             }
 
             // MekHQ Includes
-            from ("docs/history.txt") {
+            from("docs/history.txt") {
                 rename 'history.txt', 'mhq-history.txt'
                 into 'docs'
             }
-            from (fileStagingDir) {
+            from(fileStagingDir) {
                 exclude 'history.txt'
             }
-            from ("${projectDir}/scripts") {
+            from("${projectDir}/scripts") {
                 include 'shell.sh'
                 rename 'shell.sh', 'MekHQ.sh'
             }
-            from ("${buildDir}/launch4j") {
+            from("${buildDir}/launch4j") {
                 include '*.exe'
             }
 
-            from (project.sourceSets.main.runtimeClasspath.files
+            from(project.sourceSets.main.runtimeClasspath.files
                     .findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek") }) {
                 into "${lib}"
             }
@@ -365,6 +347,7 @@ launch4j {
 
 tasks.register("packagePrepWork") {
     description = 'General Catch All for all distributions'
+    dependsOn jar
     dependsOn stageFiles
     dependsOn startScripts
     dependsOn createStartScripts
@@ -396,18 +379,14 @@ distZip {
     dependsOn packagePrepWork
 }
 
-// The distribution plugin adds the distribution packages to the assemble task, which causes the build task
-// to run all the packaging tasks.
-task assemble(overwrite: true) {
+assemble {
     dependsOn jar
 }
 
-// Replace the assembleDist task created by the distributions plugin to create the packages we want to
-task assembleDist(overwrite: true) {
+assembleDist {
     description = 'Build unix, Windows, and source packages'
     group = 'distribution'
     dependsOn stageFiles
-    dependsOn test
     dependsOn distTar
 }
 
@@ -434,6 +413,17 @@ tasks.register("cleanAll") {
     dependsOn clean
 }
 
+tasks.register("testAll") {
+    description = "Cleans all build projects to ensure a clean slate then runs all tests"
+    group = "verification"
+    dependsOn cleanAll
+
+    dependsOn gradle.includedBuild('megamek').task(':megamek:test')
+    dependsOn gradle.includedBuild('megameklab').task(':megameklab:test')
+    dependsOn test
+}
+
+
 test {
     useJUnitPlatform()
     // report is always generated after tests run
@@ -448,12 +438,3 @@ jacocoTestReport {
         html.required = true
     }
 }
-
-tasks.withType(Checkstyle) {
-    minHeapSize = "200m"
-    maxHeapSize = "1g"
-    reports {
-        xml.required = false
-        html.required = true
-    }
-}

MekHQ/docs/history.txt

@@ -117,6 +117,9 @@ MEKHQ VERSION HISTORY:
 + PR #6504: Removed Unofficial Multiplier From Contract Pay Calculation
 + PR #6506: Celebration Event Fixes
 + PR #6283: Added Blood Group Tracking For Personnel
++ Fix #2368: Added GM Methods to Warehouse: remove x parts and toggle newness
++ Fix #6507: Fixed Missing Dates from Past Scenarios
++ Fix #6510: Fixed NPE In Armor Repair
 + Fix #6515, #6516: Allow Dynamically Priced Parts to be Replaced in Repair Bay
 
 0.50.04 (2025-03-22 1600 UTC)