Stop using Java code snippets in Kotlin ones

As a preparation to using a Kotlin 2 baseline, this commit stops using
Java code snippets in Kotlin ones in order to avoid redeclaration
errors.

See gh-33629
This commit is contained in:
Sébastien Deleuze
2024-12-05 11:16:12 +01:00
parent edce3029a2
commit 58020ff0eb
16 changed files with 304 additions and 23 deletions

View File

@@ -41,6 +41,13 @@ repositories {
}
}
// To avoid a redeclaration error with Kotlin compiler
sourceSets {
main {
java.exclude("org/springframework/docs/**/*.java")
}
}
dependencies {
api(project(":spring-aspects"))
api(project(":spring-context"))
@@ -68,6 +75,7 @@ dependencies {
api("org.aspectj:aspectjweaver")
api("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
api("org.jetbrains.kotlin:kotlin-stdlib")
api("jakarta.websocket:jakarta.websocket-api")
implementation(project(":spring-core-test"))
implementation("org.assertj:assertj-core")