Skip to content

Update gradle toolchain to Java 21 #4519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 25, 2025
+30 −18
Merged

Update gradle toolchain to Java 21 #4519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3f9d69
Update gradle toolchain to Java 21
xiang17 Oct 24, 2025
df850d4
Update a few more JDK versions
xiang17 Oct 24, 2025
d213d41
Ignore warnings regarding Java 8 compilation warnings
xiang17 Oct 24, 2025
85b7b5a
remove JDK 21 check because it'll always be true from now on
xiang17 Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v5
Expand All @@ -46,7 +46,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
Expand Down Expand Up @@ -228,11 +228,11 @@ jobs:
steps:
- uses: actions/checkout@v5

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
steps:
- uses: actions/checkout@v5

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v5
Expand Down Expand Up @@ -54,11 +54,11 @@ jobs:
steps:
- uses: actions/checkout@v5

- name: Set up Java 17 (required for JNI compilation)
- name: Set up Java 21 (required for JNI compilation)
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Visual Studio Build Tools
uses: microsoft/setup-msbuild@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copilot-setup-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v5
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/owasp-dependency-check-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
steps:
- uses: actions/checkout@v5

- name: Set up Java 17
- name: Set up Java 21
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/perf-test_daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v5
Expand Down
6 changes: 5 additions & 1 deletion buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}

// See https://docs.gradle.org/current/userguide/upgrading_version_5.html, Automatic target JVM version
Expand All @@ -32,6 +32,10 @@ tasks.withType<JavaCompile>().configureEach {
with(options) {
release.set(8)
compilerArgs.add("-Werror")
// We need to support compiling to Java 8.
// Suppress obsolete source/target warning added in JDK 21 while retaining -Werror for everything else.
// This only disables the 'options' lint category (e.g., the obsolete source/target messages).
compilerArgs.add("-Xlint:-options")
}
}

Expand Down
6 changes: 5 additions & 1 deletion buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ configurations["smokeTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.ge
// FIXME (trask) copy-pasted from ai.java-conventions.gradle
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}

// See https://docs.gradle.org/current/userguide/upgrading_version_5.html, Automatic target JVM version
Expand All @@ -38,6 +38,10 @@ tasks.withType<JavaCompile>().configureEach {
with(options) {
release.set(8)
compilerArgs.add("-Werror")
// We need to support compiling to Java 8.
// Suppress obsolete source/target warning added in JDK 21 while retaining -Werror for everything else.
// This only disables the 'options' lint category (e.g., the obsolete source/target messages).
compilerArgs.add("-Xlint:-options")
}
}

Expand Down
6 changes: 5 additions & 1 deletion smoke-tests/apps/DiagnosticExtension/MockExtension/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,18 @@ dependencies {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

tasks.withType<JavaCompile>().configureEach {
with(options) {
release.set(8)
compilerArgs.add("-Werror")
// We need to support compiling to Java 8.
// Suppress obsolete source/target warning added in JDK 21 while retaining -Werror for everything else.
// This only disables the 'options' lint category (e.g., the obsolete source/target messages).
compilerArgs.add("-Xlint:-options")
}
}

Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/apps/Diagnostics/JfrFileReader/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

Expand Down