diff --git a/src/main/java/org/javamodularity/moduleplugin/extensions/CompileTestModuleOptions.java b/src/main/java/org/javamodularity/moduleplugin/extensions/CompileTestModuleOptions.java index 76f3230..e6c6285 100644 --- a/src/main/java/org/javamodularity/moduleplugin/extensions/CompileTestModuleOptions.java +++ b/src/main/java/org/javamodularity/moduleplugin/extensions/CompileTestModuleOptions.java @@ -3,16 +3,22 @@ import org.gradle.api.Project; public class CompileTestModuleOptions extends ModuleOptions { + private boolean compileOnClasspath; public CompileTestModuleOptions(Project project) { super(project); } + @Deprecated(since = "1.8.16", forRemoval = true) public boolean isCompileOnClasspath() { return compileOnClasspath; } + public boolean getCompileOnClasspath() { + return compileOnClasspath; + } + public void setCompileOnClasspath(boolean compileOnClasspath) { this.compileOnClasspath = compileOnClasspath; } diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/CompileTestTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/CompileTestTask.java index 8080aa9..c0c8069 100644 --- a/src/main/java/org/javamodularity/moduleplugin/tasks/CompileTestTask.java +++ b/src/main/java/org/javamodularity/moduleplugin/tasks/CompileTestTask.java @@ -42,8 +42,8 @@ private void configureCompileTestJava(JavaCompile compileTestJava) { var moduleOptions = compileTestJava.getExtensions() .create("moduleOptions", CompileTestModuleOptions.class, project); project.afterEvaluate(p -> { - LOGGER.info(compileTestJava.getName() + ".compileOnClasspath: {}", moduleOptions.isCompileOnClasspath()); - if(!moduleOptions.isCompileOnClasspath()) { + LOGGER.info(compileTestJava.getName() + ".compileOnClasspath: {}", moduleOptions.getCompileOnClasspath()); + if(!moduleOptions.getCompileOnClasspath()) { // don't convert to lambda: https://github.com/java9-modularity/gradle-modules-plugin/issues/54 compileTestJava.doFirst(new Action<>() { @Override diff --git a/test-project-groovy/build.gradle b/test-project-groovy/build.gradle index c10cb6d..d7c3173 100644 --- a/test-project-groovy/build.gradle +++ b/test-project-groovy/build.gradle @@ -36,4 +36,17 @@ subprojects { exclude module: 'groovy-xml' } } + + test { + moduleOptions { + runOnClasspath = false + } + } + + compileTestJava { + moduleOptions { + compileOnClasspath = false + } + } + } diff --git a/test-project-kotlin/build.gradle.kts b/test-project-kotlin/build.gradle.kts index 7eac545..c31c603 100644 --- a/test-project-kotlin/build.gradle.kts +++ b/test-project-kotlin/build.gradle.kts @@ -11,6 +11,7 @@ subprojects { //region https://docs.gradle.org/current/userguide/kotlin_dsl.html#using_kotlin_delegated_properties val test by tasks.existing(Test::class) + val compileTestJava by tasks.existing(JavaCompile::class) val implementation by configurations val testImplementation by configurations @@ -53,6 +54,16 @@ subprojects { testLogging { events("PASSED", "FAILED", "SKIPPED", "STANDARD_OUT") } + + extensions.configure(org.javamodularity.moduleplugin.extensions.TestModuleOptions::class) { + runOnClasspath = false + } + } + + compileTestJava { + extensions.configure(org.javamodularity.moduleplugin.extensions.CompileTestModuleOptions::class) { + compileOnClasspath = false + } } dependencies {