From 8237b1e28e7cf7da9b5c0c17e0ca3098a3d4386a Mon Sep 17 00:00:00 2001 From: soloturn Date: Fri, 21 Jun 2024 22:47:56 +0200 Subject: [PATCH] build(gradle): update Gradle and dependencies (#715) * build: upgrade to Gradle 8.8 * fix: terasology.io artifactory * build: update run with new intellij * style: checkstyle warning remove * build: update dependencies * build: update github workflows to use Java 17 Co-authored-by: Benjamin Amos --- .github/workflows/asset-upload.yml | 4 +- .github/workflows/push-validation.yml | 4 +- .github/workflows/release-draft.yml | 2 +- .idea/misc.xml | 2 +- .idea/runConfigurations/Test_All.xml | 1 + build.gradle | 33 +++++++++-------- buildscript-gradle.lockfile | 4 +- config/gradle/jre.gradle | 2 +- gradle.lockfile | 14 +++---- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 35 +++++++++++------- gradlew.bat | 21 ++++++----- .../repositories/GithubRepository.java | 6 +-- .../launcher/game/TestGameStarter.java | 7 ++-- 15 files changed, 76 insertions(+), 63 deletions(-) diff --git a/.github/workflows/asset-upload.yml b/.github/workflows/asset-upload.yml index ea5a7fe53..9669bd799 100644 --- a/.github/workflows/asset-upload.yml +++ b/.github/workflows/asset-upload.yml @@ -16,10 +16,10 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up JDK 14 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 17 java-package: jdk - name: Bundle distribution for ${{ matrix.platform }} run: ./gradlew -Prelease.useLastTag=true ${{ matrix.platform }}DistZip diff --git a/.github/workflows/push-validation.yml b/.github/workflows/push-validation.yml index 25feaab96..eddfc9a5b 100644 --- a/.github/workflows/push-validation.yml +++ b/.github/workflows/push-validation.yml @@ -12,11 +12,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 15 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: distribution: 'liberica' - java-version: '15' + java-version: '17' cache: 'gradle' - name: Build run: ./gradlew jar diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index b6eb9ffc1..f13fde057 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -15,4 +15,4 @@ jobs: with: config-name: release-drafter-config.yml env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.idea/misc.xml b/.idea/misc.xml index e6be1b510..d7159f23a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/.idea/runConfigurations/Test_All.xml b/.idea/runConfigurations/Test_All.xml index ce731fce2..d50f11ae6 100644 --- a/.idea/runConfigurations/Test_All.xml +++ b/.idea/runConfigurations/Test_All.xml @@ -7,6 +7,7 @@