From 75d0ec34f51a22f1d138a0c8df601685815155fd Mon Sep 17 00:00:00 2001 From: Glavo Date: Tue, 29 Apr 2025 09:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=9E=84=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=89=80=E9=9C=80=E7=9A=84=E6=9C=80=E4=BD=8E=20JDK=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8D=87=E7=BA=A7=E8=87=B3=2011=20(#3805)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 4 ++-- HMCL/build.gradle.kts | 5 ----- HMCLCore/build.gradle.kts | 6 ------ README.md | 4 ++-- README_cn.md | 4 ++-- README_tw.md | 4 ++-- 6 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2a2217ec3..a8fa1e041 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 8 + java-version: '11' java-package: 'jdk+fx' - name: Build with Gradle run: ./gradlew build --no-daemon diff --git a/HMCL/build.gradle.kts b/HMCL/build.gradle.kts index 8375998fe..0fc736a04 100644 --- a/HMCL/build.gradle.kts +++ b/HMCL/build.gradle.kts @@ -95,11 +95,6 @@ val java11 = sourceSets.create("java11") { } tasks.getByName(java11.compileJavaTaskName) { - if (JavaVersion.current() < JavaVersion.VERSION_11) { - javaCompiler.set(javaToolchains.compilerFor { - languageVersion.set(JavaLanguageVersion.of(11)) - }) - } options.compilerArgs.add("--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED") sourceCompatibility = "11" targetCompatibility = "11" diff --git a/HMCLCore/build.gradle.kts b/HMCLCore/build.gradle.kts index f6f26e31b..0375bd957 100644 --- a/HMCLCore/build.gradle.kts +++ b/HMCLCore/build.gradle.kts @@ -18,10 +18,4 @@ dependencies { api("org.jsoup:jsoup:1.19.1") api("org.glavo:chardet:2.5.0") compileOnlyApi("org.jetbrains:annotations:26.0.1") - - if (JavaVersion.current().isJava8) { - org.gradle.internal.jvm.Jvm.current().toolsJar?.let { - compileOnly(files(it)) - } - } } diff --git a/README.md b/README.md index c5c2448ca..6f58226bd 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ The software is distributed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.h If you want to submit a pull request, here are some requirements: * IDE: IntelliJ IDEA -* Compiler: Java 1.8 or Java 11+ +* Compiler: Java 11+ * Do NOT modify `gradle` files ### Compilation @@ -52,7 +52,7 @@ Simply execute the following command in the project root directory: ./gradlew clean build ``` -Make sure you have at least JavaFX 8 installed. Liberica Full JDK 8 or later is recommended. +Make sure you have Java 11 or later installed. ## JVM Options (for debugging) diff --git a/README_cn.md b/README_cn.md index d4dc9e6bc..f525e973c 100644 --- a/README_cn.md +++ b/README_cn.md @@ -41,7 +41,7 @@ HMCL 有着强大的跨平台能力。它不仅支持 Windows、Linux、macOS 如果你想提交一个 Pull Request，必须遵守如下要求： * IDE：IntelliJ IDEA -* 编译器：Java 1.8 或 Java 11+ +* 编译器：Java 11+ * **不要**修改 `gradle` 相关文件 ### 编译 @@ -52,7 +52,7 @@ HMCL 有着强大的跨平台能力。它不仅支持 Windows、Linux、macOS ./gradlew clean build ``` -请确保你至少安装了含有 JavaFX 8 的 Java。建议使用 Liberica Full JDK 8 或更高版本。 +请确保你至少安装了 JDK 11 或更高版本。 ## JVM 选项 (用于调试) diff --git a/README_tw.md b/README_tw.md index e873f3416..c105354aa 100644 --- a/README_tw.md +++ b/README_tw.md @@ -41,7 +41,7 @@ HMCL 有著強大的跨平臺能力。它不僅支援 Windows、Linux、macOS 如果你想提交一個 Pull Request，必須遵守如下要求： * IDE：IntelliJ IDEA -* 編譯器：Java 1.8 或 Java 11+ +* 編譯器：Java 11+ * **不要**修改 `gradle` 相關文件 ### 編譯 @@ -52,7 +52,7 @@ HMCL 有著強大的跨平臺能力。它不僅支援 Windows、Linux、macOS ./gradlew clean build ``` -請確保你至少安裝了含有 JavaFX 8 的 Java。建議使用 Liberica Full JDK 8 或更高版本。 +請確保你至少安裝了 JDK 11 或更高版本。 ## JVM 選項 (用於除錯)