Skip to content

Make CompileTestModuleOptions consistent with documentation #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make CompileTestModuleOptions consistent with documentation #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/org/javamodularity/moduleplugin/extensions/CompileTestModuleOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/javamodularity/moduleplugin/tasks/CompileTestTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions test-project-groovy/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,17 @@ subprojects {
exclude module: 'groovy-xml'
}
}

test {
moduleOptions {
runOnClasspath = false
}
}

compileTestJava {
moduleOptions {
compileOnClasspath = false
}
}

}
11 changes: 11 additions & 0 deletions test-project-kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down