Support Scala 3 on Scala.js

Author: lolgab

build.sc

@@ -6,8 +6,9 @@ val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "3.0.0-RC1" :: dottyVe
 val scala2Versions = scalaVersions.filter(_.startsWith("2."))
 
 val scalaJSVersions = for {
-  scalaV <- scala2Versions
+  scalaV <- scalaVersions
   scalaJSV <- Seq("0.6.33", "1.4.0")
+  if scalaV.startsWith("2.") || scalaJSV.startsWith("1.")
 } yield (scalaV, scalaJSV)
 
 val scalaNativeVersions = for {
@@ -34,7 +35,7 @@ trait SourcecodeModule extends PublishModule {
     )
   )
 }
-trait SourcecodeMainModule extends CrossScalaModule {
+abstract class SourcecodeMainModule(crossScalaVersion: String) extends CrossScalaModule {
   def millSourcePath = super.millSourcePath / offset
 
   def offset: os.RelPath = os.rel
@@ -55,6 +56,15 @@ trait SourcecodeMainModule extends CrossScalaModule {
         )
       )
   )
+
+  override def docJar =
+    if (crossScalaVersion.startsWith("2")) super.docJar
+    else T {
+      val outDir = T.ctx().dest
+      val javadocDir = outDir / 'javadoc
+      os.makeDir.all(javadocDir)
+      mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
+    }
 }
 
 
@@ -81,27 +91,18 @@ object sourcecode extends Module {
   val dottyVersion = sys.props.get("dottyVersion")
   object jvm extends Cross[JvmSourcecodeModule](scalaVersions: _*)
   class JvmSourcecodeModule(val crossScalaVersion: String)
-    extends SourcecodeMainModule with ScalaModule with SourcecodeModule {
+    extends SourcecodeMainModule(crossScalaVersion) with ScalaModule with SourcecodeModule {
 
     object test extends SourcecodeTestModule{
       def scalaVersion = crossScalaVersion
       def moduleDeps = Seq(JvmSourcecodeModule.this)
       val crossScalaVersion = JvmSourcecodeModule.this.crossScalaVersion
     }
-
-    override def docJar =
-      if (crossScalaVersion.startsWith("2")) super.docJar
-      else T {
-        val outDir = T.ctx().dest
-        val javadocDir = outDir / 'javadoc
-        os.makeDir.all(javadocDir)
-        mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
-      }
   }
 
   object js extends Cross[JsSourcecodeModule](scalaJSVersions: _*)
   class JsSourcecodeModule(val crossScalaVersion: String, crossJSVersion: String)
-    extends SourcecodeMainModule with ScalaJSModule with SourcecodeModule {
+    extends SourcecodeMainModule(crossScalaVersion) with ScalaJSModule with SourcecodeModule {
     def offset = os.up
 
     def scalaJSVersion = crossJSVersion
@@ -116,7 +117,7 @@ object sourcecode extends Module {
 
   object native extends Cross[NativeSourcecodeModule](scalaNativeVersions: _*)
   class NativeSourcecodeModule(val crossScalaVersion: String, crossScalaNativeVersion: String)
-    extends SourcecodeMainModule with ScalaNativeModule with SourcecodeModule {
+    extends SourcecodeMainModule(crossScalaVersion) with ScalaNativeModule with SourcecodeModule {
     def offset = os.up
 
     def scalaNativeVersion = crossScalaNativeVersion

mill

@@ -3,7 +3,7 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.9.5
+DEFAULT_MILL_VERSION=0.9.5-46-c500ca
 
 set -e
 

sourcecode/jvm/src/test/scala/sourcecode/TestUtil.scala

@@ -2,6 +2,6 @@ package sourcecode
 
 object TestUtil {
 
-  val isDotty = false
+  val isDotty = true
 
 }