Skip to content
This repository was archived by the owner on Aug 30, 2026. It is now read-only.

Commit c64dfc2

Browse files
committed
Use Java 8 for RFG decompile worker in Actions
1 parent 4f20af3 commit c64dfc2

6 files changed

Lines changed: 22 additions & 3 deletions

File tree

.github/workflows/release.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ jobs:
3131
with:
3232
fetch-depth: 0
3333

34+
- name: 设置 JDK 8
35+
uses: actions/setup-java@v4
36+
with:
37+
distribution: temurin
38+
java-version: "8"
39+
3440
- name: 设置 JDK 17
3541
uses: actions/setup-java@v4
3642
with:
@@ -93,9 +99,10 @@ jobs:
9399
chmod +x gradlew
94100
echo "JAVA_HOME=$JAVA_HOME"
95101
echo "CI_JDK=$CI_JDK"
102+
echo "JAVA_HOME_8_X64=$JAVA_HOME_8_X64"
96103
echo "JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS:-}"
97104
java -version
98-
./gradlew --no-daemon --stacktrace -Dorg.gradle.java.home="$CI_JDK" -Dorg.gradle.java.installations.paths="$CI_JDK" reobfJar
105+
./gradlew --no-daemon --stacktrace -Paccountsx.rfg.fg23JavaVersion=8 -Dorg.gradle.java.home="$CI_JDK" -Dorg.gradle.java.installations.paths="$JAVA_HOME_8_X64,$CI_JDK" reobfJar
99106
100107
- name: 查找构建产物
101108
id: artifacts

build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,11 @@ tasks.withType(JavaCompile).configureEach {
322322
}
323323

324324
tasks.withType(com.gtnewhorizons.retrofuturagradle.mcp.DecompileTask).configureEach {
325+
def fg23JavaVersion = providers.gradleProperty('accountsx.rfg.fg23JavaVersion')
326+
.map { it.toInteger() }
327+
.orElse(17)
325328
java8Launcher = javaToolchains.launcherFor {
326-
languageVersion = JavaLanguageVersion.of(17)
329+
languageVersion = JavaLanguageVersion.of(fg23JavaVersion.get())
327330
}
328331
java17Launcher = javaToolchains.launcherFor {
329332
languageVersion = JavaLanguageVersion.of(17)

gradle/jdk17-ignore/bin/java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
#!/bin/sh
2+
if [ -x /data/data/com.termux/files/usr/lib/jvm/java-17-openjdk/bin/java ]; then
3+
exec /data/data/com.termux/files/usr/lib/jvm/java-17-openjdk/bin/java -XX:+IgnoreUnrecognizedVMOptions "$@"
4+
fi
25
exec java -XX:+IgnoreUnrecognizedVMOptions "$@"

gradle/jdk17-ignore/bin/javac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
#!/bin/sh
2+
if [ -x /data/data/com.termux/files/usr/lib/jvm/java-17-openjdk/bin/javac ]; then
3+
exec /data/data/com.termux/files/usr/lib/jvm/java-17-openjdk/bin/javac "$@"
4+
fi
25
exec javac "$@"

gradle/jdk17-ignore/bin/javadoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
#!/bin/sh
2+
if [ -x /data/data/com.termux/files/usr/lib/jvm/java-17-openjdk/bin/javadoc ]; then
3+
exec /data/data/com.termux/files/usr/lib/jvm/java-17-openjdk/bin/javadoc "$@"
4+
fi
25
exec javadoc "$@"

gradle/jdk17-ignore/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
JAVA_VERSION="17"
22
JAVA_RUNTIME_VERSION="17"
3-
IMPLEMENTOR="PATH"
3+
IMPLEMENTOR="AccountsX"

0 commit comments

Comments
 (0)