fix after rebase

Author: bishabosha

build.mill

@@ -73,8 +73,8 @@ object Deps {
     val scalajsEnvNodejs = ivy"org.scala-js::scalajs-env-nodejs:1.4.0".withDottyCompat(scalaVersion)
     val scalajsEnvPhantomjs = ivy"org.scala-js::scalajs-env-phantomjs:1.0.0".withDottyCompat(scalaVersion)
     val scalajsEnvSelenium = ivy"org.scala-js::scalajs-env-selenium:1.1.1".withDottyCompat(scalaVersion)
-    val scalajsSbtTestAdapter = ivy"org.scala-js::scalajs-sbt-test-adapter:${scalaJsVersion}".withDottyCompat(scalaVersion)
-    val scalajsLinker = ivy"org.scala-js::scalajs-linker:${scalaJsVersion}".withDottyCompat(scalaVersion)
+    val scalajsSbtTestAdapter = ivy"org.scala-js:scalajs-sbt-test-adapter_2.13:${scalaJsVersion}"
+    val scalajsLinker = ivy"org.scala-js:scalajs-linker_2.13:${scalaJsVersion}"
     val scalajsImportMap = ivy"com.armanbilge::scalajs-importmap:0.1.1".withDottyCompat(scalaVersion)
   }
 

runner/src/mill/runner/CodeGen.scala

@@ -128,7 +128,7 @@ object CodeGen {
     )
     val segments = scriptFolderPath.relativeTo(projectRoot).segments
     val instrument = new ObjectDataInstrument(scriptCode)
-    fastparse.parse(scriptCode, Parsers.CompilationUnit(_), instrument = instrument)
+    fastparse.parse(scriptCode, Parsers.CompilationUnit(using _), instrument = instrument)
     val objectData = instrument.objectData
 
     val expectedParent =
@@ -186,6 +186,7 @@ object CodeGen {
       millTopLevelProjectRoot: os.Path
   ): String = {
     s"""import _root_.mill.runner.MillBuildRootModule
+       |import _root_.mill.main.TokenReaders.given
        |@_root_.scala.annotation.nowarn
        |object MillMiscInfo extends MillBuildRootModule.MillMiscInfo(
        |  ${enclosingClasspath.map(p => literalize(p.toString))},

scalajslib/src/mill/scalajslib/ScalaJSModule.scala

@@ -76,7 +76,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
 
   def scalaJSLinkerClasspath: T[Loose.Agg[PathRef]] = T {
     val commonDeps = Seq(
-      ivy"org.scala-js::scalajs-sbt-test-adapter:${scalaJSVersion()}"
+      ivy"org.scala-js:scalajs-sbt-test-adapter_2.13:${scalaJSVersion()}"
     )
     val scalajsImportMapDeps = scalaJSVersion() match {
       case s"1.$n.$_" if n.toIntOption.exists(_ >= 16) && scalaJSImportMap().nonEmpty =>
@@ -92,7 +92,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer =>
         )
       case "1" =>
         Seq(
-          ivy"org.scala-js::scalajs-linker:${scalaJSVersion()}"
+          ivy"org.scala-js:scalajs-linker_2.13:${scalaJSVersion()}"
         ) ++ scalaJSJsEnvIvyDeps()
     }
     // we need to use the scala-library of the currently running mill

testkit/src/mill/testkit/IntegrationTester.scala

@@ -104,7 +104,7 @@ object IntegrationTester {
        * Returns the raw text of the `.json` metadata file
        */
       def text: String = {
-        val Seq((List(selector), _)) =
+        val Seq((Seq(selector), _)) =
           mill.resolve.ParseArgs.apply(Seq(selector0), SelectMode.Separated).getOrElse(???)
 
         val segments = selector._2.value.flatMap(_.pathSegments)