Seth/HyperLap2D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[editor only] Update to AdoptOpenJDK 16

Browse Source
This commit is contained in:
fgnm
2021-05-23 13:23:06 +02:00
parent ad839a296a
commit 74bf316e2d
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/gradle.yml
+3 -3
View File
@@ -16,10 +16,10 @@ 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
.github/workflows/release.yml
+2 -2
View File
@@ -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
.github/workflows/snapshot.yml
+15 -15
View File
@@ -16,10 +16,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
@@ -29,12 +29,12 @@ jobs:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew jpackage -PSNAPSHOT=true
- name: Fix deb file names
run: mv build/jpackage/*.deb HyperLap2D-SNAPSHOT.deb
run: mv build/jpackage/*.deb Linux.HyperLap2D-SNAPSHOT.deb
- name: Upload deb artifact
uses: actions/upload-artifact@v2
with:
name: HyperLap2D-SNAPSHOT.deb
path: HyperLap2D-SNAPSHOT.deb
name: Linux.HyperLap2D-SNAPSHOT.deb
path: Linux.HyperLap2D-SNAPSHOT.deb
- name: Publish SNAPSHOT artifacts
if: "!contains(github.event.head_commit.message, 'editor only')"
env:
@@ -50,10 +50,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: Build JAR dist files
run: ./gradlew.bat dist
- name: Build msi package
@@ -61,12 +61,12 @@ jobs:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew.bat jpackage -PSNAPSHOT=true
- name: Fix file names
run: mv build/jpackage/*.msi HyperLap2D-SNAPSHOT.msi
run: mv build/jpackage/*.msi Windows.HyperLap2D-SNAPSHOT.msi
- name: Upload msi artifact
uses: actions/upload-artifact@v2
with:
name: HyperLap2D-SNAPSHOT.msi
path: HyperLap2D-SNAPSHOT.msi
name: Windows.HyperLap2D-SNAPSHOT.msi
path: Windows.HyperLap2D-SNAPSHOT.msi
macOS:
if: "!contains(github.event.head_commit.message, 'cd skip')"
@@ -76,10 +76,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
@@ -89,9 +89,9 @@ jobs:
WORKFLOW_RUN: ${{ github.run_number }}
run: ./gradlew jpackage -PSNAPSHOT=true
- name: Fix file names
run: mv build/jpackage/*.dmg HyperLap2D-SNAPSHOT.dmg
run: mv build/jpackage/*.dmg macOS.HyperLap2D-SNAPSHOT.dmg
- name: Upload dmg artifact
uses: actions/upload-artifact@v2
with:
name: HyperLap2D-SNAPSHOT.dmg
path: HyperLap2D-SNAPSHOT.dmg
name: macOS.HyperLap2D-SNAPSHOT.dmg
path: macOS.HyperLap2D-SNAPSHOT.dmg
README.md
+1 -1
View File
@@ -62,7 +62,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
src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java
+2
View File
@@ -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"));
}
}