Skip to content

Commit 3bd925d

Browse files
authored
Merge pull request #68 from gsmet/fix-kotlin-test-compile
Fix test-compile caching for Kotlin compiler plugin
2 parents 42347a8 + b8d0202 commit 3bd925d

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/main/java/io/quarkus/develocity/project/plugins/KotlinConfiguredPlugin.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,17 @@ private static void compileCommon(GoalMetadataProvider.Context context, boolean
8282
}
8383
inputs.fileSet("classpath", fileSet -> fileSet.normalizationStrategy(NormalizationStrategy.COMPILE_CLASSPATH));
8484
inputs.fileSet("testClasspath", fileSet -> fileSet.normalizationStrategy(NormalizationStrategy.COMPILE_CLASSPATH));
85-
inputs.fileSet("sourceDirs", context.project().getCompileSourceRoots(),
86-
fileSet -> fileSet.normalizationStrategy(NormalizationStrategy.RELATIVE_PATH)
87-
.lineEndingHandling(LineEndingHandling.NORMALIZE)
88-
.emptyDirectoryHandling(EmptyDirectoryHandling.IGNORE));
8985
if (test) {
90-
inputs.fileSet("defaultSourceDir", context.project().getCompileSourceRoots(),
86+
inputs.fileSet("defaultSourceDir", context.project().getTestCompileSourceRoots(),
87+
fileSet -> fileSet.normalizationStrategy(NormalizationStrategy.RELATIVE_PATH)
88+
.lineEndingHandling(LineEndingHandling.NORMALIZE)
89+
.emptyDirectoryHandling(EmptyDirectoryHandling.IGNORE));
90+
inputs.fileSet("defaultSourceDirs", context.project().getTestCompileSourceRoots(),
9191
fileSet -> fileSet.normalizationStrategy(NormalizationStrategy.RELATIVE_PATH)
9292
.lineEndingHandling(LineEndingHandling.NORMALIZE)
9393
.emptyDirectoryHandling(EmptyDirectoryHandling.IGNORE));
94-
inputs.fileSet("defaultSourceDirs", context.project().getCompileSourceRoots(),
94+
} else {
95+
inputs.fileSet("sourceDirs", context.project().getCompileSourceRoots(),
9596
fileSet -> fileSet.normalizationStrategy(NormalizationStrategy.RELATIVE_PATH)
9697
.lineEndingHandling(LineEndingHandling.NORMALIZE)
9798
.emptyDirectoryHandling(EmptyDirectoryHandling.IGNORE));

0 commit comments

Comments
 (0)