fix(agents): compile shared runtime with Java 21

This commit is contained in:
t8y2 committed 2026-07-30 02:24:27 +08:00
1 parent f8a4cc0564
commit 545c2c9e00
5 files changed
+7 -14

No files matched your search

+1 -3
View File
@@ -76,9 +76,7 @@ jobs:
- uses: actions/setup-java@v4 - uses: actions/setup-java@v4
with: with:
distribution: temurin distribution: temurin
java-version: | java-version: "21"
8
21
- uses: gradle/actions/setup-gradle@v4 - uses: gradle/actions/setup-gradle@v4
- run: ./gradlew shadowJar --parallel - run: ./gradlew shadowJar --parallel
working-directory: agents working-directory: agents
+1 -2
View File
@@ -2,7 +2,6 @@ plugins {
id 'com.gradleup.shadow' version '9.0.0-beta12' apply false id 'com.gradleup.shadow' version '9.0.0-beta12' apply false
} }
def java8Projects = ['common', 'test-support'] as Set
def infrastructureProjects = ['common', 'test-support'] as Set def infrastructureProjects = ['common', 'test-support'] as Set
def legacyStandaloneProjects = ['mongodb', 'kafka', 'rocketmq', 'rabbitmq'] as Set def legacyStandaloneProjects = ['mongodb', 'kafka', 'rocketmq', 'rabbitmq'] as Set
def agentProjects = subprojects.findAll { !infrastructureProjects.contains(it.name) } def agentProjects = subprojects.findAll { !infrastructureProjects.contains(it.name) }
@@ -23,7 +22,7 @@ subprojects {
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(java8Projects.contains(name) ? 8 : 21) languageVersion = JavaLanguageVersion.of(21)
} }
} }
+2 -4
View File
@@ -182,18 +182,16 @@ The root `build.gradle` convention derives the archive name from the module name
Default to: Default to:
```groovy ```groovy
def java8Projects = ['common', 'test-support'] as Set
subprojects { subprojects {
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(java8Projects.contains(name) ? 8 : 21) languageVersion = JavaLanguageVersion.of(21)
} }
} }
} }
``` ```
Most agents use JRE 21. If an agent needs a special runtime, update the root Gradle convention, the release workflow JRE detection logic, and document the reason in the module. All Java agent modules and shared infrastructure modules use Java 21. If an agent needs a special runtime, update the root Gradle convention, the release workflow JRE detection logic, and document the reason in the module.
## Tests ## Tests
+2 -4
View File
@@ -182,18 +182,16 @@ tasks.named('shadowJar') {
默认配置如下: 默认配置如下:
```groovy ```groovy
def java8Projects = ['common', 'test-support'] as Set
subprojects { subprojects {
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(java8Projects.contains(name) ? 8 : 21) languageVersion = JavaLanguageVersion.of(21)
} }
} }
} }
``` ```
大多数 Agent 使用 JRE 21。如果某个 Agent 需要特殊的运行时,请更新根 Gradle 约定、发布工作流的 JRE 检测逻辑,并在该模块中记录原因。 所有 Java Agent 和共享基础设施模块均使用 Java 21。如果某个 Agent 需要特殊的运行时,请更新根 Gradle 约定、发布工作流的 JRE 检测逻辑,并在该模块中记录原因。
## 测试 ## 测试
@@ -12,7 +12,7 @@ configure([project(':common'), project(':test-support')]) {
java { java {
toolchain { toolchain {
languageVersion = JavaLanguageVersion.of(8) languageVersion = JavaLanguageVersion.of(21)
} }
} }