From 1bc97afa97ef36404555cc097bf5a2df421ff940 Mon Sep 17 00:00:00 2001 From: fgnm Date: Thu, 15 Jul 2021 19:50:18 +0200 Subject: [PATCH] Update Gradle to `7.1.1` and AdoptOpenJDK 16 --- .github/workflows/gradle.yml | 8 +- .github/workflows/release.yml | 6 +- .github/workflows/snapshot.yml | 140 +++++++++--------- README.md | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- h2d-libgdx-spine-extension | 2 +- h2d-libgdx-talos-extension | 2 +- hyperlap2d-common-api | 2 +- hyperlap2d-runtime-libgdx | 2 +- .../controller/BootstrapInfoCommand.java | 2 + 10 files changed, 85 insertions(+), 83 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7fa10010..42c862fd 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,11 +16,11 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Set up JDK 14 - uses: actions/setup-java@v1 + - name: Set up AdoptOpenJDK 16 + uses: joschi/setup-jdk@v2.3.0 with: - java-version: 14 + java-version: 16 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b7ead9e..230cd753 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,10 +15,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - name: Setup AdoptOpenJDK 14 + - name: Setup AdoptOpenJDK 16 uses: joschi/setup-jdk@v2.3.0 with: - java-version: 14 + java-version: 16 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build JAR dist files @@ -34,4 +34,4 @@ jobs: NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} run: - ./gradlew clean uploadArchives -PRELEASE=true -Psigning.gnupg.keyId=${{ secrets.GPG_KEYID }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSPHRASE }} -Psigning.gnupg.keyName=${{ secrets.GPG_KEYID }} + ./gradlew clean build publish -PRELEASE=true -Psigning.gnupg.keyId=${{ secrets.GPG_KEYID }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSPHRASE }} -Psigning.gnupg.keyName=${{ secrets.GPG_KEYID }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 721bb822..2c6b3864 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -13,85 +13,85 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: Setup AdoptOpenJDK 14 - uses: joschi/setup-jdk@v2.3.0 - with: - java-version: 14 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build JAR dist files - run: ./gradlew dist - - name: Build deb package - env: - WORKFLOW_RUN: ${{ github.run_number }} - run: ./gradlew jpackage -PSNAPSHOT=true - - name: Fix deb file names - run: mv build/jpackage/*.deb HyperLap2D-SNAPSHOT.deb - - name: Upload deb artifact - uses: actions/upload-artifact@v2 - with: - name: HyperLap2D-SNAPSHOT.deb - path: HyperLap2D-SNAPSHOT.deb - - name: Publish SNAPSHOT artifacts - if: "!contains(github.event.head_commit.message, 'editor only')" - env: - NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} - NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} - run: ./gradlew uploadArchives -PSNAPSHOT=true + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: Setup AdoptOpenJDK 16 + uses: joschi/setup-jdk@v2.3.0 + with: + java-version: 16 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build JAR dist files + run: ./gradlew dist + - name: Build deb package + env: + WORKFLOW_RUN: ${{ github.run_number }} + run: ./gradlew jpackage -PSNAPSHOT=true + - name: Fix deb file names + run: mv build/jpackage/*.deb Linux.HyperLap2D-SNAPSHOT.deb + - name: Upload deb artifact + uses: actions/upload-artifact@v2 + with: + name: Linux.HyperLap2D-SNAPSHOT.deb + path: Linux.HyperLap2D-SNAPSHOT.deb + - name: Publish SNAPSHOT artifacts + if: "!contains(github.event.head_commit.message, 'editor only')" + env: + NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + run: ./gradlew build publish -PSNAPSHOT=true windows: if: "!contains(github.event.head_commit.message, 'cd skip')" runs-on: windows-latest steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: Setup AdoptOpenJDK 14 - uses: joschi/setup-jdk@v2.3.0 - with: - java-version: 14 - - name: Build JAR dist files - run: ./gradlew.bat dist - - name: Build msi package - env: - WORKFLOW_RUN: ${{ github.run_number }} - run: ./gradlew.bat jpackage -PSNAPSHOT=true - - name: Fix file names - run: mv build/jpackage/*.msi HyperLap2D-SNAPSHOT.msi - - name: Upload msi artifact - uses: actions/upload-artifact@v2 - with: - name: HyperLap2D-SNAPSHOT.msi - path: HyperLap2D-SNAPSHOT.msi + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: Setup AdoptOpenJDK 16 + uses: joschi/setup-jdk@v2.3.0 + with: + java-version: 16 + - name: Build JAR dist files + run: ./gradlew.bat dist + - name: Build msi package + env: + WORKFLOW_RUN: ${{ github.run_number }} + run: ./gradlew.bat jpackage -PSNAPSHOT=true + - name: Fix file names + run: mv build/jpackage/*.msi Windows.HyperLap2D-SNAPSHOT.msi + - name: Upload msi artifact + uses: actions/upload-artifact@v2 + with: + name: Windows.HyperLap2D-SNAPSHOT.msi + path: Windows.HyperLap2D-SNAPSHOT.msi macOS: if: "!contains(github.event.head_commit.message, 'cd skip')" runs-on: macOS-latest steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: Setup AdoptOpenJDK 14 - uses: joschi/setup-jdk@v2.3.0 - with: - java-version: 14 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build JAR dist files - run: ./gradlew dist - - name: Build dmg package - env: - WORKFLOW_RUN: ${{ github.run_number }} - run: ./gradlew jpackage -PSNAPSHOT=true - - name: Fix file names - run: mv build/jpackage/*.dmg HyperLap2D-SNAPSHOT.dmg - - name: Upload dmg artifact - uses: actions/upload-artifact@v2 - with: - name: HyperLap2D-SNAPSHOT.dmg - path: HyperLap2D-SNAPSHOT.dmg + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: Setup AdoptOpenJDK 16 + uses: joschi/setup-jdk@v2.3.0 + with: + java-version: 16 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build JAR dist files + run: ./gradlew dist + - name: Build dmg package + env: + WORKFLOW_RUN: ${{ github.run_number }} + run: ./gradlew jpackage -PSNAPSHOT=true + - name: Fix file names + run: mv build/jpackage/*.dmg macOS.HyperLap2D-SNAPSHOT.dmg + - name: Upload dmg artifact + uses: actions/upload-artifact@v2 + with: + name: macOS.HyperLap2D-SNAPSHOT.dmg + path: macOS.HyperLap2D-SNAPSHOT.dmg diff --git a/README.md b/README.md index f988ce24..e9a5250f 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ We need your help! HyperLap2D is a very large and complex project, if you have s #### Building from source -HyperLap2D is developed using IntelliJ IDEA. Needs `Java 14`. +HyperLap2D is developed using IntelliJ IDEA. Needs `Java 16`. 1. Fork this repository 2. Clone with `--recurse-submodules` flag diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4c5803d1..05679dc3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/h2d-libgdx-spine-extension b/h2d-libgdx-spine-extension index 85ed67d2..23cfad8b 160000 --- a/h2d-libgdx-spine-extension +++ b/h2d-libgdx-spine-extension @@ -1 +1 @@ -Subproject commit 85ed67d202b120ed81c38b848a4c724879fbcde4 +Subproject commit 23cfad8bbab3db4aa4338407fc4f8b66cb0043f3 diff --git a/h2d-libgdx-talos-extension b/h2d-libgdx-talos-extension index 94b1d7dc..cff36846 160000 --- a/h2d-libgdx-talos-extension +++ b/h2d-libgdx-talos-extension @@ -1 +1 @@ -Subproject commit 94b1d7dce75962ee60a38fb405548fe168f21b3b +Subproject commit cff36846d81a35f9c99822da05fd01cb83264b8d diff --git a/hyperlap2d-common-api b/hyperlap2d-common-api index 57acafe9..09d3d04b 160000 --- a/hyperlap2d-common-api +++ b/hyperlap2d-common-api @@ -1 +1 @@ -Subproject commit 57acafe90f1b5e9acde38a5c34f29418ea447edd +Subproject commit 09d3d04be48ed5d6fe51437ead139b5a3ded9f75 diff --git a/hyperlap2d-runtime-libgdx b/hyperlap2d-runtime-libgdx index 7a998647..4ea0b744 160000 --- a/hyperlap2d-runtime-libgdx +++ b/hyperlap2d-runtime-libgdx @@ -1 +1 @@ -Subproject commit 7a99864777777f75e7d9117c75364ab273429fa4 +Subproject commit 4ea0b7443a50b4bdc4d2025e761e0fa8bf184e0b diff --git a/src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java b/src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java index 56c674d4..a4a1ee6a 100644 --- a/src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java +++ b/src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java @@ -19,5 +19,7 @@ public class BootstrapInfoCommand extends SimpleCommand { HyperLog.info("Screen size " + Gdx.graphics.getBackBufferWidth() + " x " + Gdx.graphics.getBackBufferHeight()); HyperLog.info("GL version " + gl20.glGetString(GL20.GL_VERSION)); HyperLog.info("Shaders version " + gl20.glGetString(GL20.GL_SHADING_LANGUAGE_VERSION)); + + HyperLog.info("JVM Version: " + System.getProperty("java.version")); } }