Skip to content

Commit 15b66e8

Browse files
committed
Build with JDK21 and target JDK17
1 parent 2ada949 commit 15b66e8

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Java ${{ matrix.java }} ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
java: [17]
15+
java: [21]
1616
os: [macos-latest, ubuntu-latest]
1717

1818
steps:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ val Project.libs get() = the<org.gradle.accessors.dm.LibrariesForLibs>()
1919

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

2626
tasks.withType<JavaCompile>() {
2727
options.encoding = "UTF-8"
28+
options.release.set(17)
2829
}
2930

3031
tasks.withType<Javadoc>() {

examples/mcp-server/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,7 @@ tasks.assemble {
6060
dependsOn(tasks.shadowJar)
6161
}
6262

63+
java {
64+
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
65+
}
66+

mcp/mcp-cli/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ tasks.processResources {
5454
dependsOn(generateVersionFile)
5555
}
5656

57-
java {
58-
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
57+
tasks.withType<JavaCompile> {
58+
options.release.set(21)
5959
}
6060

6161
tasks.shadowJar {

mcp/mcp-server/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ java {
2222
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
2323
}
2424

25+
tasks {
26+
compileJava {
27+
options.release.set(21)
28+
}
29+
}
30+
2531
spotbugs {
2632
ignoreFailures = true
2733
}

0 commit comments

Comments
 (0)