Merge remote-tracking branch 'MegamekMaster/master' into ForceAssignable

# Conflicts: # megamek/src/megamek/client/ui/swing/PlayerListDialog.java # megamek/src/megamek/common/Mech.java # megamek/src/megamek/common/SmallCraft.java # megamek/src/megamek/common/Tank.java # megamek/src/megamek/common/weapons/MissileWeaponHandler.java
MegaMek · Jan 8, 2023 · 81692e4 · 81692e4
2 parents f073aee + f47ff9b
commit 81692e4
Show file tree

Hide file tree

Showing 688 changed files with 15,537 additions and 4,472 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest ] # For CI/CD running on *nix is sufficient
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 11, 17 ]
       fail-fast: false
 
     steps:

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest ] # For Code QL running on *nix is sufficient
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 17 ]
 
     steps:
     # Checkout the Pull Request source and put it in: ./megamek

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
         os: [ ubuntu-latest ] # For Code QL running on *nix is sufficient
         language: [ 'java' ]
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 17 ]
       fail-fast: false
 
     steps:

diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 11, 17 ]
       fail-fast: false
 
     name: Nightly MegaMek CI ${{ matrix.os }} on ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}

diff --git a/.github/workflows/update-maven-repo.yml b/.github/workflows/update-maven-repo.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest ] # For Maven Repository Update running on *nix is sufficient
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 17 ]
 
     steps:
     # Put the MM repo in a subfolder to make updating the Maven repo easier

diff --git a/.github/workflows/validate-boards.yml b/.github/workflows/validate-boards.yml
@@ -36,7 +36,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest ] # For Board Validation running on *nix is sufficient
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 17 ]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ allprojects {
 
 subprojects {
     group = 'org.megamek'
-    version = '0.49.11-SNAPSHOT'
+    version = '0.49.12-SNAPSHOT'
 }
 
 ext {

diff --git a/megamek/build.gradle b/megamek/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     implementation 'com.formdev:flatlaf:2.6'
     implementation 'com.github.ikkisoft:SerialKiller:master-SNAPSHOT'
     implementation 'com.sun.mail:jakarta.mail:2.0.1'
-    implementation 'com.thoughtworks.xstream:xstream:1.4.14'
+    implementation 'com.thoughtworks.xstream:xstream:1.4.19'
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
     implementation 'org.apache.commons:commons-text:1.10.0'
     implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
@@ -40,13 +40,13 @@ dependencies {
     runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:4.0.1'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
-    testImplementation 'org.mockito:mockito-core:4.9.0'
+    testImplementation 'org.mockito:mockito-core:4.10.0'
 }
 
 mainClassName = 'megamek.MegaMek'
 
 ext {
-    mmJvmOptions = ['-Xmx2048m']
+    mmJvmOptions = ['-Xmx2048m', '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED']
     data = 'data'
     unitFiles = "${data}/mechfiles"
     rats = "${data}/rat"
@@ -64,12 +64,17 @@ ext {
     scriptTemplate = "${scriptsDir}/startScriptTemplate.txt"
 }
 
+run {
+    jvmArgs = mmJvmOptions
+}
+
 jar {
     archiveFileName = 'MegaMek.jar'
     manifest {
         attributes "Main-Class" : mainClassName
         attributes "Class-Path" : project.sourceSets.main.runtimeClasspath.files
             .findAll { it.name.endsWith(".jar") }.collect { "${lib}/${it.name}" }.join(' ')
+        attributes "Add-Opens" : 'java.base/java.util java.base/java.util.concurrent'
         attributes "Build-Date" : LocalDateTime.now()
     }
 }