Skip to content

Commit 5cf4450

Browse files
Merge pull request #77 from dotty-staging/backprop
Upgrade to Scala 3.0.0-RC1
2 parents b3d8f40 + 06b3ada commit 5cf4450

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

build.sc

+14-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import scalalib._
44

55
val dottyVersion = Option(sys.props("dottyVersion"))
66

7-
object requests extends Cross[RequestsModule]((List("2.12.6", "2.13.0", "3.0.0-M2") ++ dottyVersion): _*)
7+
object requests extends Cross[RequestsModule]((List("2.12.6", "2.13.0", "3.0.0-RC1") ++ dottyVersion): _*)
88
class RequestsModule(val crossScalaVersion: String) extends CrossScalaModule with PublishModule {
99
def publishVersion = "0.6.5"
1010
def artifactName = "requests"
@@ -19,13 +19,23 @@ class RequestsModule(val crossScalaVersion: String) extends CrossScalaModule wit
1919
)
2020
)
2121
def ivyDeps = Agg(
22-
ivy"com.lihaoyi::geny::0.6.2"
22+
ivy"com.lihaoyi::geny::0.6.5"
2323
)
2424
object test extends Tests{
2525
def ivyDeps = Agg(
26-
ivy"com.lihaoyi::utest::0.7.5",
27-
ivy"com.lihaoyi::ujson::1.2.2"
26+
ivy"com.lihaoyi::utest::0.7.7",
27+
ivy"com.lihaoyi::ujson::1.2.3"
2828
)
2929
def testFrameworks = Seq("utest.runner.Framework")
3030
}
31+
// FIXME: scaladoc 3 is not supported by mill yet. Remove the override
32+
// once it is.
33+
override def docJar =
34+
if (crossScalaVersion.startsWith("2")) super.docJar
35+
else T {
36+
val outDir = T.ctx().dest
37+
val javadocDir = outDir / 'javadoc
38+
os.makeDir.all(javadocDir)
39+
mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
40+
}
3141
}

mill

+1-1
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.8.0-13-105f53
6+
DEFAULT_MILL_VERSION=0.9.5
77

88
set -e
99

0 commit comments

Comments
 (0)