Skip to content

Commit 5dc0436

Browse files
authored
misc: add -Xjdk-release=1.8 everywhere we set jvmTarget (#1618)
1 parent 8e060eb commit 5dc0436

File tree

6 files changed

+13
-0
lines changed

6 files changed

+13
-0
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"id": "91619ed5-0056-4f22-8863-8dd35b7a3c21",
3+
"type": "bugfix",
4+
"description": "Enable building this project on JDK21 by setting -Xjdk-release flag",
5+
"issues": [
6+
"https://github.com/smithy-lang/smithy-kotlin/issues/1295"
7+
]
8+
}

aws-runtime/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ subprojects {
6363
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
6464
compilerOptions {
6565
jvmTarget.set(JvmTarget.JVM_1_8)
66+
freeCompilerArgs.add("-Xjdk-release=1.8")
6667
freeCompilerArgs.add("-Xexpect-actual-classes")
6768
}
6869
}

codegen/aws-sdk-codegen/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ val generateSdkRuntimeVersion by tasks.registering {
6060
tasks.withType<KotlinCompile> {
6161
compilerOptions {
6262
jvmTarget.set(JvmTarget.JVM_17)
63+
freeCompilerArgs.add("-Xjdk-release=17")
6364
}
6465
dependsOn(generateSdkRuntimeVersion)
6566
}

dokka-aws/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ tasks.withType<Test>().configureEach {
3535
tasks.withType<KotlinCompile> {
3636
compilerOptions {
3737
jvmTarget.set(JvmTarget.JVM_1_8)
38+
freeCompilerArgs.add("-Xjdk-release=1.8")
3839
allWarningsAsErrors.set(false) // FIXME Dokka bundles stdlib into the classpath, causing an unfixable warning
3940
}
4041
}

hll/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ subprojects {
8686
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
8787
compilerOptions {
8888
jvmTarget.set(JvmTarget.JVM_1_8)
89+
freeCompilerArgs.add("-Xjdk-release=1.8")
8990
freeCompilerArgs.add("-Xexpect-actual-classes")
9091
}
9192
}

services/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ subprojects {
131131
compilerOptions {
132132
allWarningsAsErrors.set(false) // FIXME Tons of errors occur in generated code
133133
jvmTarget.set(JvmTarget.JVM_1_8) // fixes outgoing variant metadata: https://github.com/smithy-lang/smithy-kotlin/issues/258
134+
freeCompilerArgs.add("-Xjdk-release=1.8")
134135
}
135136
}
136137

0 commit comments

Comments
 (0)