Skip to content

Commit 24fe616

Browse files
author
Jakob Odersky
committed
Upgrade to Scala 3.0.0-RC1
1 parent ee5cfa0 commit 24fe616

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

build.sc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion
1010

1111
val dottyVersions = sys.props.get("dottyVersion").toList
1212

13-
val scalaVersions = "2.12.13" :: "2.13.4" :: "3.0.0-M3" :: dottyVersions
13+
val scalaVersions = "2.12.13" :: "2.13.4" :: "3.0.0-RC1" :: dottyVersions
1414
val scala2Versions = scalaVersions.filter(_.startsWith("2."))
1515

1616
val scalaJSVersions = for {
@@ -31,6 +31,16 @@ object os extends Module {
3131
object test extends Tests with OsLibTestModule{
3232
def platformSegment = "jvm"
3333
}
34+
// FIXME: scaladoc 3 is not supported by mill yet. Remove the override
35+
// once it is.
36+
override def docJar =
37+
if (crossScalaVersion.startsWith("2")) super.docJar
38+
else T {
39+
val outDir = T.ctx().dest
40+
val javadocDir = outDir / 'javadoc
41+
_root_.os.makeDir.all(javadocDir)
42+
mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
43+
}
3444
}
3545
object native extends Cross[OsNativeModule](scalaNativeVersions:_*)
3646

0 commit comments

Comments
 (0)