Skip to content

Commit f9ce80b

Browse files
authored
Merge pull request #456 from rondlh/development
Support Java 21
2 parents d0b6d2d + 4d08d01 commit f9ce80b

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ jobs:
3939
run:
4040
export DISPLAY=:99
4141

42+
- name: Pull a JavaFX JDK
43+
run: wget https://cdn.azul.com/zulu/bin/zulu21.46.19-ca-fx-jdk21.0.9-linux_x64.tar.gz
44+
4245
- name: After JDK download, list directory contnts
4346
run: pwd; ls -la
4447

runMac.sh

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
22

33
export ARCH=x86_64
4-
JVM=zulu17.50.19-ca-fx-jdk17.0.11-macosx_x64
4+
JVM=zulu21.46.19-ca-fx-jdk21.0.9-macosx_x64
55
set -e
66
ZIP=$JVM.tar.gz
7-
export JAVA_HOME=$HOME/bin/java17/
7+
export JAVA_HOME=$HOME/bin/java21/
88
if test -d $JAVA_HOME/$JVM/; then
99
echo "$JAVA_HOME exists."
1010
else
@@ -21,20 +21,15 @@ echo "Java home set to $JAVA_HOME"
2121
./gradlew clean build --refresh-dependencies
2222
./gradlew shadowJar
2323

24-
$JAVA_HOME/bin/java -Dprism.forceGPU=true --add-exports \
25-
javafx.graphics/com.sun.javafx.css=ALL-UNNAMED \
26-
--add-exports \
27-
javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED \
28-
--add-exports \
29-
javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED \
30-
--add-exports \
31-
javafx.base/com.sun.javafx.event=ALL-UNNAMED \
32-
--add-exports \
33-
javafx.controls/com.sun.javafx.scene.control.skin.resources=ALL-UNNAMED \
34-
--add-exports \
35-
javafx.graphics/com.sun.javafx.util=ALL-UNNAMED \
36-
--add-exports \
37-
javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED \
38-
--add-opens \
39-
javafx.graphics/javafx.scene=ALL-UNNAMED \
24+
$JAVA_HOME/bin/java \
25+
-Dprism.forceGPU=true \
26+
-XX:MaxRAMPercentage=95 \
27+
--add-exports javafx.graphics/com.sun.javafx.css=ALL-UNNAMED \
28+
--add-exports javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED \
29+
--add-exports javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED \
30+
--add-exports javafx.base/com.sun.javafx.event=ALL-UNNAMED \
31+
--add-exports javafx.controls/com.sun.javafx.scene.control.skin.resources=ALL-UNNAMED \
32+
--add-exports javafx.graphics/com.sun.javafx.util=ALL-UNNAMED \
33+
--add-exports javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED \
34+
--add-opens javafx.graphics/javafx.scene=ALL-UNNAMED \
4035
-jar build/libs/BowlerStudio.jar

0 commit comments

Comments
 (0)