Skip to content

Commit 76205f0

Browse files
committed
Only perform 'extendsFrom(compileOnly)' if not already done
1 parent 801903d commit 76205f0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/main/java/org/gradlex/javamodule/testing/JavaModuleTestingExtension.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,11 @@ private void configureJvmTestSuiteForWhitebox(JvmTestSuite jvmTestSuite, Whitebo
208208
tasks.named(testSources.getCompileJavaTaskName(), JavaCompile.class, compileJava -> {
209209
SourceSet sourcesUnderTest = whiteboxJvmTestSuite.getSourcesUnderTest().get();
210210

211-
configurations.getByName(testSources.getCompileOnlyConfigurationName()).extendsFrom(
212-
configurations.getByName(sourcesUnderTest.getCompileOnlyConfigurationName()));
211+
Configuration compileOnly = configurations.getByName(sourcesUnderTest.getCompileOnlyConfigurationName());
212+
Configuration testCompileOnly = configurations.getByName(testSources.getCompileOnlyConfigurationName());
213+
if (!testCompileOnly.getExtendsFrom().contains(compileOnly)) {
214+
testCompileOnly.extendsFrom(compileOnly);
215+
}
213216

214217
compileJava.setClasspath(sourcesUnderTest.getOutput().plus(configurations.getByName(testSources.getCompileClasspathConfigurationName())));
215218

0 commit comments

Comments
 (0)