From 46913bca91d324f3747a471cce293dd68f27a307 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 1 Sep 2026 09:54:16 +0200 Subject: [PATCH] Revert "Remove unnessary args after Kotlin 2.4 upgrade" This reverts commit ce00aac748c194e82704f8069287527f524dcea4. --- .../main/java/org/springframework/build/KotlinConventions.java | 3 ++- framework-docs/framework-docs.gradle | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java b/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java index b6c181b713e..57dd0dcf032 100644 --- a/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/KotlinConventions.java @@ -53,7 +53,8 @@ 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 + "-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 ); }); } diff --git a/framework-docs/framework-docs.gradle b/framework-docs/framework-docs.gradle index 6edcd83434f..a4cd3851a58 100644 --- a/framework-docs/framework-docs.gradle +++ b/framework-docs/framework-docs.gradle @@ -54,6 +54,7 @@ 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 ) }