From ce00aac748c194e82704f8069287527f524dcea4 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 31 Aug 2026 18:46:06 +0200 Subject: [PATCH] Remove unnessary args after Kotlin 2.4 upgrade See gh-37074 --- .../main/java/org/springframework/build/KotlinConventions.java | 3 +-- framework-docs/framework-docs.gradle | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java b/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java index 57dd0dcf032..b6c181b713e 100644 --- a/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java @@ -53,8 +53,7 @@ public class KotlinConventions { "-Xsuppress-version-warnings", "-Xjsr305=strict", // For dependencies using JSR 305 "-opt-in=kotlin.RequiresOptIn", - "-Xjdk-release=17", // Needed due to https://youtrack.jetbrains.com/issue/KT-49746 - "-Xannotation-default-target=param-property" // Preferred behavior, default with Kotlin language version set to 2.4+, see https://youtrack.jetbrains.com/issue/KT-73255 + "-Xjdk-release=17" // Needed due to https://youtrack.jetbrains.com/issue/KT-49746 ); }); } diff --git a/framework-docs/framework-docs.gradle b/framework-docs/framework-docs.gradle index a4cd3851a58..6edcd83434f 100644 --- a/framework-docs/framework-docs.gradle +++ b/framework-docs/framework-docs.gradle @@ -54,7 +54,6 @@ tasks.withType(KotlinCompilationTask.class).configureEach { compilerOptions.jvmTarget = JvmTarget.JVM_17 compilerOptions.freeCompilerArgs.addAll( "-Xjdk-release=17", // Needed due to https://youtrack.jetbrains.com/issue/KT-49746 - "-Xannotation-default-target=param-property" // Upcoming default, see https://youtrack.jetbrains.com/issue/KT-73255 ) }