Support for multiple ignore files

open-toast · Dec 18, 2023 · a632015 · a632015
1 parent d2c9edb
commit a632015
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/plugin/src/main/kotlin/com/toasttab/expediter/gradle/ExpediterPlugin.kt b/plugin/src/main/kotlin/com/toasttab/expediter/gradle/ExpediterPlugin.kt
@@ -73,7 +73,7 @@ class ExpediterPlugin : Plugin<Project> {
 
             ignore = extension.ignoreSpec.buildIgnore()
 
-            ignoreFile = extension.ignoreSpec.file?.let(project::file)
+            ignoreFiles.from(extension.ignoreSpec.files)
 
             report = project.layout.buildDirectory.file("expediter.json").get().asFile
 

diff --git a/plugin/src/main/kotlin/com/toasttab/expediter/gradle/ExpediterTask.kt b/plugin/src/main/kotlin/com/toasttab/expediter/gradle/ExpediterTask.kt
@@ -34,7 +34,6 @@ import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
@@ -94,10 +93,9 @@ abstract class ExpediterTask : DefaultTask() {
     @get:PathSensitive(PathSensitivity.RELATIVE)
     abstract val typeDescriptors: ConfigurableFileCollection
 
-    @InputFile
-    @PathSensitive(PathSensitivity.RELATIVE)
-    @Optional
-    var ignoreFile: File? = null
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val ignoreFiles: ConfigurableFileCollection
 
     @Input
     var failOnIssues: Boolean = false
@@ -136,11 +134,11 @@ abstract class ExpediterTask : DefaultTask() {
             providers.add(PlatformClassloaderTypeProvider)
         }
 
-        val ignores = ignoreFile?.let {
+        val ignores = ignoreFiles.flatMap {
             it.inputStream().buffered().use {
-                IssueReport.fromJson(it)
-            }.issues.toSet()
-        } ?: setOf()
+                IssueReport.fromJson(it).issues
+            }
+        }.toSet()
 
         val issues = Expediter(
             ignore,

diff --git a/plugin/src/main/kotlin/com/toasttab/expediter/gradle/config/IgnoreSpec.kt b/plugin/src/main/kotlin/com/toasttab/expediter/gradle/config/IgnoreSpec.kt
@@ -1,12 +1,27 @@
 package com.toasttab.expediter.gradle.config
 
 import com.toasttab.expediter.ignore.Ignore
+import org.slf4j.LoggerFactory
 
 class IgnoreSpec {
+    companion object {
+        private val LOGGER = LoggerFactory.getLogger(PlatformSpec::class.java)
+    }
+
     var file: Any? = null
+        set(value) {
+            LOGGER.warn("file property is deprecated, use the file function instead: ignore { file('path') }")
+            value?.let(files::add)
+        }
+
+    val files = mutableListOf<Any>()
 
     val ignores = mutableListOf<Ignore>()
 
+    fun file(file: Any) {
+        files.add(file)
+    }
+
     fun targetStartsWith(vararg partial: String) = or(Ignore.TargetStartsWith(*partial))
 
     fun callerStartsWith(vararg partial: String) = or(Ignore.CallerStartsWith(*partial))