Skip to content

Commit 6975c03

Browse files
committed
Support Scala 3 on Scala.js
1 parent d7dd5ac commit 6975c03

File tree

5 files changed

+4
-29
lines changed

5 files changed

+4
-29
lines changed

build.sc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "3.0.0-RC1" :: dottyVe
88
val scala2Versions = scalaVersions.filter(_.startsWith("2."))
99

1010
val scalaJSVersions = for {
11-
scalaV <- scala2Versions
11+
scalaV <- scalaVersions
1212
scalaJSV <- Seq("0.6.33", "1.4.0")
13+
if scalaV.startsWith("2.") || scalaJSV.startsWith("1.")
1314
} yield (scalaV, scalaJSV)
1415

1516
val scalaNativeVersions = for {
@@ -90,15 +91,6 @@ object sourcecode extends Module {
9091
def moduleDeps = Seq(JvmSourcecodeModule.this)
9192
val crossScalaVersion = JvmSourcecodeModule.this.crossScalaVersion
9293
}
93-
94-
override def docJar =
95-
if (crossScalaVersion.startsWith("2")) super.docJar
96-
else T {
97-
val outDir = T.ctx().dest
98-
val javadocDir = outDir / 'javadoc
99-
os.makeDir.all(javadocDir)
100-
mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
101-
}
10294
}
10395

10496
object js extends Cross[JsSourcecodeModule](scalaJSVersions: _*)

mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This is a wrapper script, that automatically download mill from GitHub release pages
44
# You can give the required mill version with MILL_VERSION env variable
55
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
6-
DEFAULT_MILL_VERSION=0.9.5
6+
DEFAULT_MILL_VERSION=0.9.5-48-4ad87f
77

88
set -e
99

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

sourcecode/native/src/test/scala/sourcecode/TestUtil.scala renamed to sourcecode/test/src-3/sourcecode/TestUtil.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ package sourcecode
22

33
object TestUtil {
44

5-
val isDotty = false
5+
val isDotty = true
66

77
}

0 commit comments

Comments
 (0)