Skip to content

Commit 448fef0

Browse files
xiang17xiang17
authored
Update gradle toolchain to Java 21 (microsoft#4519)
1 parent 2f5dfcf commit 448fef0

File tree

9 files changed

+30
-18
lines changed

9 files changed

+30
-18
lines changed

‎.github/workflows/build-common.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-java@v5
2323
with:
2424
distribution: temurin
25-
java-version: 17
25+
java-version: 21
2626

2727
- name: Setup Gradle
2828
uses: gradle/actions/setup-gradle@v5
@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/setup-java@v5
4747
with:
4848
distribution: temurin
49-
java-version: 17
49+
java-version: 21
5050

5151
- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
5252
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
@@ -90,7 +90,7 @@ jobs:
9090
uses: actions/setup-java@v5
9191
with:
9292
distribution: temurin
93-
java-version: 17
93+
java-version: 21
9494

9595
- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
9696
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
@@ -160,7 +160,7 @@ jobs:
160160
uses: actions/setup-java@v5
161161
with:
162162
distribution: temurin
163-
java-version: 17
163+
java-version: 21
164164

165165
- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
166166
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''
@@ -228,11 +228,11 @@ jobs:
228228
steps:
229229
- uses: actions/checkout@v5
230230

231-
- name: Set up Java 17
231+
- name: Set up Java 21
232232
uses: actions/setup-java@v5
233233
with:
234234
distribution: temurin
235-
java-version: 17
235+
java-version: 21
236236

237237
- name: Build and install local azure-monitor-opentelemetry-autoconfigure dependency
238238
if: env.AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT != ''

‎.github/workflows/codeql-daily.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v5
2222

23-
- name: Set up Java 17
23+
- name: Set up Java 21
2424
uses: actions/setup-java@v5
2525
with:
2626
distribution: temurin
27-
java-version: 17
27+
java-version: 21
2828

2929
- name: Setup Gradle
3030
uses: gradle/actions/setup-gradle@v5
@@ -54,11 +54,11 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@v5
5656

57-
- name: Set up Java 17 (required for JNI compilation)
57+
- name: Set up Java 21 (required for JNI compilation)
5858
uses: actions/setup-java@v5
5959
with:
6060
distribution: temurin
61-
java-version: 17
61+
java-version: 21
6262

6363
- name: Setup Visual Studio Build Tools
6464
uses: microsoft/setup-msbuild@v2

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/setup-java@v5
3232
with:
3333
distribution: temurin
34-
java-version: 17
34+
java-version: 21
3535

3636
- name: Setup Gradle
3737
uses: gradle/actions/setup-gradle@v5

‎.github/workflows/owasp-dependency-check-daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v5
1515

16-
- name: Set up Java 17
16+
- name: Set up Java 21
1717
uses: actions/setup-java@v5
1818
with:
1919
distribution: temurin
20-
java-version: 17
20+
java-version: 21
2121

2222
- name: Setup Gradle
2323
uses: gradle/actions/setup-gradle@v5

‎.github/workflows/perf-test_daily.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/setup-java@v5
1717
with:
1818
distribution: temurin
19-
java-version: 17
19+
java-version: 21
2020

2121
- name: Setup Gradle
2222
uses: gradle/actions/setup-gradle@v5

‎buildSrc/src/main/kotlin/ai.java-conventions.gradle.kts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repositories {
1919

2020
java {
2121
toolchain {
22-
languageVersion.set(JavaLanguageVersion.of(17))
22+
languageVersion.set(JavaLanguageVersion.of(21))
2323
}
2424

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

‎buildSrc/src/main/kotlin/ai.smoke-test.gradle.kts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ configurations["smokeTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.ge
2424
// FIXME (trask) copy-pasted from ai.java-conventions.gradle
2525
java {
2626
toolchain {
27-
languageVersion.set(JavaLanguageVersion.of(17))
27+
languageVersion.set(JavaLanguageVersion.of(21))
2828
}
2929

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

‎smoke-tests/apps/DiagnosticExtension/MockExtension/build.gradle.kts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@ dependencies {
1010

1111
java {
1212
toolchain {
13-
languageVersion.set(JavaLanguageVersion.of(17))
13+
languageVersion.set(JavaLanguageVersion.of(21))
1414
}
1515
}
1616

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

‎smoke-tests/apps/Diagnostics/JfrFileReader/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88

99
java {
1010
toolchain {
11-
languageVersion.set(JavaLanguageVersion.of(17))
11+
languageVersion.set(JavaLanguageVersion.of(21))
1212
}
1313
}
1414

0 commit comments

Comments
 (0)