Merge branch '6.1.x'

This commit is contained in:
Sam Brannen 2024-08-07 18:26:13 +03:00
commit b0999641dd
1 changed files with 7 additions and 0 deletions

View File

@ -69,6 +69,13 @@ eclipse.classpath.file.whenMerged {
}
}
// Remove Java 21 classpath entries, since we currently use Java 17
// within Eclipse. Consequently, Java 21 features managed via the
// me.champeau.mrjar plugin cannot be built or tested within Eclipse.
eclipse.classpath.file.whenMerged { classpath ->
classpath.entries.removeAll { it.path =~ /src\/(main|test)\/java21/ }
}
// Remove classpath entries for non-existent libraries added by the me.champeau.mrjar
// plugin, such as "spring-core/build/classes/kotlin/java21".
eclipse.classpath.file.whenMerged {