Merge branch '6.1.x'

sbrannen · sbrannen · commit b0999641dd3e · 2024-08-07T18:26:13.000+03:00
diff --git a/gradle/ide.gradle b/gradle/ide.gradle
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,13 @@ eclipse.classpath.file.whenMerged {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
	`72`	`+// Remove Java 21 classpath entries, since we currently use Java 17`
	`73`	`+// within Eclipse. Consequently, Java 21 features managed via the`
	`74`	`+// me.champeau.mrjar plugin cannot be built or tested within Eclipse.`
	`75`	`+eclipse.classpath.file.whenMerged { classpath ->`
	`76`	`+ classpath.entries.removeAll { it.path =~ /src\/(main\|test)\/java21/ }`
	`77`	`+}`
	`78`	`+`
`72`	`79`	`// Remove classpath entries for non-existent libraries added by the me.champeau.mrjar`
`73`	`80`	`// plugin, such as "spring-core/build/classes/kotlin/java21".`
`74`	`81`	`eclipse.classpath.file.whenMerged {`