Skip to content

Commit eac9708

Browse files
kariannamertonmonk
andauthored
Move to Java 17 (#6727)
* enhance .gitignore * minor updates * remove whitespace * Fix type conversion error in GMGen * Fix Travis build * pcgen.iml for IntelliH * Initial Java 17 support * updated test properties after test runs * Full Java 17 support * Revert Ignore * Revert Ignore * Revert Ignore * fix merge conflicts * Update all plugins and dependencies and fix checkstyle, spotbugs and PMD * Update to support aarch64 * Debug host in GH Actions * 6.09.clean build (#6810) * adding cobra and fixing repos * cleaning warnings from build * Update string and deal with amd64 host arch * Update GH Actions * enhance .gitignore * minor updates * remove whitespace * Fix type conversion error in GMGen * Fix Travis build * pcgen.iml for IntelliH * Initial Java 17 support * updated test properties after test runs * Full Java 17 support * Revert Ignore * Revert Ignore * Revert Ignore * fix merge conflicts * Update all plugins and dependencies and fix checkstyle, spotbugs and PMD * Update to support aarch64 * Debug host in GH Actions * Update string and deal with amd64 host arch * Update GH Actions * Fix Git Ignore * Last dependency updates * fix module list thanks Bryan --------- Co-authored-by: mertonmonk <[email protected]>
1 parent 28e2e3c commit eac9708

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+738
-613
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ jobs:
3939

4040
steps:
4141
- name: Checkout repository
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
46+
uses: github/codeql-action/init@v2
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
57+
uses: github/codeql-action/autobuild@v2
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v1
71+
uses: github/codeql-action/analyze@v2

.github/workflows/gradle.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v1
12-
- name: Set up JDK 16
13-
uses: actions/setup-java@v1
11+
- name: Checkout Code
12+
uses: actions/checkout@v3
13+
- name: Set up JDK 17
14+
uses: actions/setup-java@v3
1415
with:
15-
java-version: 16
16+
distribution: 'temurin'
17+
java-version: '17'
1618
- name: Build with Gradle
1719
run: ./gradlew build

.gitignore

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ characters/*
1919
!characters/Sorcerer.pcg
2020
!characters/SpecialWizard.pcg
2121

22+
# Binary locations
23+
bin/
24+
code/bin/
25+
code/build/
26+
code/comp-manifest
27+
code/manifest
28+
2229
# JVM Error log if Java craches
2330
hs_err_*.log
2431

@@ -55,15 +62,13 @@ pcgen.jar
5562
/output/
5663
/build/
5764
/libs/
65+
output/
66+
build/
67+
libs/
5868
code/testsuite/output/
5969
.gradle/
6070
pcgen-batch-convert.jar
6171
.metadata
62-
bin/
63-
code/bin/
64-
code/build/
65-
code/comp-manifest
66-
code/manifest
6772
target/
6873

6974
# Data we want to exclude, see .gitignore files within
@@ -92,6 +97,8 @@ code/build.eclipse/
9297
out/
9398
pcgendev.iml
9499
pcgen.iml
100+
pcgen.ipr
101+
pcgen.iws
95102

96103
# VS Code IDE
97104
.vscode/
@@ -108,4 +115,3 @@ jre/
108115
mods/
109116
code/manifest-tests
110117
.DS_Store
111-

0 commit comments

Comments
 (0)