@@ -26,20 +26,22 @@ import io.papermc.paperweight.checkstyle.tasks.MergeCheckstyleConfigs
2626import io.papermc.paperweight.checkstyle.tasks.PaperCheckstyleTask
2727import io.papermc.paperweight.util.*
2828import io.papermc.paperweight.util.constants.*
29- import io.papermc.paperweight.util.path
3029import javax.inject.Inject
31- import kotlin.io.path.readText
3230import org.gradle.api.Plugin
3331import org.gradle.api.Project
3432import org.gradle.api.file.ProjectLayout
3533import org.gradle.api.plugins.quality.CheckstyleExtension
34+ import org.gradle.api.provider.ProviderFactory
3635import org.gradle.kotlin.dsl.*
3736
3837abstract class PaperCheckstyle : Plugin <Project > {
3938
4039 @get:Inject
4140 abstract val layout: ProjectLayout
4241
42+ @get:Inject
43+ abstract val providers: ProviderFactory
44+
4345 override fun apply (target : Project ) {
4446 val ext = target.extensions.create<PaperCheckstyleExt >(PAPER_CHECKSTYLE_EXTENSION )
4547 target.plugins.apply (PaperCheckstylePlugin ::class .java)
@@ -52,8 +54,16 @@ abstract class PaperCheckstyle : Plugin<Project> {
5254
5355 target.tasks.withType(PaperCheckstyleTask ::class .java).configureEach {
5456 rootPath.convention(layout.settingsDirectory.asFile.path)
55- directoriesToSkip.convention(ext.directoriesToSkipFile.map { it.path.readText().trim().split(" \n " ).toSet() })
56- typeUseAnnotations.convention(ext.typeUseAnnotationsFile.map { it.path.readText().trim().split(" \n " ) })
57+ directoriesToSkip.convention(
58+ providers.fileContents(ext.directoriesToSkipFile).asText.map {
59+ it.trim().lines().map { line -> line.trim() }
60+ }
61+ )
62+ typeUseAnnotations.convention(
63+ providers.fileContents(ext.typeUseAnnotationsFile).asText.map {
64+ it.trim().lines().map { line -> line.trim() }
65+ }
66+ )
5767 customJavadocTags.convention(ext.customJavadocTags)
5868 configOverride.convention(mergeCheckstyleConfigs.flatMap { it.mergedConfigFile })
5969 reports.xml.required.convention(true )
0 commit comments