Issue 1090: Update annotations on custom Tasks to enable strict plugin validation (#244)

Author: labkey-susanh

README.md

@@ -12,9 +12,13 @@ If you are making changes to the plugins, please see the [internal docs](https:/
 on how to do that, including how to develop and test locally and the versioning information.
 
 ## Release Notes
-### 8.2.0-SNAPSHOT
-*Released*: TBD
+
+### 8.2.0
+*Released*: 11 May 2026
 (Earliest compatible LabKey version: 26.5.0)
+- Add `BuildUtils.hasArtifactoryProperties` method for brevity
+- Add cacheability annotations to tasks so they work with stricter plugin validation
+- Update to Gradle 9.5.0
 
 ### 8.1.0
 *Released*: 22 April 2026

build.gradle

@@ -43,12 +43,7 @@ dependencies {
 }
 
 group = 'org.labkey.build'
-project.version = "8.2.0-SNAPSHOT"
-
-// Stricter plugin validation was added in 9.4.0. Disable it for now. TODO: Address complaints and remove.
-tasks.validatePlugins {
-    enableStricterValidation = false
-}
+project.version = "8.3.0-SNAPSHOT"
 
 gradlePlugin {
     plugins {

gradle/wrapper/gradle-wrapper.jar

@@ -15,8 +15,10 @@
  */
 package org.labkey.gradle.task
 
+import org.gradle.api.tasks.UntrackedTask
 import org.labkey.gradle.util.DatabaseProperties
 
+@UntrackedTask(because="Should always be run")
 abstract class Bootstrap extends DoThenSetup
 {
     @Override

gradlew

@@ -21,15 +21,19 @@ import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.UntrackedTask
 import org.labkey.gradle.util.BuildUtils
 
 import java.util.regex.Matcher
 
 /**
  * Checks for conflicts that may exist between a file collection and the files in an existing directory
  */
-class CheckForVersionConflicts  extends DefaultTask
+@UntrackedTask(because="Should always be run")
+class CheckForVersionConflicts extends DefaultTask
 {
     // GH Issue 1015: We are using milestone versions of spring-ai jars, which use classifiers like -M2 to distinguish the different versions.
     // We want to have the later milestones replace the earlier ones, so we want to exclude the milestone classifier from the name when
@@ -64,7 +68,7 @@ class CheckForVersionConflicts  extends DefaultTask
             project.hasProperty('versionConflictAction') ? ConflictAction.valueOf((String) project.property('versionConflictAction')) : ConflictAction.fail)
 
     /** The collection of files to check for.  Usually this will come from a configuration. **/
-    @InputFiles
+    @InputFiles @PathSensitive(PathSensitivity.RELATIVE)
     FileCollection collection
 
     /** The name of a task to run if conflicts are found that will resolve the conflict (presumably by cleaning out the directory) **/

src/main/groovy/org/labkey/gradle/task/Bootstrap.groovy

@@ -23,10 +23,13 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.file.FileTree
+import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputDirectories
 import org.gradle.api.tasks.OutputFiles
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.labkey.gradle.plugin.NpmRun
 import org.labkey.gradle.plugin.extension.LabKeyExtension
@@ -43,19 +46,24 @@ import java.util.stream.Collectors
 /**
  * Class for compressing javascript and css files using the yuicompressor classes.
  */
+@CacheableTask
 class ClientLibsCompress extends DefaultTask
 {
     public static final String LIB_XML_EXTENSION = ".lib.xml"
 
-    protected File workingDir = new File((String) project.labkey.explodedModuleWebDir)
-
    // This returns the libXml files from the project directory (the actual input files)
     @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
     FileTree xmlFiles
     private List<File> inputFiles = null
     private List<File> outputFiles = null
     private List<File> outputDirs = null
 
+    @Internal
+    String getWorkingDirPath() {
+        return new File((String) project.labkey.explodedModuleWebDir).getAbsolutePath()
+    }
+
     /**
      * Creates a map between the individual .lib.xml files and the importers used to parse these files and
      * extract the css and javascript files that are referenced.
@@ -103,6 +111,7 @@ class ClientLibsCompress extends DefaultTask
      * @return list of all the .lib.xml files and the (internal) files referenced in the .lib.xml files
      */
     @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
     List<File> getInputFiles()
     {
         if (inputFiles == null)
@@ -139,7 +148,7 @@ class ClientLibsCompress extends DefaultTask
             getImporterMap().entrySet().each { Map.Entry<File, XmlImporter> entry ->
                 // The output file will be in the working directory not in the source directory used when parsing the file.
                 String fileName = entry.key.getAbsolutePath()
-                fileName = fileName.replace(entry.value.sourceDir.getAbsolutePath(), workingDir.getAbsolutePath())
+                fileName = fileName.replace(entry.value.sourceDir.getAbsolutePath(), getWorkingDirPath())
                 File workingFile = project.file(fileName)
                 if (entry.value.getCssFiles().size() > 0)
                 {
@@ -306,7 +315,7 @@ class ClientLibsCompress extends DefaultTask
         File cssMinFile = null
 
         File sourceDir = getSourceDir(xmlFile)
-        File workingFile = new File(xmlFile.getAbsolutePath().replace(sourceDir.getAbsolutePath(), workingDir.getAbsolutePath()))
+        File workingFile = new File(xmlFile.getAbsolutePath().replace(sourceDir.getAbsolutePath(), getWorkingDirPath()))
 
         File packageJson = new File(getMinificationWorkingDir(xmlFile), "package.json")
         project.logger.info("Creating ${packageJson} for ${xmlFile.getAbsolutePath()}")

src/main/groovy/org/labkey/gradle/task/CheckForVersionConflicts.groovy

@@ -4,16 +4,21 @@ import org.gradle.api.file.CopySpec
 import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.TaskExecutionException
+import org.gradle.work.DisableCachingByDefault
 
 import javax.inject.Inject
 
+@DisableCachingByDefault(because="Does only file copying")
 abstract class CopyAndInstallRPackage extends InstallRPackage
 {
     @Inject abstract FileSystemOperations getFs()
 
     @InputDirectory
+    @PathSensitive(PathSensitivity.RELATIVE)
     File packageLocation
 
     @TaskAction

src/main/groovy/org/labkey/gradle/task/ClientLibsCompress.groovy

@@ -3,19 +3,24 @@ package org.labkey.gradle.task
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.FileSystemOperations
+import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 
 import javax.inject.Inject
 
+@CacheableTask
 abstract class CopyJsp extends DefaultTask
 {
     public static final String WEBAPP_DIR = "jspWebappDir/webapp"
 
     @Inject abstract FileSystemOperations getFs()
 
     @InputDirectory
+    @PathSensitive(PathSensitivity.RELATIVE)
     final abstract DirectoryProperty srcDir = project.objects.directoryProperty().convention(project.layout.projectDirectory.dir('src'))
 
     @OutputDirectory

src/main/groovy/org/labkey/gradle/task/CopyAndInstallRPackage.groovy

@@ -21,20 +21,26 @@ import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Classpath
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.gradle.process.ExecOperations
 import org.labkey.gradle.plugin.XsdDoc
 
 import javax.inject.Inject
 
+@CacheableTask
 abstract class CreateJsDocs extends DefaultTask
 {
     @Inject abstract ExecOperations getExec()
 
     @InputDirectory
+    @PathSensitive(PathSensitivity.RELATIVE)
     final abstract DirectoryProperty templateDir = project.objects.directoryProperty().convention(
             project.rootProject.layout.projectDirectory.dir("tools/jsdoc-toolkit/templates/jsdoc_substituted")
     )