Skip to content

Commit b3f9d69

Browse files
committed
Update gradle toolchain to Java 21
1 parent 1e93aa5 commit b3f9d69

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

.github/workflows/build-common.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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/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

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

Lines changed: 1 addition & 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

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

Lines changed: 1 addition & 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

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

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

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

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)