Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Player Java 17 Support #4049

Merged
merged 1 commit into from
Dec 17, 2022
Merged

Player Java 17 Support #4049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-maven-repo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-boards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion megamek/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
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"
Expand All @@ -64,6 +64,10 @@ ext {
scriptTemplate = "${scriptsDir}/startScriptTemplate.txt"
}

run {
jvmArgs = mmJvmOptions
}

jar {
archiveFileName = 'MegaMek.jar'
manifest {
Expand Down