cleanup

Author: lostiniceland

libs/groovylib/package.mill

@@ -8,7 +8,7 @@ import millbuild.*
 object `package` extends MillPublishScalaModule with BuildInfo {
 
   def moduleDeps = Seq(build.libs.javalib, build.libs.javalib.testrunner, api)
-  def localTestExtraModules =
+  def localTestExtraModules: Seq[MillJavaModule] =
     super.localTestExtraModules ++ Seq(worker)
 
   def buildInfoPackageName = "mill.groovylib"

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

@@ -12,7 +12,9 @@ import mill.api.daemon.internal.bsp.{BspBuildTarget, BspModuleApi}
 import mill.javalib.api.internal.{JavaCompilerOptions, JvmWorkerApi, ZincCompileJava}
 
 /**
- * Core configuration required to compile a single Groovy module
+ * Core configuration required to compile a single Groovy module.
+ * 
+ * Resolves 
  */
 trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
 
@@ -33,36 +35,31 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
    * All individual source files fed into the compiler.
    */
   override def allSourceFiles: T[Seq[PathRef]] = Task {
-    Lib.findSourceFiles(allSources(), Seq("groovy", "java")).map(PathRef(_))
+    allGroovySourceFiles() ++ allJavaSourceFiles()
   }
 
   /**
    * All individual Java source files fed into the compiler.
    * Subset of [[allSourceFiles]].
    */
   private def allJavaSourceFiles: T[Seq[PathRef]] = Task {
-    allSourceFiles().filter(_.path.ext.toLowerCase() == "java")
+    Lib.findSourceFiles(allSources(), Seq("java")).map(PathRef(_))
   }
 
   /**
    * All individual Groovy source files fed into the compiler.
    * Subset of [[allSourceFiles]].
    */
   private def allGroovySourceFiles: T[Seq[PathRef]] = Task {
-    allSourceFiles().filter(path => Seq("groovy").contains(path.path.ext.toLowerCase()))
+    Lib.findSourceFiles(allSources(), Seq("groovy")).map(PathRef(_))
   }
 
   /**
    * The dependencies of this module.
-   * Defaults to add the groovy dependency matching the [[groovyVersion]].
+   * Defaults to add the Groovy dependency matching the [[groovyVersion]].
    */
   override def mandatoryMvnDeps: T[Seq[Dep]] = Task {
-    super.mandatoryMvnDeps()
-    ++
-      groovyCompilerMvnDeps()
-//    Seq(
-//      mvn"org.apache.groovy:groovy:${groovyVersion()}"
-//    )
+    super.mandatoryMvnDeps() ++ groovyCompilerMvnDeps()
   }
 
   def jvmWorkerRef: ModuleRef[JvmWorkerModule] = jvmWorker
@@ -86,28 +83,11 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
   /**
    * The Ivy/Coursier dependencies resembling the Groovy compiler.
    *
-   * Default is derived from [[groovyCompilerVersion]].
+   * Default is derived from [[groovyVersion]].
    */
   def groovyCompilerMvnDeps: T[Seq[Dep]] = Task {
     val gv = groovyVersion()
-    val compilerDep = mvn"org.apache.groovy:groovy-all:$gv"
-    Seq(compilerDep)
-  }
-
-  /**
-   * Compiler Plugin dependencies.
-   */
-  def groovyCompilerPluginMvnDeps: T[Seq[Dep]] = Task { Seq.empty[Dep] }
-
-  /**
-   * The resolved plugin jars
-   */
-  def groovyCompilerPluginJars: T[Seq[PathRef]] = Task {
-    val jars = defaultResolver().classpath(
-      allMvnDeps(),
-      resolutionParamsMapOpt = None
-    )
-    jars.toSeq
+    Seq(mvn"org.apache.groovy:groovy:$gv")
   }
 
   /**
@@ -118,9 +98,8 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
   }
 
   /**
-   * The actual Groovy compile task (used by [[compile]] and [[groovycHelp]]).
+   * The actual Groovy compile task (used by [[compile]]).
    */
-  // TODO joint compilation: generate groovy-stubs -> compile java -> compile groovy -> delete stubs (or keep for debugging)
   protected def groovyCompileTask(): Task[CompilationResult] =
     Task.Anon {
       val ctx = Task.ctx()
@@ -140,9 +119,9 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
 
       def compileJava: Result[CompilationResult] = {
         ctx.log.info(
-          s"Compiling ${javaSourceFiles.size} Java sources to ${classes} ..."
+          s"Compiling ${javaSourceFiles.size} Java sources to $classes ..."
         )
-        // The compile step is lazy, but its dependencies are not!
+        // The compiler step is lazy, but its dependencies are not!
         internalCompileJavaFiles(
           worker = jvmWorkerRef().internalWorker(),
           upstreamCompileOutput = updateCompileOutput,
@@ -170,14 +149,15 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
 
       if(isMixed || isGroovy){
         ctx.log.info(
-          s"Compiling ${groovySourceFiles.size} Groovy sources to ${classes} ..."
+          s"Compiling ${groovySourceFiles.size} Groovy sources to $classes ..."
         )
 
         val workerGroovyResult =
           GroovyWorkerManager.groovyWorker().withValue(groovyCompilerClasspath()) {
             _.compile(groovySourceFiles, compileCp, classes)
           }
 
+        // TODO figure out if there is a better way to do this
         val analysisFile = dest / "groovy.analysis.dummy" // needed for mills CompilationResult
         os.write(target = analysisFile, data = "", createFolders = true)
 
@@ -236,7 +216,7 @@ trait GroovyModule extends JavaModule with GroovyModuleApi { outer =>
   }
 
   /**
-   * A test sub-module linked to its parent module best suited for unit-tests.
+   * A test submodule linked to its parent module best suited for unit-tests.
    */
   trait GroovyTests extends JavaTests with GroovyModule {
 

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

@@ -62,20 +62,16 @@ object HelloGroovyTests extends TestSuite {
         override def mainClass = Some("hellostatic.HelloStatic")
       }
 
-      object spock extends GroovyTests with TestModule.Junit5 {
+      object spock extends GroovyTests with TestModule.Spock {
         override def junitPlatformVersion = "1.13.4"
-        def spockVersion: T[String] = "2.3-groovy-4.0"
+        override def spockVersion = "2.3-groovy-4.0"
         override def groovyVersion = "4.0.28"
 
         def bomMvnDeps = Seq(
           mvn"org.junit:junit-bom:5.13.4",
-          mvn"org.apache.groovy:groovy-bom:${groovyVersion()}",
+//          mvn"org.apache.groovy:groovy-bom:${groovyVersion()}",
           mvn"org.spockframework:spock-bom:${spockVersion()}"
         )
-
-        def mvnDeps = Seq(
-          mvn"org.spockframework:spock-core"
-        )
       }
     }
     object main extends Test {
@@ -96,6 +92,56 @@ object HelloGroovyTests extends TestSuite {
     def mixed = HelloGroovy.`groovy-tests`
     def joint = HelloGroovy.`joint-compile`
 
+    test("running a Groovy script") {
+      testEval().scoped { eval =>
+        val Right(_) = eval.apply(m.script.run()): @unchecked
+      }
+    }
+
+    test("running a Groovy script") {
+      testEval().scoped { eval =>
+        val Right(_) = eval.apply(m.script.run()): @unchecked
+      }
+    }
+
+    test("compile & run Groovy module") {
+      testEval().scoped { eval =>
+        val Right(result) = eval.apply(m.compile): @unchecked
+
+        assert(
+          os.walk(result.value.classes.path).exists(_.last == "Hello.class")
+        )
+
+        val Right(_) = eval.apply(m.run()): @unchecked
+      }
+    }
+
+    test("compile & run Groovy JUnit5 test") {
+      testEval().scoped { eval =>
+
+        val Right(result) = eval.apply(m.test.compile): @unchecked
+
+        assert(
+          os.walk(result.value.classes.path).exists(_.last == "HelloTest.class")
+        )
+
+        val Right(discovered) = eval.apply(m.test.discoveredTestClasses): @unchecked
+        assert(discovered.value == Seq("hello.tests.HelloTest"))
+
+        val Right(_) = eval.apply(m.test.testForked()): @unchecked
+      }
+    }
+
+    test("compile & run a statically compiled Groovy") {
+      testEval().scoped { eval =>
+        val Right(result) = eval.apply(m.staticcompile.compile): @unchecked
+        assert(
+          os.walk(result.value.classes.path).exists(_.last == "HelloStatic.class")
+        )
+        val Right(_) = eval.apply(m.staticcompile.run()): @unchecked
+      }
+    }
+
 
     test("compile & test module (only test uses Groovy)") {
       testEval().scoped { eval =>

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

@@ -602,20 +602,22 @@ object TestModule {
 
   /**
    * TestModule that uses Spock Test Framework to run tests.
-   * You can override the [[spockTestVersion]] task or provide the Spock-dependency yourself.
+   * You can override the [[spockVersion]] task or provide the Spock dependency yourself.
    */
   trait Spock extends TestModule.Junit5 {
 
-    /** The Spock Test version to use, or the empty string, if you want to provide the Spock Test-dependency yourself. */
+    /** The Spock Test version to use, or the empty string, if you want to provide the Spock test dependency yourself. */
     def spockVersion: T[String] = Task {
       ""
     }
 
-    /** The Groovy version to use, or the empty string, if you want to provide the Groovy Test-dependency yourself. */
+    /** The Groovy version to use, or the empty string, if you want to provide the Groovy test dependency yourself. */
     def groovyVersion: T[String] = Task {
       ""
     }
 
+    // TODO currently bomMvnDeps not in JavaModuleBase so we cannot pull in the Spock-BOM
+
     override def mandatoryMvnDeps: T[Seq[Dep]] = Task {
       super.mandatoryMvnDeps() ++
         Seq(spockVersion())
@@ -624,13 +626,6 @@ object TestModule {
             Seq(
               mvn"org.spockframework:spock-core:${v.trim()}"
             )
-          ) ++
-        Seq(groovyVersion())
-          .filter(!_.isBlank())
-          .flatMap(v =>
-            Seq(
-              mvn"org.apache.groovy:groovy:${v.trim()}"
-            )
           )
     }
   }