Revert "fix: Add -Xjdk-release=1.8 everywhere we set jvmTarget (#1297)"

lauzadis · lauzadis · commit f26d7a648f9e · 2025-06-20T13:31:28.000-04:00
This reverts commit fff09ff.
diff --git a/.changes/ba2b99b0-d583-472a-894a-9e56784eda75.json b/.changes/ba2b99b0-d583-472a-894a-9e56784eda75.json
diff --git a/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts b/codegen/smithy-kotlin-codegen-testutils/build.gradle.kts
@@ -35,7 +35,6 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
-        freeCompilerArgs.add("-Xjdk-release=1.8")
         freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
 }
diff --git a/codegen/smithy-kotlin-codegen/build.gradle.kts b/codegen/smithy-kotlin-codegen/build.gradle.kts
@@ -58,7 +58,6 @@ val generateSdkRuntimeVersion by tasks.registering {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
-        freeCompilerArgs.add("-Xjdk-release=1.8")
         freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
     dependsOn(generateSdkRuntimeVersion)
diff --git a/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/ShapeExt.kt b/codegen/smithy-kotlin-codegen/src/main/kotlin/software/amazon/smithy/kotlin/codegen/model/ShapeExt.kt
@@ -21,7 +21,6 @@ import software.amazon.smithy.rulesengine.language.EndpointRuleSet
 import software.amazon.smithy.rulesengine.traits.EndpointRuleSetTrait
 import software.amazon.smithy.rulesengine.traits.EndpointTestCase
 import software.amazon.smithy.rulesengine.traits.EndpointTestsTrait
-import java.util.stream.Collectors
 
 /**
  * Get all shapes of a particular type from the model.
@@ -33,7 +32,7 @@ import java.util.stream.Collectors
  * shape's closure for example)
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-inline fun <reified T : Shape> Model.shapes(): List<T> = shapes(T::class.java).collect(Collectors.toList())
+inline fun <reified T : Shape> Model.shapes(): List<T> = shapes(T::class.java).toList()
 
 /**
  * Extension function to return a shape of expected type.
diff --git a/dokka-smithy/build.gradle.kts b/dokka-smithy/build.gradle.kts
@@ -34,7 +34,6 @@ tasks.test {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
-        freeCompilerArgs.add("-Xjdk-release=1.8")
         allWarningsAsErrors.set(false) // FIXME Dokka bundles stdlib into the classpath, causing an unfixable warning
     }
 }
diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts
@@ -65,7 +65,6 @@ subprojects {
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_1_8)
-            freeCompilerArgs.add("-Xjdk-release=1.8")
             freeCompilerArgs.add("-Xexpect-actual-classes")
         }
     }
diff --git a/tests/integration/slf4j-1x-consumer/build.gradle.kts b/tests/integration/slf4j-1x-consumer/build.gradle.kts
@@ -33,7 +33,6 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
-        freeCompilerArgs.add("-Xjdk-release=1.8")
     }
 }
 
diff --git a/tests/integration/slf4j-2x-consumer/build.gradle.kts b/tests/integration/slf4j-2x-consumer/build.gradle.kts
@@ -23,7 +23,6 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
-        freeCompilerArgs.add("-Xjdk-release=1.8")
     }
 }
 
diff --git a/tests/integration/slf4j-hybrid-consumer/build.gradle.kts b/tests/integration/slf4j-hybrid-consumer/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
 tasks.withType<KotlinCompile> {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
-        freeCompilerArgs.add("-Xjdk-release=1.8")
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ dependencies {`
`35`	`35`	`tasks.withType<KotlinCompile> {`
`36`	`36`	`compilerOptions {`
`37`	`37`	`jvmTarget.set(JvmTarget.JVM_1_8)`
`38`		`- freeCompilerArgs.add("-Xjdk-release=1.8")`
`39`	`38`	`freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")`
`40`	`39`	`}`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ val generateSdkRuntimeVersion by tasks.registering {`
`58`	`58`	`tasks.withType<KotlinCompile> {`
`59`	`59`	`compilerOptions {`
`60`	`60`	`jvmTarget.set(JvmTarget.JVM_1_8)`
`61`		`- freeCompilerArgs.add("-Xjdk-release=1.8")`
`62`	`61`	`freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")`
`63`	`62`	`}`
`64`	`63`	`dependsOn(generateSdkRuntimeVersion)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ tasks.test {`
`34`	`34`	`tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {`
`35`	`35`	`compilerOptions {`
`36`	`36`	`jvmTarget.set(JvmTarget.JVM_1_8)`
`37`		`- freeCompilerArgs.add("-Xjdk-release=1.8")`
`38`	`37`	`allWarningsAsErrors.set(false) // FIXME Dokka bundles stdlib into the classpath, causing an unfixable warning`
`39`	`38`	`}`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ subprojects {`
`65`	`65`	`tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {`
`66`	`66`	`compilerOptions {`
`67`	`67`	`jvmTarget.set(JvmTarget.JVM_1_8)`
`68`		`- freeCompilerArgs.add("-Xjdk-release=1.8")`
`69`	`68`	`freeCompilerArgs.add("-Xexpect-actual-classes")`
`70`	`69`	`}`
`71`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ dependencies {`
`33`	`33`	`tasks.withType<KotlinCompile> {`
`34`	`34`	`compilerOptions {`
`35`	`35`	`jvmTarget.set(JvmTarget.JVM_1_8)`
`36`		`- freeCompilerArgs.add("-Xjdk-release=1.8")`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ dependencies {`
`23`	`23`	`tasks.withType<KotlinCompile> {`
`24`	`24`	`compilerOptions {`
`25`	`25`	`jvmTarget.set(JvmTarget.JVM_1_8)`
`26`		`- freeCompilerArgs.add("-Xjdk-release=1.8")`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ dependencies {`
`24`	`24`	`tasks.withType<KotlinCompile> {`
`25`	`25`	`compilerOptions {`
`26`	`26`	`jvmTarget.set(JvmTarget.JVM_1_8)`
`27`		`- freeCompilerArgs.add("-Xjdk-release=1.8")`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`