Skip to content

Commit 0003273

Browse files
committed
fix: Enable stricter task validation, resolve warnings
1 parent 287dcc4 commit 0003273

File tree

4 files changed

+17
-0
lines changed

4 files changed

+17
-0
lines changed

build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ indraPluginPublishing {
145145
website("https://blossom.kyori.net/")
146146
}
147147

148+
tasks.validatePlugins {
149+
enableStricterValidation = true
150+
}
151+
148152
spotless {
149153
fun FormatExtension.applyCommon() {
150154
endWithNewline()

src/main/java/net/kyori/blossom/GenerateTemplates.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,16 @@
3232
import org.gradle.api.file.ConfigurableFileCollection;
3333
import org.gradle.api.file.DirectoryProperty;
3434
import org.gradle.api.provider.Property;
35+
import org.gradle.api.tasks.CacheableTask;
3536
import org.gradle.api.tasks.Classpath;
3637
import org.gradle.api.tasks.InputFiles;
3738
import org.gradle.api.tasks.Nested;
3839
import org.gradle.api.tasks.OutputDirectory;
40+
import org.gradle.api.tasks.PathSensitive;
41+
import org.gradle.api.tasks.PathSensitivity;
3942
import org.gradle.api.tasks.SkipWhenEmpty;
4043
import org.gradle.api.tasks.TaskAction;
44+
import org.gradle.work.DisableCachingByDefault;
4145
import org.gradle.workers.WorkerExecutor;
4246
import org.jspecify.annotations.NullMarked;
4347

@@ -47,6 +51,7 @@
4751
* @since 2.0.0
4852
*/
4953
@NullMarked
54+
@DisableCachingByDefault(because = "Template logic might not be reproducible, cost of generating templates is small.")
5055
public abstract class GenerateTemplates extends DefaultTask {
5156

5257
/**
@@ -67,6 +72,7 @@ public abstract class GenerateTemplates extends DefaultTask {
6772
* @since 2.0.0
6873
*/
6974
@InputFiles
75+
@PathSensitive(PathSensitivity.RELATIVE)
7076
protected abstract ConfigurableFileCollection getIncludesDirectories();
7177

7278
/**
@@ -77,6 +83,7 @@ public abstract class GenerateTemplates extends DefaultTask {
7783
*/
7884
@InputFiles
7985
@SkipWhenEmpty
86+
@PathSensitive(PathSensitivity.RELATIVE)
8087
protected abstract ConfigurableFileCollection getSourceDirectories();
8188

8289
/**

src/main/java/net/kyori/blossom/TemplateSet.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import org.gradle.api.tasks.Internal;
3636
import org.gradle.api.tasks.Nested;
3737
import org.gradle.api.tasks.Optional;
38+
import org.gradle.api.tasks.PathSensitive;
39+
import org.gradle.api.tasks.PathSensitivity;
3840
import org.jetbrains.annotations.ApiStatus;
3941
import org.jspecify.annotations.NullMarked;
4042

@@ -71,6 +73,7 @@ public interface TemplateSet extends Named {
7173
* @since 2.0.0
7274
*/
7375
@InputFiles
76+
@PathSensitive(PathSensitivity.RELATIVE)
7477
ConfigurableFileCollection getPropertyFiles();
7578

7679
/**

src/main/java/net/kyori/blossom/Variant.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import org.gradle.api.provider.MapProperty;
2828
import org.gradle.api.tasks.Input;
2929
import org.gradle.api.tasks.InputFiles;
30+
import org.gradle.api.tasks.PathSensitive;
31+
import org.gradle.api.tasks.PathSensitivity;
3032
import org.jetbrains.annotations.ApiStatus;
3133
import org.jspecify.annotations.NullMarked;
3234

@@ -57,6 +59,7 @@ public interface Variant extends Named {
5759
* @since 2.0.0
5860
*/
5961
@InputFiles
62+
@PathSensitive(PathSensitivity.RELATIVE)
6063
ConfigurableFileCollection getPropertyFiles();
6164

6265
/**

0 commit comments

Comments
 (0)