Update Checkstyle, use Temurin distribution (#5956)

This commit is contained in:
Taco 2022-07-20 16:29:58 -04:00 committed by GitHub
parent f5ae881561
commit 4d704eb777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -17,7 +17,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Checkstyle - name: Checkstyle
run: | run: |
curl -s -L https://github.com/checkstyle/checkstyle/releases/download/checkstyle-9.2.1/checkstyle-9.2.1-all.jar > checkstyle.jar curl -s -L https://github.com/checkstyle/checkstyle/releases/download/checkstyle-10.3.1/checkstyle-10.3.1-all.jar > checkstyle.jar
find . -name "*\.java" | xargs java -Dconfig_loc=config/checkstyle -jar checkstyle.jar -c config/checkstyle/checkstyle.xml find . -name "*\.java" | xargs java -Dconfig_loc=config/checkstyle -jar checkstyle.jar -c config/checkstyle/checkstyle.xml
- name: Find PR Base Commit - name: Find PR Base Commit
id: vars id: vars
@ -26,7 +26,7 @@ jobs:
echo "::set-output name=branchBaseCommit::$(git merge-base origin/develop HEAD)" echo "::set-output name=branchBaseCommit::$(git merge-base origin/develop HEAD)"
- name: Diff-Checkstyle - name: Diff-Checkstyle
run: | run: |
curl -s -L https://github.com/yangziwen/diff-checkstyle/releases/download/0.0.4/diff-checkstyle.jar > diff-checkstyle.jar curl -s -L https://github.com/yangziwen/diff-check/releases/download/0.0.7/diff-checkstyle.jar > diff-checkstyle.jar
java -Dconfig_loc=config/checkstyle -jar diff-checkstyle.jar -c config/checkstyle/checkstyle-new-code.xml --git-dir . --base-rev ${{ steps.vars.outputs.branchBaseCommit }} java -Dconfig_loc=config/checkstyle -jar diff-checkstyle.jar -c config/checkstyle/checkstyle-new-code.xml --git-dir . --base-rev ${{ steps.vars.outputs.branchBaseCommit }}
- name: XML of changed files - name: XML of changed files
run: | run: |
@ -116,7 +116,7 @@ jobs:
- name: Set up JDK 11 - name: Set up JDK 11
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: 'adopt' distribution: 'temurin'
java-version: '11' java-version: '11'
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew assemblePlayDebugAndroidTest run: ./gradlew assemblePlayDebugAndroidTest

View File

@ -77,7 +77,7 @@ project.ext {
apply plugin: "checkstyle" apply plugin: "checkstyle"
checkstyle { checkstyle {
toolVersion '8.24' toolVersion '10.3.1'
} }
task checkstyle(type: Checkstyle) { task checkstyle(type: Checkstyle) {