Fix caching of relevant tasks

Author: rubensousa

projectguard/src/main/kotlin/com/rubensousa/projectguard/plugin/ProjectGuardExtension.kt

@@ -30,7 +30,6 @@ import com.rubensousa.projectguard.plugin.internal.ReportSpec
 import com.rubensousa.projectguard.plugin.internal.getDependencyPath
 import org.gradle.api.Action
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
-import org.gradle.api.internal.provider.DefaultProvider
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.listProperty
@@ -46,15 +45,6 @@ abstract class ProjectGuardExtension @Inject constructor(
     private val dependencyRestrictionSpecs = objects.listProperty<DependencyRestrictionSpec>()
     private val reportSpec = objects.property<ReportSpec>().convention(ReportSpec(showLibrariesInGraph = false))
     private val options = objects.property<PluginOptions>().convention(PluginOptions(lifecycleTask = null))
-    private val specProvider = DefaultProvider {
-        ProjectGuardSpec(
-            guardSpecs = guardSpecs.get(),
-            moduleRestrictionSpecs = moduleRestrictionSpecs.get(),
-            dependencyRestrictionSpecs = dependencyRestrictionSpecs.get(),
-            reportSpec = reportSpec.get(),
-            options = options.get()
-        )
-    }
 
     override fun restrictModule(modulePath: String, action: Action<ModuleRestrictionScope>) {
         val scope = ModuleRestrictionScopeImpl()
@@ -146,11 +136,13 @@ abstract class ProjectGuardExtension @Inject constructor(
     }
 
     internal fun getSpec(): ProjectGuardSpec {
-        return getSpecProvider().get()
-    }
-
-    internal fun getSpecProvider(): Provider<ProjectGuardSpec> {
-        return specProvider
+        return ProjectGuardSpec(
+            guardSpecs = guardSpecs.get(),
+            moduleRestrictionSpecs = moduleRestrictionSpecs.get(),
+            dependencyRestrictionSpecs = dependencyRestrictionSpecs.get(),
+            reportSpec = reportSpec.get(),
+            options = options.get()
+        )
     }
 
 }

projectguard/src/main/kotlin/com/rubensousa/projectguard/plugin/ProjectGuardPlugin.kt

@@ -292,7 +292,7 @@ class ProjectGuardPlugin : Plugin<Project> {
         ) {
             group = "verification"
             description = "Verifies if there are any dependency restrictions"
-            pluginSpec.set(extension.getSpecProvider())
+            pluginSpec.set(project.provider { extension.getSpec() })
             outputs.upToDateWhen { false }
         }
     }
@@ -307,7 +307,7 @@ class ProjectGuardPlugin : Plugin<Project> {
         ) {
             group = "verification"
             description = "Verifies if there are any dependency restrictions"
-            pluginSpec.set(extension.getSpecProvider())
+            pluginSpec.set(project.provider { extension.getSpec() })
             outputs.upToDateWhen { false }
         }
     }
@@ -323,7 +323,7 @@ class ProjectGuardPlugin : Plugin<Project> {
             group = "other"
             description = "Generates a JSON report of all dependency restrictions for this module."
             projectPath.set(project.path)
-            specProperty.set(extension.getSpecProvider())
+            specProperty.set(project.provider { extension.getSpec() })
             outputFile.set(
                 project.layout.buildDirectory.file(jsonReportFilePath)
             )

projectguard/src/main/kotlin/com/rubensousa/projectguard/plugin/internal/task/TaskDependencyDump.kt

@@ -25,11 +25,13 @@ import com.rubensousa.projectguard.plugin.internal.report.JsonFileWriter
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import java.io.File
 
+@CacheableTask
 internal abstract class TaskDependencyDump : DefaultTask() {
 
     @get:Input

projectguard/src/main/kotlin/com/rubensousa/projectguard/plugin/internal/task/TaskRestrictionDump.kt

@@ -30,6 +30,7 @@ import kotlinx.serialization.json.Json
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputFile
@@ -38,6 +39,7 @@ import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import java.io.File
 
+@CacheableTask
 internal abstract class TaskRestrictionDump : DefaultTask() {
 
     @get:Input

projectguard/src/test/kotlin/com/rubensousa/projectguard/plugin/PluginCacheTest.kt

@@ -66,7 +66,6 @@ class PluginCacheTest {
         assertThat(nextResult).isEqualTo(TaskOutcome.UP_TO_DATE)
     }
 
-    @Ignore("Not working at the moment")
     @Test
     fun `outputs from projectGuardDependencyDump are re-used from cache`() {
         // given
@@ -119,7 +118,7 @@ class PluginCacheTest {
         assertThat(result).isEqualTo(TaskOutcome.UP_TO_DATE)
     }
 
-    @Ignore("Not working at the moment")
+    @Ignore("Not working for now")
     @Test
     fun `outputs from projectGuardAggregateDependencyDump are re-used from cache`() {
         // given
@@ -170,7 +169,6 @@ class PluginCacheTest {
         assertThat(result).isEqualTo(TaskOutcome.UP_TO_DATE)
     }
 
-    @Ignore("Not working at the moment")
     @Test
     fun `outputs from projectGuardRestrictionDump are cached`() {
         // given