Skip to content

Commit fff09ff

Browse files
authored
fix: Add -Xjdk-release=1.8 everywhere we set jvmTarget (#1297)
1 parent 3f6fcde commit fff09ff

File tree

9 files changed

+17
-1
lines changed

9 files changed

+17
-1
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"id": "ba2b99b0-d583-472a-894a-9e56784eda75",
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+
}

codegen/smithy-kotlin-codegen-testutils/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ dependencies {
3535
tasks.withType<KotlinCompile> {
3636
compilerOptions {
3737
jvmTarget.set(JvmTarget.JVM_1_8)
38+
freeCompilerArgs.add("-Xjdk-release=1.8")
3839
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
3940
}
4041
}

codegen/smithy-kotlin-codegen/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ val generateSdkRuntimeVersion by tasks.registering {
5858
tasks.withType<KotlinCompile> {
5959
compilerOptions {
6060
jvmTarget.set(JvmTarget.JVM_1_8)
61+
freeCompilerArgs.add("-Xjdk-release=1.8")
6162
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
6263
}
6364
dependsOn(generateSdkRuntimeVersion)

codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/ShapeExt.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import software.amazon.smithy.rulesengine.language.EndpointRuleSet
2121
import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait
2222
import software.amazon.smithy.rulesengine.traits.EndpointTestCase
2323
import software.amazon.smithy.rulesengine.traits.EndpointTestsTrait
24+
import java.util.stream.Collectors
2425

2526
/**
2627
* Get all shapes of a particular type from the model.
@@ -32,7 +33,7 @@ import software.amazon.smithy.rulesengine.traits.EndpointTestsTrait
3233
* shape's closure for example)
3334
*/
3435
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
35-
inline fun <reified T : Shape> Model.shapes(): List<T> = shapes(T::class.java).toList()
36+
inline fun <reified T : Shape> Model.shapes(): List<T> = shapes(T::class.java).collect(Collectors.toList())
3637

3738
/**
3839
* Extension function to return a shape of expected type.

dokka-smithy/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ tasks.test {
3434
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
3535
compilerOptions {
3636
jvmTarget.set(JvmTarget.JVM_1_8)
37+
freeCompilerArgs.add("-Xjdk-release=1.8")
3738
allWarningsAsErrors.set(false) // FIXME Dokka bundles stdlib into the classpath, causing an unfixable warning
3839
}
3940
}

runtime/build.gradle.kts

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

tests/integration/slf4j-1x-consumer/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies {
3333
tasks.withType<KotlinCompile> {
3434
compilerOptions {
3535
jvmTarget.set(JvmTarget.JVM_1_8)
36+
freeCompilerArgs.add("-Xjdk-release=1.8")
3637
}
3738
}
3839

tests/integration/slf4j-2x-consumer/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies {
2323
tasks.withType<KotlinCompile> {
2424
compilerOptions {
2525
jvmTarget.set(JvmTarget.JVM_1_8)
26+
freeCompilerArgs.add("-Xjdk-release=1.8")
2627
}
2728
}
2829

tests/integration/slf4j-hybrid-consumer/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
tasks.withType<KotlinCompile> {
2525
compilerOptions {
2626
jvmTarget.set(JvmTarget.JVM_1_8)
27+
freeCompilerArgs.add("-Xjdk-release=1.8")
2728
}
2829
}
2930

0 commit comments

Comments
 (0)