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

Update to Java 17, switch to Eclipse Adoptium

Browse Source
This commit is contained in:
fgnm
2022-01-29 00:03:51 +01:00
parent 267af2b000
commit 251c90d7e1
10 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/gradle.yml
+4 -3
View File
@@ -16,10 +16,11 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Set up AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
- name: Setup Eclipse Temurin OpenJDK 17
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'temurin'
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
.github/workflows/release.yml
+4 -3
View File
@@ -15,10 +15,11 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
- name: Setup Eclipse Temurin OpenJDK 17
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'temurin'
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build JAR dist files
.github/workflows/snapshot.yml
+12 -9
View File
@@ -16,10 +16,11 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
- name: Setup Eclipse Temurin OpenJDK 17
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'temurin'
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build JAR dist files
@@ -52,10 +53,11 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
- name: Setup Eclipse Temurin OpenJDK 17
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'temurin'
java-version: 17
- name: Build JAR dist files
env:
WORKFLOW_RUN: ${{ github.run_number }}
@@ -80,10 +82,11 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Setup AdoptOpenJDK 16
uses: joschi/setup-jdk@v2.3.0
- name: Setup Eclipse Temurin OpenJDK 17
uses: actions/setup-java@v2
with:
java-version: 16
distribution: 'temurin'
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build JAR dist files
README.md
+1 -1
View File
@@ -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 16`.
HyperLap2D is developed using IntelliJ IDEA. Needs `Java 17`.
1. Fork this repository
2. Clone with `--recurse-submodules` flag
assets/plugins/plugin-9patch-0.1.0.jar
BIN
View File
Binary file not shown.
assets/plugins/plugin-performance-0.1.0.jar
BIN
View File
Binary file not shown.
assets/plugins/plugin-skin-composer-0.1.0.jar
BIN
View File
Binary file not shown.
assets/plugins/plugin-tiled-0.1.0.jar
BIN
View File
Binary file not shown.
build.gradle
+3 -2
View File
@@ -166,10 +166,11 @@ runtime {
imageOptions += ["--icon", file("icons/icon.ico")]
installerType = 'msi'
installerOptions += ['--win-dir-chooser', '--win-menu', '--win-menu-group', 'HyperLap2D',
'--win-shortcut', '--vendor', 'Red & Black Games',
'--win-shortcut', '--win-shortcut-prompt', '--vendor', 'Red & Black Games',
'--description', 'HyperLap2D Editor',
'--temp', "$buildDir/installer",
'--win-upgrade-uuid', 'e5f64fb6-111f-41f3-8f33-03b90e1a3a32']
'--win-upgrade-uuid', 'e5f64fb6-111f-41f3-8f33-03b90e1a3a32',
"--icon", file("icons/icon.ico")]
resourceDir = file("resources-windows")
} else if (osName.contains('linux')) {
imageOptions += ["--icon", file("icons/HyperLap2D.png")]
src/main/java/games/rednblack/editor/controller/BootstrapInfoCommand.java
+1 -1
View File
@@ -20,6 +20,6 @@ public class BootstrapInfoCommand extends SimpleCommand {
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"));
HyperLog.info("JVM Version: " + System.getProperty("java.version") + " (" + System.getProperty("java.vendor") + ")");
}
}