Merge branch 'master' into fit-gradle9

Author: rcw3bb

settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.2"
+    id "com.gradle.enterprise" version "3.17.4"
 }
 
 rootProject.name = 'moduleplugin'

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;
     }

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

test-project-groovy/build.gradle

@@ -37,4 +37,17 @@ subprojects {
             exclude module: 'groovy-xml'
         }
     }
+
+    test {
+        moduleOptions {
+            runOnClasspath = false
+        }
+    }
+
+    compileTestJava {
+        moduleOptions {
+            compileOnClasspath = false
+        }
+    }
+
 }

test-project-kotlin/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.22" apply false
+    kotlin("jvm") version "2.0.0" apply false
     id("org.javamodularity.moduleplugin") version "2.0.0" apply false
 }
 
@@ -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 {