Skip to content

Commit

Permalink
Move to Java 17 (#6727)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
karianna and mertonmonk authored Feb 15, 2023
1 parent 28e2e3c commit eac9708
Show file tree
Hide file tree
Showing 58 changed files with 738 additions and 613 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
10 changes: 6 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Set up JDK 16
uses: actions/setup-java@v1
- name: Checkout Code
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 16
distribution: 'temurin'
java-version: '17'
- name: Build with Gradle
run: ./gradlew build
18 changes: 12 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ characters/*
!characters/Sorcerer.pcg
!characters/SpecialWizard.pcg

# Binary locations
bin/
code/bin/
code/build/
code/comp-manifest
code/manifest

# JVM Error log if Java craches
hs_err_*.log

Expand Down Expand Up @@ -55,15 +62,13 @@ pcgen.jar
/output/
/build/
/libs/
output/
build/
libs/
code/testsuite/output/
.gradle/
pcgen-batch-convert.jar
.metadata
bin/
code/bin/
code/build/
code/comp-manifest
code/manifest
target/

# Data we want to exclude, see .gitignore files within
Expand Down Expand Up @@ -92,6 +97,8 @@ code/build.eclipse/
out/
pcgendev.iml
pcgen.iml
pcgen.ipr
pcgen.iws

# VS Code IDE
.vscode/
Expand All @@ -108,4 +115,3 @@ jre/
mods/
code/manifest-tests
.DS_Store

Loading

0 comments on commit eac9708

Please sign in to comment.