Part 11 - Tweaks to fix more classpath and syntax errors with Scala 3

- use scala 3 version of scalatags in test
  Note: scalatags brings in scala 2 version of sourcecode transitively,
  which then fails to summon sourcecode.Enclosing.
- re-enable jmh, bsp and testkit modules in integration tests
- fix giter8 module resolution with scala 3
- fix compilation of scalalib tests - derive ReadWriter for PomSettings
- fix compilation of scalajslib tests
- fix compilation of scalanativelib tests
- move things-outside-top-level-module to integration.feature

Author: bishabosha

bsp/worker/src/mill/bsp/worker/MillBuildServer.scala

@@ -636,7 +636,7 @@ private class MillBuildServer(
       State
   ) => V): CompletableFuture[V] = {
     val prefix = hint.split(" ").head
-    completable(hint) { state: State =>
+    completable(hint) { (state: State) =>
       val ids = state.filterNonSynthetic(targetIds(state).asJava).asScala
       val tasksSeq = ids.flatMap { id =>
         val (m, ev) = state.bspModulesById(id)

bsp/worker/src/mill/bsp/worker/Utils.scala

@@ -34,7 +34,7 @@ private object Utils {
       originId: String,
       bspIdsByModule: Map[BspModule, BuildTargetIdentifier],
       client: BuildClient
-  ): Int => Option[CompileProblemReporter] = { moduleHashCode: Int =>
+  ): Int => Option[CompileProblemReporter] = { (moduleHashCode: Int) =>
     bspIdsByModule.find(_._1.hashCode == moduleHashCode).map {
       case (module: JavaModule, targetId) =>
         val buildTarget = module.bspBuildTarget

build.mill

@@ -745,19 +745,18 @@ object dist0 extends MillPublishJavaModule {
 
   def testTransitiveDeps = build.runner.testTransitiveDeps() ++ Seq(
     build.main.graphviz.testDep(),
-    // build.runner.linenumbers.testDep(),
     build.scalalib.backgroundwrapper.testDep(),
     build.contrib.bloop.testDep(),
     build.contrib.buildinfo.testDep(),
-    // build.contrib.scoverage.testDep(),
-    // build.contrib.scoverage.worker2.testDep(),
-    // build.contrib.jmh.testDep(),
-    // build.contrib.playlib.testDep(),
-    // build.contrib.playlib.worker("2.8").testDep(),
-    // build.contrib.errorprone.testDep(),
-    // build.contrib.checkstyle.testDep(),
-    // build.bsp.worker.testDep(),
-    // build.testkit.testDep()
+    build.contrib.scoverage.testDep(),
+    build.contrib.scoverage.worker2.testDep(),
+    build.contrib.jmh.testDep(),
+    build.contrib.playlib.testDep(),
+    build.contrib.playlib.worker("2.8").testDep(),
+    build.contrib.errorprone.testDep(),
+    build.contrib.checkstyle.testDep(),
+    build.bsp.worker.testDep(),
+    build.testkit.testDep()
   )
 }
 

contrib/playlib/src/mill/playlib/Version.scala

@@ -14,7 +14,7 @@ private[playlib] trait Version extends Module {
 
   private[playlib] def playOrganization: T[String] = Task.Anon {
     if (playVersion().startsWith("2.")) "com.typesafe.play" else "org.playframework"
-  }
+  }()
 
   private[playlib] def component(id: String) = Task.Anon {
     ivy"${playOrganization()}::$id::${playVersion()}"

contrib/twirllib/src/mill/twirllib/TwirlModule.scala

@@ -36,7 +36,7 @@ trait TwirlModule extends mill.Module { twirlModule =>
   private def scalaParserCombinatorsVersion: T[String] = twirlScalaVersion.map {
     case v if v.startsWith("2.") => "1.1.2"
     case _ => "2.3.0"
-  }
+  }()
 
   /**
    * @since Mill after 0.10.5
@@ -57,7 +57,7 @@ trait TwirlModule extends mill.Module { twirlModule =>
    * @since Mill after 0.10.5
    */
   trait TwirlResolver extends CoursierModule {
-    override def resolveCoursierDependency: Task[Dep => Dependency] = Task.Anon { d: Dep =>
+    override def resolveCoursierDependency: Task[Dep => Dependency] = Task.Anon { (d: Dep) =>
       Lib.depToDependency(d, twirlScalaVersion())
     }
 

example/extending/plugins/7-writing-mill-plugins/build.mill

@@ -8,7 +8,7 @@ import mill._, scalalib._, publish._
 import mill.main.BuildInfo.millVersion
 
 object myplugin extends ScalaModule with PublishModule {
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "3.5.0"
 
   def ivyDeps = Agg(ivy"com.lihaoyi:mill-dist:$millVersion")
 
@@ -48,7 +48,7 @@ object myplugin extends ScalaModule with PublishModule {
 //
 // The above `build.mill` file sets up a `object myplugin extends ScalaModule` not just to
 // compile your Mill plugin project, but also to run automated tests using `mill-testkit`,
-// and to configure it for publishing to Maven Central via `PublishModule`. 
+// and to configure it for publishing to Maven Central via `PublishModule`.
 // It looks like any other Scala project, except for a few things to take note:
 //
 // * A dependency on `com.lihaoyi:mill-dist:$millVersion`
@@ -184,12 +184,11 @@ compiling 1 Scala source...
 > sed -i.bak 's/0.0.1/0.0.2/g' build.mill
 
 > ./mill myplugin.publishLocal
-Publishing Artifact(com.lihaoyi,myplugin_2.13,0.0.2) to ivy repo...
+Publishing Artifact(com.lihaoyi,myplugin_3,0.0.2) to ivy repo...
 
 */
 // Mill plugins are JVM libraries like any other library written in Java or Scala. Thus they
 // are published the same way: by extending `PublishModule` and defining the module's `publishVersion`
 // and `pomSettings`. Once done, you can publish the plugin locally via `publishLocal` below,
 // or to Maven Central via `mill.scalalib.public.PublishModule/`for other developers to
 // use.
-

example/thirdparty/netty/build.mill

@@ -253,8 +253,8 @@ object common extends NettyModule{
     val shell = new groovy.lang.GroovyShell()
 
     val context = new java.util.HashMap[String, Object]
-    context.put("collection.template.dir", Task.workspace + "/common/src/main/templates")
-    context.put("collection.template.test.dir", Task.workspace + "/common/src/test/templates")
+    context.put("collection.template.dir", s"${Task.workspace}/common/src/main/templates")
+    context.put("collection.template.test.dir", s"${Task.workspace}/common/src/test/templates")
     context.put("collection.src.dir", (Task.dest / "src").toString)
     context.put("collection.testsrc.dir", (Task.dest / "testsrc").toString)
     shell.setProperty("properties", context)

integration/feature/things-outside-top-level-module/src/ThingsOutsideTopLevelModuleTests.scala

@@ -1,11 +1,13 @@
-import mill.testkit.IntegrationTestSuite
-import utest.{assert, *}
+package mill.integration
 
-object ThingsOutsideTopLevelModuleTests extends IntegrationTestSuite {
-  val tests: Tests = Tests {
-    initWorkspace()
+import mill.testkit.UtestIntegrationTestSuite
+
+import utest._
 
-    test("success") {
+object ThingsOutsideTopLevelModuleTests extends UtestIntegrationTestSuite {
+  val tests: Tests = Tests {
+    test("success") - integrationTest { tester =>
+      import tester._
       val res = eval(("resolve", "_"))
       assert(res.isSuccess)
     }

integration/invalidation/multi-level-editing/resources/build.mill

@@ -4,7 +4,7 @@ import mill._, scalalib._
 import scalatags.Text.all._
 
 object foo extends ScalaModule {
-  def scalaVersion = "2.13.8"
+  def scalaVersion = "3.3.3"
 
   def forkEnv = Map(
     "snippet" -> frag(h1("hello"), p("world"), p(constant.Constant.scalatagsVersion)).render

integration/invalidation/multi-level-editing/resources/mill-build/build.mill

@@ -3,7 +3,7 @@ import $meta._
 import mill._, scalalib._
 
 object `package` extends MillBuildRootModule {
-  def ivyDeps = Agg(ivy"com.lihaoyi:scalatags_2.13:${constant.MetaConstant.scalatagsVersion}")
+  def ivyDeps = Agg(ivy"com.lihaoyi:scalatags_3:${constant.MetaConstant.scalatagsVersion}")
 
   def generatedSources = Task {
     os.write(