diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 61285a6..d997cfc 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4146564..92ed943 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionSha256Sum=60ea723356d81263e8002fec0fcf9e2b0eee0c0850c7a3d7ab0a63f2ccc601f3 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index adff685..0262dcb 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/src/main/java/org/gradlex/javamodule/dependencies/tasks/BuildFileDependenciesGenerate.java b/src/main/java/org/gradlex/javamodule/dependencies/tasks/BuildFileDependenciesGenerate.java index 1b98d4e..ef78f9c 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/tasks/BuildFileDependenciesGenerate.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/tasks/BuildFileDependenciesGenerate.java @@ -17,8 +17,10 @@ import org.gradle.api.provider.Provider; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.TaskAction; +import org.gradle.work.DisableCachingByDefault; import org.jspecify.annotations.NullMarked; +@DisableCachingByDefault(because = "modifies source files") @NullMarked public abstract class BuildFileDependenciesGenerate extends DefaultTask { public abstract static class SourceSetDependencies { diff --git a/src/main/java/org/gradlex/javamodule/dependencies/tasks/CatalogGenerate.java b/src/main/java/org/gradlex/javamodule/dependencies/tasks/CatalogGenerate.java index 16675c6..eae92fd 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/tasks/CatalogGenerate.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/tasks/CatalogGenerate.java @@ -16,9 +16,11 @@ import org.gradle.api.provider.SetProperty; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.TaskAction; +import org.gradle.work.DisableCachingByDefault; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; +@DisableCachingByDefault(because = "modifies source files") @NullMarked public abstract class CatalogGenerate extends DefaultTask { diff --git a/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleDependencyReport.java b/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleDependencyReport.java index 0f1382a..4b7f78b 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleDependencyReport.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleDependencyReport.java @@ -12,9 +12,11 @@ import org.gradle.api.tasks.Classpath; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.diagnostics.DependencyReportTask; +import org.gradle.work.DisableCachingByDefault; import org.gradlex.javamodule.dependencies.internal.diagnostics.AsciiModuleDependencyReportRenderer; import org.jspecify.annotations.NullMarked; +@DisableCachingByDefault(because = "reporting task") @NullMarked public abstract class ModuleDependencyReport extends DependencyReportTask { diff --git a/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleInfoGenerate.java b/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleInfoGenerate.java index 37a249a..d7549cd 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleInfoGenerate.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleInfoGenerate.java @@ -18,10 +18,12 @@ import org.gradle.api.tasks.Input; import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; +import org.gradle.work.DisableCachingByDefault; import org.gradlex.javamodule.dependencies.internal.utils.ModuleInfo; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; +@DisableCachingByDefault(because = "modifies source files") @NullMarked public abstract class ModuleInfoGenerate extends DefaultTask { diff --git a/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModulePathAnalysis.java b/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModulePathAnalysis.java index 3dcf41e..6978081 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModulePathAnalysis.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModulePathAnalysis.java @@ -23,14 +23,18 @@ import org.gradle.api.capabilities.Capability; import org.gradle.api.provider.ListProperty; import org.gradle.api.tasks.InputFiles; +import org.gradle.api.tasks.PathSensitive; +import org.gradle.api.tasks.PathSensitivity; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; +import org.gradle.work.DisableCachingByDefault; import org.gradlex.javamodule.dependencies.JavaModuleDependenciesExtension; import org.gradlex.javamodule.dependencies.internal.utils.ModuleInfo; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; +@DisableCachingByDefault(because = "reporting task") @NullMarked public abstract class ModulePathAnalysis extends DefaultTask { private final String projectName; @@ -38,6 +42,7 @@ public abstract class ModulePathAnalysis extends DefaultTask { private final JavaModuleDependenciesExtension javaModuleDependencies; @InputFiles + @PathSensitive(PathSensitivity.NAME_ONLY) public abstract ListProperty getClasspathConfigurations(); @Inject diff --git a/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleVersionRecommendation.java b/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleVersionRecommendation.java index b77e512..4732b21 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleVersionRecommendation.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/tasks/ModuleVersionRecommendation.java @@ -26,12 +26,16 @@ import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputFile; import org.gradle.api.tasks.Optional; +import org.gradle.api.tasks.PathSensitive; +import org.gradle.api.tasks.PathSensitivity; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; +import org.gradle.work.DisableCachingByDefault; import org.gradlex.javamodule.dependencies.JavaModuleDependenciesExtension; import org.jspecify.annotations.NullMarked; +@DisableCachingByDefault(because = "reporting task") @NullMarked public abstract class ModuleVersionRecommendation extends DefaultTask { @@ -45,6 +49,7 @@ public abstract class ModuleVersionRecommendation extends DefaultTask { public abstract Property getPrintForCatalog(); @InputFile + @PathSensitive(PathSensitivity.NAME_ONLY) @Optional public abstract RegularFileProperty getPrintForPropertiesFile();