将构建项目所需的最低 JDK 版本升级至 11 (#3805)

This commit is contained in:
Glavo 2025-04-29 09:52:06 +08:00 committed by GitHub
parent d70712a18f
commit 75d0ec34f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 19 deletions

View File

@ -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

View File

@ -95,11 +95,6 @@ val java11 = sourceSets.create("java11") {
}
tasks.getByName<JavaCompile>(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"

View File

@ -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))
}
}
}

View File

@ -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)

View File

@ -41,7 +41,7 @@ HMCL 有着强大的跨平台能力。它不仅支持 Windows、Linux、macOS
如果你想提交一个 Pull Request必须遵守如下要求
* IDEIntelliJ 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 选项 (用于调试)

View File

@ -41,7 +41,7 @@ HMCL 有著強大的跨平臺能力。它不僅支援 Windows、Linux、macOS
如果你想提交一個 Pull Request必須遵守如下要求
* IDEIntelliJ 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 選項 (用於除錯)