Use named(Spec) method where applicable

Author: marcphilipp

documentation/documentation.gradle.kts

@@ -383,8 +383,10 @@ tasks {
 			val moduleSourcePathOption = addPathOption("-module-source-path")
 			moduleSourcePathOption.value = modularProjects.map { it.file("src/module") }
 			moduleSourcePathOption.value.forEach { inputs.dir(it) }
-			addOption(ModuleSpecificJavadocFileOption("-patch-module", modularProjects.associate {
-				it.javaModuleName to files(it.sourceSets.matching { it.name.startsWith("main") }.map { it.allJava.srcDirs }).asPath
+			addOption(ModuleSpecificJavadocFileOption("-patch-module", modularProjects.associate { project ->
+				project.javaModuleName to files(
+					project.sourceSets.named { it.startsWith("main") }.map { it.allJava.srcDirs }
+				).asPath
 			}))
 			addStringOption("-add-modules", "info.picocli")
 			addOption(ModuleSpecificJavadocFileOption("-add-reads", mapOf(
@@ -394,7 +396,9 @@ tasks {
 			)))
 		}
 
-		source(modularProjects.map { files(it.sourceSets.matching { it.name.startsWith("main") }.map { it.allJava }) })
+		source(modularProjects.map { project ->
+			files(project.sourceSets.named { it.startsWith("main") }.map { it.allJava })
+		})
 		classpath = files(modularProjects.map { it.sourceSets.main.get().compileClasspath })
 
 		maxMemory = "1024m"

gradle/plugins/common/src/main/kotlin/junitbuild.java-library-conventions.gradle.kts

@@ -155,7 +155,7 @@ val allMainClasses by tasks.registering {
 
 val prepareModuleSourceDir by tasks.registering(Sync::class) {
     from(moduleSourceDir)
-    from(sourceSets.matching { it.name.startsWith("main") }.map { it.allJava })
+    from(sourceSets.named { it.startsWith("main") }.map { it.allJava })
     into(combinedModuleSourceDir.map { it.dir(javaModuleName) })
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }

gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts

@@ -12,8 +12,8 @@ val projectDescription = objects.property<String>().convention(provider { projec
 // This task enhances `jar` and `shadowJar` tasks with the bnd
 // `BundleTaskExtension` extension which allows for generating OSGi
 // metadata into the jar
-tasks.withType<Jar>().matching { task: Jar ->
-	task.name == "jar" || task.name == "shadowJar"
+tasks.withType<Jar>().named {
+	it == "jar" || it == "shadowJar"
 }.all { // configure tasks eagerly as workaround for https://github.com/bndtools/bnd/issues/5695
 	extra["importAPIGuardian"] = importAPIGuardian
 

junit-vintage-engine/junit-vintage-engine.gradle.kts

@@ -74,7 +74,7 @@ tasks {
 			!it.name.startsWith("junit-4")
 		}
 	}
-	withType<Test>().matching { it.name != testWithoutJUnit4.name }.configureEach {
+	withType<Test>().named { it != testWithoutJUnit4.name }.configureEach {
 		(options as JUnitPlatformOptions).apply {
 			excludeTags("missing-junit4")
 		}