Skip to content

Commit f11f082

Browse files
committed
Add -Xjdk-release=1.8 everywhere we set jvmTarget
1 parent c4be558 commit f11f082

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

aws-runtime/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,15 @@ 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
}
70+
71+
// FIXME Do we need a separate `KotlinNativeCompile` configuration, is configuring KotlinCompile not enough?
6972
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {
7073
compilerOptions {
74+
freeCompilerArgs.add("-Xjdk-release=1.8")
7175
freeCompilerArgs.add("-Xexpect-actual-classes")
7276
}
7377
}

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,13 @@ 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
}
9293
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {
9394
compilerOptions {
95+
freeCompilerArgs.add("-Xjdk-release=1.8")
9496
freeCompilerArgs.add("-Xexpect-actual-classes")
9597
}
9698
}

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)