Skip to content

Commit 8763d77

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

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

build.sc

Lines changed: 11 additions & 2 deletions
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 {
@@ -102,7 +102,16 @@ trait OsLibModule extends CrossScalaModule with PublishModule{
102102
def compileIvyDeps = acyclicDep
103103
def scalacOptions = T { if (!isDotty) Seq("-P:acyclic:force") else Seq.empty }
104104
def scalacPluginIvyDeps = acyclicDep
105-
105+
// FIXME: scaladoc 3 is not supported by mill yet. Remove the override
106+
// once it is.
107+
override def docJar =
108+
if (crossScalaVersion.startsWith("2")) super.docJar
109+
else T {
110+
val outDir = T.ctx().dest
111+
val javadocDir = outDir / 'javadoc
112+
_root_.os.makeDir.all(javadocDir)
113+
mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
114+
}
106115
}
107116

108117
trait OsLibTestModule extends ScalaModule with TestModule{

0 commit comments

Comments
 (0)