minor review remarks

Author: lostiniceland

libs/groovylib/src/mill/groovylib/GroovyModule.scala

@@ -31,7 +31,7 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
    */
   def groovyLanguageVersion: T[String] = Task { groovyVersion().split("[.]").take(2).mkString(".") }
 
-  private def isGroovyBomAvailable: T[Boolean] = Task {
+  private def useGroovyBom: T[Boolean] = Task {
     if (groovyVersion().isBlank) {
       false
     } else {
@@ -41,7 +41,7 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
 
   override def bomMvnDeps: T[Seq[Dep]] = super.bomMvnDeps() ++
     Seq(groovyVersion())
-      .filter(_.nonEmpty && isGroovyBomAvailable())
+      .filter(_.nonEmpty && useGroovyBom())
       .map(v => mvn"org.apache.groovy:groovy-bom:$v")
 
   /**
@@ -54,15 +54,15 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
   /**
    * Specifiy the bytecode version for the Groovy compiler.
    * {{{
-   *   def targetBytecode = Some("17")
+   *   def groovyCompileTargetBytecode = Some("17")
    * }}}
    */
-  def targetBytecode: T[Option[String]] = None
+  def groovyCompileTargetBytecode: T[Option[String]] = None
 
   /**
    * Specify if the Groovy compiler should enable preview features.
    */
-  def enablePreview: T[Boolean] = false
+  def groovyCompileEnablePreview: T[Boolean] = false
 
   /**
    * Specify which global AST transformations should be disabled. Be aware that transformations
@@ -153,8 +153,8 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
       val updateCompileOutput = upstreamCompileOutput()
 
       val config = GroovyCompilerConfiguration(
-        enablePreview = enablePreview(),
-        targetBytecode = targetBytecode(),
+        enablePreview = groovyCompileEnablePreview(),
+        targetBytecode = groovyCompileTargetBytecode(),
         disabledGlobalAstTransformations = disabledGlobalAstTransformations()
       )
 

libs/groovylib/src/mill/groovylib/JavaMavenModuleWithGroovyTests.scala

@@ -4,7 +4,25 @@ import mill.*
 import mill.javalib.{JavaModule, MavenModule}
 
 /**
- * Convenience trait for projects using Java for production and Groovy for tests in a Maven setup
+ * Convenience trait for projects using Java for production and Groovy for tests in a Maven setup.
+ * 
+ * Since [[GroovyModule.GroovyTests]] is only available as a child-trait, it is necessary to have
+ * the main module as a [[GroovyModule]], which would implicitly add Groovy dependencies to the 
+ * module.
+ * This trait explicitly uses Java with a Maven layout for the main module and enables `src/test/groovy`
+ * as a source folder for Groovy tests.
+ * 
+ * {{{
+ *     object `package` extends JavaMavenModuleWithGroovyTests {
+ *
+ *       object `test` extends GroovyMavenTests with TestModule.Spock {
+ *         override def groovyVersion: T[String] = "4.0.28"
+ *         override def spockVersion: T[String] = "2.3-groovy-4"
+ *       }
+ *     }
+ * }}}
+ * 
+ * Note: for non-Maven layouts this is not necessary, since the test module can just be a [[GroovyModule]].
  */
 @mill.api.experimental
 trait JavaMavenModuleWithGroovyTests extends JavaModule with MavenModule {

libs/groovylib/test/src/mill/groovylib/HelloGroovyTests.scala

@@ -107,8 +107,8 @@ object HelloGroovyTests extends TestSuite {
       object compileroptions extends GroovyModule {
         def javaVersion = "11"
         override def groovyVersion: T[String] = crossValue
-        override def targetBytecode: Task.Simple[Option[String]] = Some(javaVersion)
-        override def enablePreview: Task.Simple[Boolean] = true
+        override def groovyCompileTargetBytecode: Task.Simple[Option[String]] = Some(javaVersion)
+        override def groovyCompileEnablePreview: Task.Simple[Boolean] = true
         override def mainClass = Some("compileroptions.HelloCompilerOptions")
       }
     }

libs/javalib/src/mill/javalib/TestModule.scala

@@ -372,7 +372,7 @@ object TestModule {
     /** The JUnit Jupiter version to use, or empty, if you want to provide the dependencies yourself. */
     def jupiterVersion: T[String] = Task { "" }
 
-    private def isJupiterBomAvailable: T[Boolean] = Task {
+    private def useJupiterBom: T[Boolean] = Task {
       if (jupiterVersion().isBlank) {
         false
       } else {
@@ -385,7 +385,7 @@ object TestModule {
     override def bomMvnDeps: T[Seq[Dep]] = Task {
       super.bomMvnDeps() ++
         Seq(jupiterVersion())
-          .filter(!_.isBlank() && isJupiterBomAvailable())
+          .filter(!_.isBlank() && useJupiterBom())
           .flatMap(v =>
             Seq(
               mvn"org.junit:junit-bom:${v.trim()}"
@@ -399,7 +399,7 @@ object TestModule {
         Seq(junitPlatformVersion()).flatMap(v => {
           if (!v.isBlank) {
             Some(mvn"org.junit.platform:junit-platform-launcher:${v.trim()}")
-          } else if (isJupiterBomAvailable()) {
+          } else if (useJupiterBom()) {
             Some(mvn"org.junit.platform:junit-platform-launcher")
           } else {
             None